From 8529cdad6bb6d6aceb2e12e785607f0d409c0d76 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Fri, 24 May 2019 10:10:25 +0100 Subject: [PATCH] arch-arm: Fix fallthrough when trapping at EL2 This had been caused by the introduction of GICv3 registers trapping in commit 32a23114c14cebc5ec0067ac739144b50e412219 Change-Id: I5073e2891f3ff5c5a9e05d3456dad6f4f8ffba0d Signed-off-by: Giacomo Travaglini Reviewed-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18909 Maintainer: Andreas Sandberg Tested-by: kokoro --- src/arch/arm/insts/misc64.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/arch/arm/insts/misc64.cc b/src/arch/arm/insts/misc64.cc index fed2d9ac8..423aaca25 100644 --- a/src/arch/arm/insts/misc64.cc +++ b/src/arch/arm/insts/misc64.cc @@ -269,6 +269,7 @@ MiscRegOp64::checkEL2Trap(ThreadContext *tc, const MiscRegIndex misc_reg, break; case MISCREG_IMPDEF_UNIMPL: trap_to_hyp = hcr.tidcp && el == EL1; + break; // GICv3 regs case MISCREG_ICC_SGI0R_EL1: if (tc->getIsaPtr()->haveGICv3CpuIfc()) -- 2.30.2