diff options
| author | Nathan Binkert <nate@binkert.org> | 2009-11-08 20:15:54 -0800 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2009-11-08 20:15:54 -0800 |
| commit | b1a1f9aec8a2dcd5fbaa556c96d5cb1eeac4bd38 (patch) | |
| tree | c16e341d7f9831056b38de8cb6e5395332f03ed4 /src/arch/arm/isa.hh | |
| parent | 14b51697500b71a05c67c8197c017cb6a39b57a7 (diff) | |
| parent | 374d337693a53c7c7096b55537b20980a29a3e74 (diff) | |
| download | gem5-b1a1f9aec8a2dcd5fbaa556c96d5cb1eeac4bd38.tar.xz | |
automerge
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; } } |