diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-04-18 09:44:45 -0400 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-04-18 09:44:45 -0400 |
commit | cae6b571d63b38c3177f5b47891021ba69386453 (patch) | |
tree | 6039a7ce3381b6c5448fc127bdb7b063ae52115e /sim/process.cc | |
parent | 0534e355b77497a1272f6078edae1692d87a15cf (diff) | |
parent | 609c4ecea618c6406e50432e38882925db7b7ede (diff) | |
download | gem5-cae6b571d63b38c3177f5b47891021ba69386453.tar.xz |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 3eb97976caf57e43119a998c31128ca6f163c05b
Diffstat (limited to 'sim/process.cc')
-rw-r--r-- | sim/process.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sim/process.cc b/sim/process.cc index ce5833881..d88716f1e 100644 --- a/sim/process.cc +++ b/sim/process.cc @@ -240,7 +240,7 @@ DEFINE_SIM_OBJECT_CLASS_NAME("Process", Process) //////////////////////////////////////////////////////////////////////// -static void +void copyStringArray(vector<string> &strings, Addr array_ptr, Addr data_ptr, TranslatingPort* memPort) { @@ -348,12 +348,10 @@ LiveProcess::argsInit(int intSize, int pageSize) } void -LiveProcess::syscall(ExecContext *xc) +LiveProcess::syscall(int64_t callnum, ExecContext *xc) { num_syscalls++; - int64_t callnum = xc->readIntReg(SyscallNumReg); - SyscallDesc *desc = getDesc(callnum); if (desc == NULL) fatal("Syscall %d out of range", callnum); |