summaryrefslogtreecommitdiff
path: root/src/arch/sparc/isa_traits.hh
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-11-10 15:35:06 -0500
committerKevin Lim <ktlim@umich.edu>2006-11-10 15:35:06 -0500
commite89eaf8b801b39713b28f2df7e89ea8a518974ec (patch)
tree15102b11266b888577742c5e814bd66d1fc510bb /src/arch/sparc/isa_traits.hh
parentb5e68fb54677f601bb00c23af52db8fd6571301f (diff)
parent6d54a77518664bc9064211fcf85958b7e2caa9cc (diff)
downloadgem5-e89eaf8b801b39713b28f2df7e89ea8a518974ec.tar.xz
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem --HG-- extra : convert_revision : 35e2ff6ce62281299ad98dca64ba04a3a8a6757c
Diffstat (limited to 'src/arch/sparc/isa_traits.hh')
-rw-r--r--src/arch/sparc/isa_traits.hh5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh
index 46a0ebbfb..1433ba3f8 100644
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/isa_traits.hh
@@ -76,10 +76,7 @@ namespace SparcISA
// 0..31 are the integer regs 0..31
// 32..95 are the FP regs 0..31, i.e. use (reg + FP_Base_DepTag)
FP_Base_DepTag = NumIntRegs,
- Ctrl_Base_DepTag = NumIntRegs + NumFloatRegs,
- //XXX These are here solely to get compilation and won't work
- Fpcr_DepTag = 0,
- Uniq_DepTag = 0
+ Ctrl_Base_DepTag = NumIntRegs + NumMicroIntRegs + NumFloatRegs,
};