summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrandon Potter <Brandon.Potter@amd.com>2017-03-15 11:09:36 -0500
committerBrandon Potter <Brandon.Potter@amd.com>2017-03-17 18:39:58 +0000
commit1991ff3bb26f89d869a098db33d87c15bcb9678e (patch)
tree392a50fcecc97b9e49a144618dc53d2eeac27cdc /src
parent48333e7e3f5282bd2b5505b400ad5b06d6785371 (diff)
downloadgem5-1991ff3bb26f89d869a098db33d87c15bcb9678e.tar.xz
syscall-emul: change NULL to nullptr in Process files
Change-Id: I9ff21092876593237f919e9f7fb7283bd865ba2e Reviewed-on: https://gem5-review.googlesource.com/2421 Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Brandon Potter <Brandon.Potter@amd.com>
Diffstat (limited to 'src')
-rw-r--r--src/sim/process.cc14
-rw-r--r--src/sim/process.hh2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/sim/process.cc b/src/sim/process.cc
index 406b38679..89a82a6a1 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -151,7 +151,7 @@ Process::Process(ProcessParams * params, ObjectFile * obj_file)
!objFile->loadLocalSymbols(debugSymbolTable) ||
!objFile->loadWeakSymbols(debugSymbolTable)) {
delete debugSymbolTable;
- debugSymbolTable = NULL;
+ debugSymbolTable = nullptr;
}
}
}
@@ -259,7 +259,7 @@ Process::findFreeContext()
if (ThreadContext::Halted == it->status())
return it;
}
- return NULL;
+ return nullptr;
}
void
@@ -406,7 +406,7 @@ Process::syscall(int64_t callnum, ThreadContext *tc, Fault *fault)
numSyscalls++;
SyscallDesc *desc = getDesc(callnum);
- if (desc == NULL)
+ if (desc == nullptr)
fatal("Syscall %d out of range", callnum);
desc->doSyscall(callnum, this, tc, fault);
@@ -426,7 +426,7 @@ Process::findDriver(std::string filename)
return d;
}
- return NULL;
+ return nullptr;
}
void
@@ -480,7 +480,7 @@ Process::getStartPC()
Process *
ProcessParams::create()
{
- Process *process = NULL;
+ Process *process = nullptr;
// If not specified, set the executable parameter equal to the
// simulated system's zeroth command line parameter
@@ -489,7 +489,7 @@ ProcessParams::create()
}
ObjectFile *obj_file = createObjectFile(executable);
- if (obj_file == NULL) {
+ if (obj_file == nullptr) {
fatal("Can't load object file %s", executable);
}
@@ -628,7 +628,7 @@ ProcessParams::create()
#error "THE_ISA not set"
#endif
- if (process == NULL)
+ if (process == nullptr)
fatal("Unknown error creating process object.");
return process;
}
diff --git a/src/sim/process.hh b/src/sim/process.hh
index da538f8da..add3eb357 100644
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -98,7 +98,7 @@ class Process : public SimObject
* Find an emulated device driver.
*
* @param filename Name of the device (under /dev)
- * @return Pointer to driver object if found, else NULL
+ * @return Pointer to driver object if found, else nullptr
*/
EmulatedDriver *findDriver(std::string filename);