diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2014-09-03 07:42:21 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2014-09-03 07:42:21 -0400 |
| commit | e1ac9629398027186ef4c2a66772aeff2b4c6792 (patch) | |
| tree | 69a2591a576690aeafca28eef2374b20b76d7c3c /src/arch/mips | |
| parent | 23c85407562c3e2e2f3e1ca8b8dcbdc38fac82df (diff) | |
| download | gem5-e1ac9629398027186ef4c2a66772aeff2b4c6792.tar.xz | |
arch: Cleanup unused ISA traits constants
This patch prunes unused values, and also unifies how the values are
defined (not using an enum for ALPHA), aligning the use of int vs Addr
etc.
The patch also removes the duplication of PageBytes/PageShift and
VMPageSize/LogVMPageSize. For all ISAs the two pairs had identical
values and the latter has been removed.
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 |