From dc5255f1d2bb0674d14c4b6722b0519da48ba002 Mon Sep 17 00:00:00 2001 From: Brandon Potter Date: Thu, 8 Aug 2019 15:23:01 -0400 Subject: [PATCH] sim-se: minor refactor for ProcessParams::create Remove the nullptr initialization and change the message for object file failure. Change-Id: I14b80b47b65893c55810e7f715c1b8fc643c5125 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19949 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/sim/process.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/sim/process.cc b/src/sim/process.cc index 735933d01..224152a32 100644 --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -529,8 +529,6 @@ Process::absolutePath(const std::string &filename, bool host_filesystem) Process * ProcessParams::create() { - Process *process = nullptr; - // If not specified, set the executable parameter equal to the // simulated system's zeroth command line parameter if (executable == "") { @@ -538,9 +536,9 @@ ProcessParams::create() } ObjectFile *obj_file = createObjectFile(executable); - fatal_if(!obj_file, "Can't load object file %s", executable); + fatal_if(!obj_file, "Cannot load object file %s.", executable); - process = ObjectFile::tryLoaders(this, obj_file); + Process *process = ObjectFile::tryLoaders(this, obj_file); fatal_if(!process, "Unknown error creating process object."); return process; -- 2.30.2