From: Steve Reinhardt Date: Tue, 15 Oct 2013 18:22:43 +0000 (-0400) Subject: isa: clean up register constants X-Git-Tag: stable_2014_02_15~86 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a830e63de71e5929b8ff8e334bc872faa9193a8b;p=gem5.git isa: clean up register constants Clean up and add some consistency to the *_Base_DepTag constants as well as some related register constants: - Get rid of NumMiscArchRegs, TotalArchRegs, and TotalDataRegs since they're never used and not always defined - Set FP_Base_DepTag = NumIntRegs when possible (i.e., every case except x86) - Set Ctrl_Base_DepTag = FP_Base_DepTag + NumFloatRegs (this was true before, but wasn't always expressed that way) - Drastically reduce the number of arbitrary constants appearing in these calculations --- diff --git a/src/arch/alpha/registers.hh b/src/arch/alpha/registers.hh index e1f50ddc2..6f0b02c7f 100644 --- a/src/arch/alpha/registers.hh +++ b/src/arch/alpha/registers.hh @@ -88,23 +88,20 @@ const RegIndex SyscallSuccessReg = 19; const int NumIntArchRegs = 32; const int NumPALShadowRegs = 8; const int NumFloatArchRegs = 32; -const int NumMiscArchRegs = NUM_MISCREGS; const int NumIntRegs = NumIntArchRegs + NumPALShadowRegs; const int NumFloatRegs = NumFloatArchRegs; -const int NumMiscRegs = NumMiscArchRegs; +const int NumMiscRegs = NUM_MISCREGS; const int TotalNumRegs = NumIntRegs + NumFloatRegs + NumMiscRegs; -const int TotalDataRegs = NumIntRegs + NumFloatRegs; - // These enumerate all the registers for dependence tracking. enum DependenceTags { // 0..31 are the integer regs 0..31 // 32..63 are the FP regs 0..31, i.e. use (reg + FP_Base_DepTag) - FP_Base_DepTag = 40, - Ctrl_Base_DepTag = 72, + FP_Base_DepTag = NumIntRegs, + Ctrl_Base_DepTag = FP_Base_DepTag + NumFloatRegs, Max_DepTag = Ctrl_Base_DepTag + NumMiscRegs + NumInternalProcRegs }; diff --git a/src/arch/mips/registers.hh b/src/arch/mips/registers.hh index 807fd825f..911e09d41 100644 --- a/src/arch/mips/registers.hh +++ b/src/arch/mips/registers.hh @@ -115,15 +115,6 @@ const int ReturnAddressReg = 31; const int SyscallPseudoReturnReg = 3; -//@TODO: Implementing ShadowSets needs to -//edit this value such that: -//TotalArchRegs = NumIntArchRegs * ShadowSets -const int TotalArchRegs = NumIntArchRegs; - -// These help enumerate all the registers for dependence tracking. -const int FP_Base_DepTag = NumIntRegs; -const int Ctrl_Base_DepTag = FP_Base_DepTag + NumFloatRegs; - // Enumerate names for 'Control' Registers in the CPU // Reference MIPS32 Arch. for Programmers, Vol. III, Ch.8 // (Register Number-Register Select) Summary of Register @@ -281,9 +272,11 @@ enum MiscRegIndex{ MISCREG_NUMREGS }; -const int TotalDataRegs = NumIntRegs + NumFloatRegs; - const int NumMiscRegs = MISCREG_NUMREGS; + +// These help enumerate all the registers for dependence tracking. +const int FP_Base_DepTag = NumIntRegs; +const int Ctrl_Base_DepTag = FP_Base_DepTag + NumFloatRegs; const int Max_DepTag = Ctrl_Base_DepTag + NumMiscRegs; const int TotalNumRegs = NumIntRegs + NumFloatRegs + NumMiscRegs; diff --git a/src/arch/sparc/miscregs.hh b/src/arch/sparc/miscregs.hh index 7008b6b36..b55fb7d44 100644 --- a/src/arch/sparc/miscregs.hh +++ b/src/arch/sparc/miscregs.hh @@ -155,7 +155,6 @@ struct STS }; -const int NumMiscArchRegs = MISCREG_NUMMISCREGS; const int NumMiscRegs = MISCREG_NUMMISCREGS; } diff --git a/src/arch/sparc/registers.hh b/src/arch/sparc/registers.hh index 8c61a070c..ffcfafcba 100644 --- a/src/arch/sparc/registers.hh +++ b/src/arch/sparc/registers.hh @@ -57,13 +57,6 @@ typedef union typedef uint16_t RegIndex; -// 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 -}; - // semantically meaningful register indices const int ZeroReg = 0; // architecturally meaningful // the rest of these depend on the ABI @@ -80,6 +73,13 @@ const int NumIntRegs = (MaxGL + 1) * 8 + NWindows * 16 + NumMicroIntRegs; const int TotalNumRegs = NumIntRegs + NumFloatRegs + NumMiscRegs; +// These enumerate all the registers for dependence tracking. +enum DependenceTags { + FP_Base_DepTag = NumIntRegs, + Ctrl_Base_DepTag = FP_Base_DepTag + NumFloatRegs, + Max_DepTag = Ctrl_Base_DepTag + NumMiscRegs +}; + } // namespace SparcISA #endif diff --git a/src/arch/x86/registers.hh b/src/arch/x86/registers.hh index 20385a960..e811ed2d3 100644 --- a/src/arch/x86/registers.hh +++ b/src/arch/x86/registers.hh @@ -1,5 +1,6 @@ /* * Copyright (c) 2007 The Hewlett-Packard Development Company + * Copyright (c) 2013 Advanced Micro Devices, Inc. * All rights reserved. * * The license below extends only to copyright in the software and shall @@ -50,7 +51,6 @@ namespace X86ISA using X86ISAInst::MaxInstSrcRegs; using X86ISAInst::MaxInstDestRegs; using X86ISAInst::MaxMiscDestRegs; -const int NumMiscArchRegs = NUM_MISCREGS; const int NumMiscRegs = NUM_MISCREGS; const int NumIntArchRegs = NUM_INTREGS; @@ -58,26 +58,18 @@ const int NumIntRegs = NumIntArchRegs + NumMicroIntRegs + NumPseudoIntRegs + NumImplicitIntRegs; -//Each 128 bit xmm register is broken into two effective 64 bit registers. +// Each 128 bit xmm register is broken into two effective 64 bit registers. +// Add 8 for the indices that are mapped over the fp stack const int NumFloatRegs = - NumMMXRegs + 2 * NumXMMRegs + NumMicroFpRegs; -const int NumFloatArchRegs = NumFloatRegs + 8; + NumMMXRegs + 2 * NumXMMRegs + NumMicroFpRegs + 8; // These enumerate all the registers for dependence tracking. enum DependenceTags { - //There are 16 microcode registers at the moment. This is an - //unusually large constant to make sure there isn't overflow. + // FP_Base_DepTag must be large enough to be bigger than any integer + // register index which has the IntFoldBit (1 << 6) set. To be safe + // we just start at (1 << 7) == 128. FP_Base_DepTag = 128, - Ctrl_Base_DepTag = - FP_Base_DepTag + - //mmx/x87 registers - 8 + - //xmm registers - 16 * 2 + - //The microcode fp registers - 8 + - //The indices that are mapped over the fp stack - 8, + Ctrl_Base_DepTag = FP_Base_DepTag + NumFloatRegs, Max_DepTag = Ctrl_Base_DepTag + NumMiscRegs };