diff options
Diffstat (limited to 'src/arch/mips')
| -rw-r--r-- | src/arch/mips/isa_traits.hh | 10 | ||||
| -rw-r--r-- | src/arch/mips/process.cc | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/isa_traits.hh index af99461c9..ca375f2e8 100644 --- a/src/arch/mips/isa_traits.hh +++ b/src/arch/mips/isa_traits.hh @@ -145,16 +145,6 @@ enum mode_type // return a no-op instruction... used for instruction fetch faults const ExtMachInst NoopMachInst = 0x00000000; -const int LogVMPageSize = 13; // 8K bytes -const int VMPageSize = (1 << LogVMPageSize); - -const int BranchPredAddrShiftAmt = 2; // instructions are 4-byte aligned - -const int MachineBytes = 4; -const int WordBytes = 4; -const int HalfwordBytes = 2; -const int ByteBytes = 1; - const int ANNOTE_NONE = 0; const uint32_t ITOUCH_ANNOTE = 0xffffffff; diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc index f84c5cc4a..404c84da6 100644 --- a/src/arch/mips/process.cc +++ b/src/arch/mips/process.cc @@ -58,7 +58,7 @@ MipsLiveProcess::MipsLiveProcess(LiveProcessParams * params, // Set up break point (Top of Heap) brk_point = objFile->dataBase() + objFile->dataSize() + objFile->bssSize(); - brk_point = roundUp(brk_point, VMPageSize); + brk_point = roundUp(brk_point, PageBytes); // Set up region for mmaps. Start it 1GB above the top of the heap. mmap_start = mmap_end = brk_point + 0x40000000L; @@ -69,7 +69,7 @@ MipsLiveProcess::initState() { LiveProcess::initState(); - argsInit<uint32_t>(VMPageSize); + argsInit<uint32_t>(PageBytes); } template<class IntType> @@ -88,7 +88,7 @@ MipsLiveProcess::argsInit(int pageSize) if (elfObject) { // Set the system page size - auxv.push_back(auxv_t(M5_AT_PAGESZ, MipsISA::VMPageSize)); + auxv.push_back(auxv_t(M5_AT_PAGESZ, MipsISA::PageBytes)); // Set the frequency at which time() increments auxv.push_back(auxv_t(M5_AT_CLKTCK, 100)); // For statically linked executables, this is the virtual |