From: Gabe Black <gblack@eecs.umich.edu>
Date: Tue, 31 Oct 2006 23:19:45 +0000 (-0500)
Subject: Check for out of range IPR values as well.
X-Git-Tag: m5_2.0_beta2~53^2~76
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39de635fbfa281c2fa70b65833825e2559d029b9;p=gem5.git

Check for out of range IPR values as well.

--HG--
extra : convert_revision : 9ca241bb71d8a1d022e54485383a88d2abece663
---

diff --git a/src/arch/alpha/isa/decoder.isa b/src/arch/alpha/isa/decoder.isa
index 550aa62a3..e4cf96767 100644
--- a/src/arch/alpha/isa/decoder.isa
+++ b/src/arch/alpha/isa/decoder.isa
@@ -745,8 +745,10 @@ decode OPCODE default Unknown::unknown() {
         0: OpcdecFault::hw_mfpr();
         format HwMoveIPR {
             1: hw_mfpr({{
-                int miscRegIndex = IprToMiscRegIndex[ipr_index];
-                if(miscRegIndex < 0 || !IprIsReadable(miscRegIndex))
+                miscRegIndex >= NumInternalProcRegs)
+                int miscRegIndex = (ipr_index < NumInternalProcRegs) ?
+                        IprToMiscRegIndex[ipr_index] : -1;
+                if(miscRegIndex < 0 || !IprIsReadable(miscRegIndex) ||
                         fault = new UnimplementedOpcodeFault;
                 else
                     Ra = xc->readMiscRegWithEffect(miscRegIndex, fault);
@@ -758,7 +760,8 @@ decode OPCODE default Unknown::unknown() {
         0: OpcdecFault::hw_mtpr();
         format HwMoveIPR {
             1: hw_mtpr({{
-                int miscRegIndex = IprToMiscRegIndex[ipr_index];
+                int miscRegIndex = (ipr_index < NumInternalProcRegs) ?
+                        IprToMiscRegIndex[ipr_index] : -1;
                 if(miscRegIndex < 0 || !IprIsWritable(miscRegIndex))
                         fault = new UnimplementedOpcodeFault;
                 else