diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2009-11-08 15:49:03 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2009-11-08 15:49:03 -0800 |
| commit | 8a4af3668dd8c45de4b98f3eb1fb2ef28bd369a2 (patch) | |
| tree | cd0beb09718015568cd9adfd8edd75e710a37656 /src/arch/arm/isa.hh | |
| parent | bb903b6514b743e93e429929776639879d6c59a7 (diff) | |
| download | gem5-8a4af3668dd8c45de4b98f3eb1fb2ef28bd369a2.tar.xz | |
ARM: Support forcing load/store multiple to use user registers.
Diffstat (limited to 'src/arch/arm/isa.hh')
| -rw-r--r-- | src/arch/arm/isa.hh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh index f8359679b..a4a328614 100644 --- a/src/arch/arm/isa.hh +++ b/src/arch/arm/isa.hh @@ -125,8 +125,11 @@ namespace ArmISA assert(reg >= 0); if (reg < NUM_ARCH_INTREGS) { return intRegMap[reg]; + } else if (reg < NUM_INTREGS) { + return reg; } else { - assert(reg < NUM_INTREGS); + reg -= NUM_INTREGS; + assert(reg < NUM_ARCH_INTREGS); return reg; } } |