From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 8 Nov 2006 09:18:15 +0000 (-0500)
Subject: The new global level is computed with min, not max.
X-Git-Tag: m5_2.0_beta2~53^2~14
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f0c4d3664930f28229c7e336c4d4372b2e1d4c21;p=gem5.git

The new global level is computed with min, not max.

--HG--
extra : convert_revision : 6339c82d3655694445c3eb43e467b9aa6b4c8224
---

diff --git a/src/arch/sparc/faults.cc b/src/arch/sparc/faults.cc
index da7fc730d..1a44d34cf 100644
--- a/src/arch/sparc/faults.cc
+++ b/src/arch/sparc/faults.cc
@@ -291,9 +291,9 @@ void doNormalFault(ThreadContext *tc, TrapType tt)
 
     //Update the global register level
     if(1/*We're delivering the trap in priveleged mode*/)
-        tc->setMiscReg(MISCREG_GL, max<int>(GL+1, MaxGL));
+        tc->setMiscReg(MISCREG_GL, min<int>(GL+1, MaxGL));
     else
-        tc->setMiscReg(MISCREG_GL, max<int>(GL+1, MaxPGL));
+        tc->setMiscReg(MISCREG_GL, min<int>(GL+1, MaxPGL));
 
     //PSTATE.mm is unchanged
     //PSTATE.pef = whether or not an fpu is present