summaryrefslogtreecommitdiff
path: root/src/arch/arm/miscregs.hh
diff options
context:
space:
mode:
authorGiacomo Gabrielli <Giacomo.Gabrielli@arm.com>2010-12-07 16:19:57 -0800
committerGiacomo Gabrielli <Giacomo.Gabrielli@arm.com>2010-12-07 16:19:57 -0800
commit719f9a6d4fba16af38dcfd62b25a4d708156699f (patch)
tree1a380efa6ed27b505fdf402e2a069d217c9a4eac /src/arch/arm/miscregs.hh
parent4bbdd6ceb2639fe21408ab211b7c4c7e53adb249 (diff)
downloadgem5-719f9a6d4fba16af38dcfd62b25a4d708156699f.tar.xz
O3: Make all instructions that write a misc. register not perform the write until commit.
ARM instructions updating cumulative flags (ARM FP exceptions and saturation flags) are not serialized. Added aliases for ARM FP exceptions and saturation flags in FPSCR. Removed write accesses to the FP condition codes for most ARM VFP instructions: only VCMP and VCMPE instructions update the FP condition codes. Removed a potential cause of seg. faults in the O3 model for NEON memory macro-ops (ARM).
Diffstat (limited to 'src/arch/arm/miscregs.hh')
-rw-r--r--src/arch/arm/miscregs.hh11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/arch/arm/miscregs.hh b/src/arch/arm/miscregs.hh
index 2bb1cdb15..cf9da428a 100644
--- a/src/arch/arm/miscregs.hh
+++ b/src/arch/arm/miscregs.hh
@@ -78,6 +78,8 @@ namespace ArmISA
MISCREG_FPSR,
MISCREG_FPSID,
MISCREG_FPSCR,
+ MISCREG_FPSCR_QC, // Cumulative saturation flag
+ MISCREG_FPSCR_EXC, // Cumulative FP exception flags
MISCREG_FPEXC,
MISCREG_MVFR0,
MISCREG_MVFR1,
@@ -206,7 +208,8 @@ namespace ArmISA
const char * const miscRegName[NUM_MISCREGS] = {
"cpsr", "itstate", "spsr", "spsr_fiq", "spsr_irq", "spsr_svc",
"spsr_mon", "spsr_und", "spsr_abt",
- "fpsr", "fpsid", "fpscr", "fpexc", "mvfr0", "mvfr1",
+ "fpsr", "fpsid", "fpscr", "fpscr_qc", "fpscr_exc", "fpexc",
+ "mvfr0", "mvfr1",
"sctlr_rst", "sev_mailbox",
"sctlr", "dccisw", "dccimvac", "dccmvac",
"contextidr", "tpidrurw", "tpidruro", "tpidrprw",
@@ -362,7 +365,11 @@ namespace ArmISA
// This mask selects bits of the FPSCR that actually go in the FpCondCodes
// integer register to allow renaming.
- static const uint32_t FpCondCodesMask = 0xF800009F;
+ static const uint32_t FpCondCodesMask = 0xF0000000;
+ // This mask selects the cumulative FP exception flags of the FPSCR.
+ static const uint32_t FpscrExcMask = 0x0000009F;
+ // This mask selects the cumulative saturation flag of the FPSCR.
+ static const uint32_t FpscrQcMask = 0x08000000;
BitUnion32(FPEXC)
Bitfield<31> ex;