46c46
< const int MachineBytes = 8;
---
> const int MachineBytes = 8;
48,49c48,49
< //This makes sure the big endian versions of certain functions are used.
< using namespace BigEndianGuest;
---
> // This makes sure the big endian versions of certain functions are used.
> using namespace BigEndianGuest;
51,52c51,52
< // SPARC has a delay slot
< #define ISA_HAS_DELAY_SLOT 1
---
> // SPARC has a delay slot
> #define ISA_HAS_DELAY_SLOT 1
54,55c54,55
< // SPARC NOP (sethi %(hi(0), g0)
< const MachInst NoopMachInst = 0x01000000;
---
> // SPARC NOP (sethi %(hi(0), g0)
> const MachInst NoopMachInst = 0x01000000;
57,60c57,60
< //8K. This value is implmentation specific; and should probably
< //be somewhere else.
< const int LogVMPageSize = 13;
< const int VMPageSize = (1 << LogVMPageSize);
---
> // 8K. This value is implmentation specific; and should probably
> // be somewhere else.
> const int LogVMPageSize = 13;
> const int VMPageSize = (1 << LogVMPageSize);
62,65c62,65
< // real address virtual mapping
< // sort of like alpha super page, but less frequently used
< const Addr SegKPMEnd = ULL(0xfffffffc00000000);
< const Addr SegKPMBase = ULL(0xfffffac000000000);
---
> // real address virtual mapping
> // sort of like alpha super page, but less frequently used
> const Addr SegKPMEnd = ULL(0xfffffffc00000000);
> const Addr SegKPMBase = ULL(0xfffffac000000000);
67,69c67,69
< //Why does both the previous set of constants and this one exist?
< const int PageShift = 13;
< const int PageBytes = 1ULL << PageShift;
---
> // Why does both the previous set of constants and this one exist?
> const int PageShift = 13;
> const int PageBytes = 1ULL << PageShift;
71c71
< const int BranchPredAddrShiftAmt = 2;
---
> const int BranchPredAddrShiftAmt = 2;
73c73
< StaticInstPtr decodeInst(ExtMachInst);
---
> StaticInstPtr decodeInst(ExtMachInst);
75,80c75,80
< /////////// TLB Stuff ////////////
< const Addr StartVAddrHole = ULL(0x0000800000000000);
< const Addr EndVAddrHole = ULL(0xFFFF7FFFFFFFFFFF);
< const Addr VAddrAMask = ULL(0xFFFFFFFF);
< const Addr PAddrImplMask = ULL(0x000000FFFFFFFFFF);
< const Addr BytesInPageMask = ULL(0x1FFF);
---
> /////////// TLB Stuff ////////////
> const Addr StartVAddrHole = ULL(0x0000800000000000);
> const Addr EndVAddrHole = ULL(0xFFFF7FFFFFFFFFFF);
> const Addr VAddrAMask = ULL(0xFFFFFFFF);
> const Addr PAddrImplMask = ULL(0x000000FFFFFFFFFF);
> const Addr BytesInPageMask = ULL(0x1FFF);
83,93c83,93
< enum InterruptTypes
< {
< IT_TRAP_LEVEL_ZERO,
< IT_HINTP,
< IT_INT_VEC,
< IT_CPU_MONDO,
< IT_DEV_MONDO,
< IT_RES_ERROR,
< IT_SOFT_INT,
< NumInterruptTypes
< };
---
> enum InterruptTypes
> {
> IT_TRAP_LEVEL_ZERO,
> IT_HINTP,
> IT_INT_VEC,
> IT_CPU_MONDO,
> IT_DEV_MONDO,
> IT_RES_ERROR,
> IT_SOFT_INT,
> NumInterruptTypes
> };