diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2009-07-21 01:09:05 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2009-07-21 01:09:05 -0700 |
| commit | 74584d79b66b3459c72db6c74bfa9e22ee1ae23b (patch) | |
| tree | f8a98156083103e9f883235e2fd91cccba76f179 /src/arch/mips/utility.cc | |
| parent | 7548082d3baf578fe984c79f414dbefd96091359 (diff) | |
| download | gem5-74584d79b66b3459c72db6c74bfa9e22ee1ae23b.tar.xz | |
MIPS: Get MIPS_FS to compile, more style fixes.
Some breakage was from my BitUnion change, some was much older.
Diffstat (limited to 'src/arch/mips/utility.cc')
| -rw-r--r-- | src/arch/mips/utility.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc index 4723d6301..ac90ce45e 100644 --- a/src/arch/mips/utility.cc +++ b/src/arch/mips/utility.cc @@ -38,6 +38,7 @@ #include "base/misc.hh" #if FULL_SYSTEM +#include "arch/mips/registers.hh" #include "arch/mips/vtophys.hh" #include "mem/vport.hh" #endif @@ -52,16 +53,16 @@ uint64_t getArgument(ThreadContext *tc, int number, bool fp) { #if FULL_SYSTEM - if (number < NumArgumentRegs) { + if (number < 4) { if (fp) - return tc->readFloatRegBits(ArgumentReg[number]); + return tc->readFloatRegBits(FirstArgumentReg + number); else - return tc->readIntReg(ArgumentReg[number]); + return tc->readIntReg(FirstArgumentReg + number); } else { Addr sp = tc->readIntReg(StackPointerReg); VirtualPort *vp = tc->getVirtPort(); uint64_t arg = vp->read<uint64_t>(sp + - (number-NumArgumentRegs) * sizeof(uint64_t)); + (number - 4) * sizeof(uint64_t)); return arg; } #else |