diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2003-12-01 19:34:38 -0800 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2003-12-01 19:34:38 -0800 |
commit | 7976794aadd7f308010f88aa3a8a6e3469e37ba7 (patch) | |
tree | 48a163fc53913623e0d11cb1e44188fdaa2e8112 /cpu | |
parent | 94f98b43b3eaf86b22ca29bab5e0a1d3a1c60512 (diff) | |
download | gem5-7976794aadd7f308010f88aa3a8a6e3469e37ba7.tar.xz |
Restructuring of LiveProcess etc. to support multiple emulated OS syscall
interfaces, and specific support for Alpha Linux. Split syscall emulation
functions into several groups, based on whether they depend on the specific
OS and/or architecture (and all combinations of above), including the use of
template functions to support syscalls with slightly different constants
or interface structs.
arch/alpha/alpha_tru64_process.cc:
Incorporate full Tru64 object definition here, including structure and constant definitions.
This way we can wrap all of the functions inside the object, and not worry about namespace
conflicts because no one outside this file will ever see it.
base/loader/aout_object.cc:
base/loader/aout_object.hh:
base/loader/ecoff_object.cc:
base/loader/ecoff_object.hh:
base/loader/elf_object.cc:
base/loader/elf_object.hh:
base/loader/object_file.cc:
base/loader/object_file.hh:
Add enums to ObjectFile to indicate the object's architecture and operating system.
cpu/exec_context.cc:
prog.hh is now process.hh
cpu/exec_context.hh:
prog.hh is now process.hh
move architecture-specific syscall arg accessors into ExecContext
cpu/simple_cpu/simple_cpu.cc:
No need to include prog.hh (which has been renamed)
sim/process.cc:
sim/process.hh:
LiveProcess is now effectively an abstract base class.
New LiveProcess::create() function takes an object file and dynamically picks the
appropriate subclass of LiveProcess to handle the syscall interface that file expects
(currently Tru64 or Linux).
--HG--
rename : arch/alpha/fake_syscall.cc => arch/alpha/alpha_tru64_process.cc
rename : sim/prog.cc => sim/process.cc
rename : sim/prog.hh => sim/process.hh
extra : convert_revision : 4a03ca7d94a34177cb672931f8aae83a6bad179a
Diffstat (limited to 'cpu')
-rw-r--r-- | cpu/exec_context.cc | 2 | ||||
-rw-r--r-- | cpu/exec_context.hh | 30 | ||||
-rw-r--r-- | cpu/simple_cpu/simple_cpu.cc | 1 |
3 files changed, 30 insertions, 3 deletions
diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc index 92144bd93..7332b86a6 100644 --- a/cpu/exec_context.cc +++ b/cpu/exec_context.cc @@ -34,7 +34,7 @@ #ifdef FULL_SYSTEM #include "sim/system.hh" #else -#include "sim/prog.hh" +#include "sim/process.hh" #endif using namespace std; diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh index 274a3778b..7999e3735 100644 --- a/cpu/exec_context.hh +++ b/cpu/exec_context.hh @@ -52,7 +52,7 @@ class MemoryController; #else // !FULL_SYSTEM -#include "sim/prog.hh" +#include "sim/process.hh" #endif // FULL_SYSTEM @@ -376,6 +376,34 @@ class ExecContext #endif #ifndef FULL_SYSTEM + IntReg getSyscallArg(int i) + { + return regs.intRegFile[ArgumentReg0 + i]; + } + + // used to shift args for indirect syscall + void setSyscallArg(int i, IntReg val) + { + regs.intRegFile[ArgumentReg0 + i] = val; + } + + void setSyscallReturn(int64_t return_value) + { + // check for error condition. Alpha syscall convention is to + // indicate success/failure in reg a3 (r19) and put the + // return value itself in the standard return value reg (v0). + const int RegA3 = 19; // only place this is used + if (return_value >= 0) { + // no error + regs.intRegFile[RegA3] = 0; + regs.intRegFile[ReturnValueReg] = return_value; + } else { + // got an error, return details + regs.intRegFile[RegA3] = (IntReg) -1; + regs.intRegFile[ReturnValueReg] = -return_value; + } + } + void syscall() { process->syscall(this); diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc index a63f86098..476f28ea0 100644 --- a/cpu/simple_cpu/simple_cpu.cc +++ b/cpu/simple_cpu/simple_cpu.cc @@ -70,7 +70,6 @@ #else // !FULL_SYSTEM #include "eio/eio.hh" #include "mem/functional_mem/functional_memory.hh" -#include "sim/prog.hh" #endif // FULL_SYSTEM using namespace std; |