From 52b6764f31cab46204d5fdf6d0191428a8408bb1 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Tue, 21 Apr 2009 08:17:36 -0700 Subject: syscall: Resolve conflicts between m5threads and Gabe's recent SE changes. --- src/arch/sparc/isa_traits.hh | 1 + src/arch/sparc/process.cc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'src/arch/sparc') 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, -- cgit v1.2.3