diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2007-03-21 21:04:54 +0000 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2007-03-21 21:04:54 +0000 |
commit | 1707aa750f2dd2a7cf4da2934c93ef8e26faf244 (patch) | |
tree | 8b7ccfa40d9ff0e7e370c48a3535917a1ac103e7 /src/arch/x86 | |
parent | 0a80d06deaaf6fc574abacc2fed9b74d0bca1085 (diff) | |
download | gem5-1707aa750f2dd2a7cf4da2934c93ef8e26faf244.tar.xz |
put the int register count in intregs.hh
--HG--
extra : convert_revision : c48c13d9c4606c8cb7c60d18cd0f4dac9103a501
Diffstat (limited to 'src/arch/x86')
-rw-r--r-- | src/arch/x86/intregfile.hh | 5 | ||||
-rw-r--r-- | src/arch/x86/intregs.hh | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/arch/x86/intregfile.hh b/src/arch/x86/intregfile.hh index da631d444..f7b03f0f0 100644 --- a/src/arch/x86/intregfile.hh +++ b/src/arch/x86/intregfile.hh @@ -88,8 +88,9 @@ #ifndef __ARCH_X86_INTREGFILE_HH__ #define __ARCH_X86_INTREGFILE_HH__ -#include "arch/x86/x86_traits.hh" +#include "arch/x86/intregs.hh" #include "arch/x86/types.hh" +#include "arch/x86/x86_traits.hh" #include <string> @@ -102,7 +103,7 @@ namespace X86ISA //This function translates integer register file indices into names std::string getIntRegName(RegIndex); - const int NumIntArchRegs = 16; + const int NumIntArchRegs = NUM_INTREGS; const int NumIntRegs = NumIntArchRegs + NumMicroIntRegs; class IntRegFile diff --git a/src/arch/x86/intregs.hh b/src/arch/x86/intregs.hh index 3fe25bd5f..ed801cc48 100644 --- a/src/arch/x86/intregs.hh +++ b/src/arch/x86/intregs.hh @@ -77,7 +77,8 @@ namespace X86ISA INTREG_R12W, INTREG_R13W, INTREG_R14W, - INTREG_R15W + INTREG_R15W, + NUM_INTREGS }; }; |