From d4492190e6bbf709724af28d262b0a681c975ec0 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 4 Oct 2010 11:58:06 -0700 Subject: Alpha: Fix Alpha NumMiscArchRegs constant. Also add asserts in O3's Scoreboard class to catch bad indexes. --- src/arch/alpha/registers.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/arch') diff --git a/src/arch/alpha/registers.hh b/src/arch/alpha/registers.hh index d8752d520..1c4bbdca3 100644 --- a/src/arch/alpha/registers.hh +++ b/src/arch/alpha/registers.hh @@ -63,7 +63,8 @@ enum MiscRegIndex MISCREG_UNIQ, MISCREG_LOCKFLAG, MISCREG_LOCKADDR, - MISCREG_INTR + MISCREG_INTR, + NUM_MISCREGS }; // semantically meaningful register indices @@ -84,15 +85,14 @@ const RegIndex SyscallSuccessReg = 19; const int NumIntArchRegs = 32; const int NumPALShadowRegs = 8; const int NumFloatArchRegs = 32; -// @todo: Figure out what this number really should be. -const int NumMiscArchRegs = 77; +const int NumMiscArchRegs = NUM_MISCREGS; const int NumIntRegs = NumIntArchRegs + NumPALShadowRegs; const int NumFloatRegs = NumFloatArchRegs; const int NumMiscRegs = NumMiscArchRegs; const int TotalNumRegs = - NumIntRegs + NumFloatRegs + NumMiscRegs + NumInternalProcRegs; + NumIntRegs + NumFloatRegs + NumMiscRegs; const int TotalDataRegs = NumIntRegs + NumFloatRegs; -- cgit v1.2.3