From 1e256809cb24f4eb07469970562e7451331af499 Mon Sep 17 00:00:00 2001 From: Jordi Vaquero Date: Tue, 23 Jun 2020 11:29:13 +0200 Subject: [PATCH] arch-arm: Fix SCR.NS compare to 0 Change-Id: Iba7628640bb222fd21fd067ff60dbe4d34f4b196 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/30614 Tested-by: kokoro Reviewed-by: Giacomo Travaglini Maintainer: Giacomo Travaglini --- src/arch/arm/insts/static_inst.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/arm/insts/static_inst.hh b/src/arch/arm/insts/static_inst.hh index 82bf61d0f..8610f996f 100644 --- a/src/arch/arm/insts/static_inst.hh +++ b/src/arch/arm/insts/static_inst.hh @@ -257,7 +257,7 @@ class ArmStaticInst : public StaticInst validModeChange = false; // There is no Hyp mode ('11010') in Secure state, so that // is UNPREDICTABLE - if (scr.ns == '0' && newMode == MODE_HYP) + if (scr.ns == 0 && newMode == MODE_HYP) validModeChange = false; // Cannot move into Hyp mode directly from a Non-secure // PL1 mode -- 2.30.2