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/alpha/isa_traits.hh | 1 + src/arch/alpha/process.cc | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/arch/alpha') diff --git a/src/arch/alpha/isa_traits.hh b/src/arch/alpha/isa_traits.hh index d37a769ea..ab3af0a1d 100644 --- a/src/arch/alpha/isa_traits.hh +++ b/src/arch/alpha/isa_traits.hh @@ -155,6 +155,7 @@ const int FramePointerReg = 15; const int SyscallNumReg = 0; const int FirstArgumentReg = 16; const int SyscallPseudoReturnReg = 20; +const int SyscallSuccessReg = 19; const int LogVMPageSize = 13; // 8K bytes const int VMPageSize = (1 << LogVMPageSize); diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc index 9c6e62815..093d83d8a 100644 --- a/src/arch/alpha/process.cc +++ b/src/arch/alpha/process.cc @@ -42,8 +42,6 @@ using namespace AlphaISA; using namespace std; -static const int SyscallSuccessReg = 19; - AlphaLiveProcess::AlphaLiveProcess(LiveProcessParams *params, ObjectFile *objFile) : LiveProcess(params, objFile) -- cgit v1.2.3