2c2
< * Copyright (c) 2010-2011 ARM Limited
---
> * Copyright (c) 2010-2011, 2014 ARM Limited
47a48
> #include "arch/arm/ccregs.hh"
71,72c72,73
< // dummy typedef since we don't have CC regs
< typedef uint8_t CCReg;
---
> // condition code register; must be at least 32 bits for FpCondCodes
> typedef uint64_t CCReg;
83c84
< const int NumCCRegs = 0;
---
> const int NumCCRegs = NUM_CCREGS;
85a87,88
> #define ISA_HAS_CC_REGS
>
112c115
< const int Misc_Reg_Base = CC_Reg_Base + NumCCRegs; // NumCCRegs == 0
---
> const int Misc_Reg_Base = CC_Reg_Base + NumCCRegs;
117a121
> CCReg ccreg;