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/alpha | |
| parent | b0e9654f8621729400ba627ed8c9bd0bf3833f7a (diff) | |
| download | gem5-52b6764f31cab46204d5fdf6d0191428a8408bb1.tar.xz | |
syscall: Resolve conflicts between m5threads and Gabe's recent SE changes.
Diffstat (limited to 'src/arch/alpha')
| -rw-r--r-- | src/arch/alpha/isa_traits.hh | 1 | ||||
| -rw-r--r-- | src/arch/alpha/process.cc | 2 |
2 files changed, 1 insertions, 2 deletions
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) |