diff options
| author | Steve Reinhardt <steve.reinhardt@amd.com> | 2009-04-21 08:17:36 -0700 |
|---|---|---|
| committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2009-04-21 08:17:36 -0700 |
| commit | 52b6764f31cab46204d5fdf6d0191428a8408bb1 (patch) | |
| tree | 8c0ae8d04cb0e3a2b6b2fc3a7c6a0be5a44d3927 /src/arch/sparc | |
| parent | b0e9654f8621729400ba627ed8c9bd0bf3833f7a (diff) | |
| download | gem5-52b6764f31cab46204d5fdf6d0191428a8408bb1.tar.xz | |
syscall: Resolve conflicts between m5threads and Gabe's recent SE changes.
Diffstat (limited to 'src/arch/sparc')
| -rw-r--r-- | src/arch/sparc/isa_traits.hh | 1 | ||||
| -rw-r--r-- | src/arch/sparc/process.cc | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh index 501f2f990..9833057a2 100644 --- a/src/arch/sparc/isa_traits.hh +++ b/src/arch/sparc/isa_traits.hh @@ -69,6 +69,7 @@ namespace SparcISA const int ZeroReg = 0; // architecturally meaningful // the rest of these depend on the ABI const int ReturnAddressReg = 31; // post call, precall is 15 + const int ReturnValueReg = 8; // Post return, 24 is pre-return. const int StackPointerReg = 14; const int FramePointerReg = 30; diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc index b2b539816..533e385b3 100644 --- a/src/arch/sparc/process.cc +++ b/src/arch/sparc/process.cc @@ -47,7 +47,6 @@ using namespace std; using namespace SparcISA; static const int FirstArgumentReg = 8; -static const int ReturnValueReg = 8; SparcLiveProcess::SparcLiveProcess(LiveProcessParams * params, |