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/x86 | |
| parent | b0e9654f8621729400ba627ed8c9bd0bf3833f7a (diff) | |
| download | gem5-52b6764f31cab46204d5fdf6d0191428a8408bb1.tar.xz | |
syscall: Resolve conflicts between m5threads and Gabe's recent SE changes.
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/isa_traits.hh | 1 | ||||
| -rw-r--r-- | src/arch/x86/process.cc | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh index d25e0eb70..09241c310 100644 --- a/src/arch/x86/isa_traits.hh +++ b/src/arch/x86/isa_traits.hh @@ -106,6 +106,7 @@ namespace X86ISA const int StackPointerReg = INTREG_RSP; //X86 doesn't seem to have a link register const int ReturnAddressReg = 0; + const int ReturnValueReg = INTREG_RAX; const int FramePointerReg = INTREG_RBP; // Some OS syscalls use a second register (rdx) to return a second diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc index 4a61ed168..43dd4a591 100644 --- a/src/arch/x86/process.cc +++ b/src/arch/x86/process.cc @@ -104,7 +104,6 @@ using namespace std; using namespace X86ISA; -static const int ReturnValueReg = INTREG_RAX; static const int ArgumentReg[] = { INTREG_RDI, INTREG_RSI, |