diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2009-11-08 01:59:20 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2009-11-08 01:59:20 -0800 |
| commit | 78bd8fe44fe3398f361335d2feb59a8221cc52e8 (patch) | |
| tree | 9c4cb010c832d9b09901e15f2129c0fca427b4a6 /src | |
| parent | f63c260d89591d8d57274bb37aea51dc7c093b8f (diff) | |
| download | gem5-78bd8fe44fe3398f361335d2feb59a8221cc52e8.tar.xz | |
ARM: Add back in spots for Rhi and Rlo, and use a named constant for LR.
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/arm/intregs.hh | 2 | ||||
| -rw-r--r-- | src/arch/arm/isa/operands.isa | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/arch/arm/intregs.hh b/src/arch/arm/intregs.hh index 191965c55..78ad39ee2 100644 --- a/src/arch/arm/intregs.hh +++ b/src/arch/arm/intregs.hh @@ -102,6 +102,8 @@ enum IntRegIndex INTREG_ZERO, // Dummy zero reg since there has to be one. INTREG_UREG0, + INTREG_RHI, + INTREG_RLO, NUM_INTREGS, NUM_ARCH_INTREGS = INTREG_PC + 1, diff --git a/src/arch/arm/isa/operands.isa b/src/arch/arm/isa/operands.isa index a4c404bd5..4ac6790e5 100644 --- a/src/arch/arm/isa/operands.isa +++ b/src/arch/arm/isa/operands.isa @@ -63,9 +63,9 @@ def operands {{ 'Rdo': ('IntReg', 'uw', '(RD & ~1)', 'IsInteger', 4, maybePCRead, maybePCWrite), 'Rde': ('IntReg', 'uw', '(RD | 1)', 'IsInteger', 5, maybePCRead, maybePCWrite), - 'Rhi': ('IntReg', 'uw', '18', 'IsInteger', 7), - 'Rlo': ('IntReg', 'uw', '19', 'IsInteger', 8), - 'LR': ('IntReg', 'uw', '14', 'IsInteger', 9), + 'Rhi': ('IntReg', 'uw', 'INTREG_RHI', 'IsInteger', 7), + 'Rlo': ('IntReg', 'uw', 'INTREG_RLO', 'IsInteger', 8), + 'LR': ('IntReg', 'uw', 'INTREG_LR', 'IsInteger', 9), #Register fields for microops 'Ra' : ('IntReg', 'uw', 'ura', 'IsInteger', 11, maybePCRead, maybePCWrite), |