42,43d41
< using SparcISAInst::MaxInstSrcRegs;
< using SparcISAInst::MaxInstDestRegs;
45,54c43,44
< typedef uint64_t IntReg;
< typedef uint64_t MiscReg;
< typedef float FloatReg;
< typedef uint32_t FloatRegBits;
< typedef union
< {
< IntReg intReg;
< FloatReg fpreg;
< MiscReg ctrlreg;
< } AnyReg;
---
> using SparcISAInst::MaxInstSrcRegs;
> using SparcISAInst::MaxInstDestRegs;
56c46,55
< typedef uint16_t RegIndex;
---
> typedef uint64_t IntReg;
> typedef uint64_t MiscReg;
> typedef float FloatReg;
> typedef uint32_t FloatRegBits;
> typedef union
> {
> IntReg intReg;
> FloatReg fpreg;
> MiscReg ctrlreg;
> } AnyReg;
58,63c57
< // These enumerate all the registers for dependence tracking.
< enum DependenceTags {
< FP_Base_DepTag = 32*3+9,
< Ctrl_Base_DepTag = FP_Base_DepTag + 64,
< Max_DepTag = Ctrl_Base_DepTag + NumMiscRegs
< };
---
> typedef uint16_t RegIndex;
65,71c59,64
< // semantically meaningful register indices
< const int ZeroReg = 0; // architecturally meaningful
< // the rest of these depend on the ABI
< const int ReturnAddressReg = 31; // post call, precall is 15
< const int ReturnValueReg = 8; // Post return, 24 is pre-return.
< const int StackPointerReg = 14;
< const int FramePointerReg = 30;
---
> // These enumerate all the registers for dependence tracking.
> enum DependenceTags {
> FP_Base_DepTag = 32*3+9,
> Ctrl_Base_DepTag = FP_Base_DepTag + 64,
> Max_DepTag = Ctrl_Base_DepTag + NumMiscRegs
> };
73,74c66,72
< // Some OS syscall use a second register (o1) to return a second value
< const int SyscallPseudoReturnReg = 9;
---
> // semantically meaningful register indices
> const int ZeroReg = 0; // architecturally meaningful
> // the rest of these depend on the ABI
> const int ReturnAddressReg = 31; // post call, precall is 15
> const int ReturnValueReg = 8; // Post return, 24 is pre-return.
> const int StackPointerReg = 14;
> const int FramePointerReg = 30;
76,77c74,75
< const int NumIntArchRegs = 32;
< const int NumIntRegs = (MaxGL + 1) * 8 + NWindows * 16 + NumMicroIntRegs;
---
> // Some OS syscall use a second register (o1) to return a second value
> const int SyscallPseudoReturnReg = 9;
78a77,79
> const int NumIntArchRegs = 32;
> const int NumIntRegs = (MaxGL + 1) * 8 + NWindows * 16 + NumMicroIntRegs;
>