diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-03-09 15:56:42 -0500 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-03-09 15:56:42 -0500 |
commit | 56cc760f6f53138c133c5d4e1f9d3e3199965d99 (patch) | |
tree | 991271751791743eb9db33508fd3d183e61772be /sim/process.cc | |
parent | 91545ac2bf5ac47ecbfc403ef6e2b2ce340ae551 (diff) | |
parent | ce3a6343b6c54e95d63403d46c9ddea384e49476 (diff) | |
download | gem5-56cc760f6f53138c133c5d4e1f9d3e3199965d99.tar.xz |
Merge zizzer:/bk/multiarch
into zeep.eecs.umich.edu:/z/saidi/work/m5.ma2
arch/alpha/isa_traits.hh:
arch/alpha/linux/process.cc:
arch/sparc/isa_traits.hh:
arch/sparc/linux/process.cc:
sim/process.cc:
merge
--HG--
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : fea0155c8e23abbd0d5d5251abbd0f4d223fe935
Diffstat (limited to 'sim/process.cc')
-rw-r--r-- | sim/process.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sim/process.cc b/sim/process.cc index 851192dcd..f02ca8bfd 100644 --- a/sim/process.cc +++ b/sim/process.cc @@ -357,7 +357,7 @@ LiveProcess::syscall(ExecContext *xc) { num_syscalls++; - int64_t callnum = xc->readIntReg(ReturnValueReg); + int64_t callnum = xc->readIntReg(SyscallNumReg); SyscallDesc *desc = getDesc(callnum); if (desc == NULL) |