diff options
| author | Dylan Johnson <Dylan.Johnson@ARM.com> | 2016-08-02 10:38:02 +0100 |
|---|---|---|
| committer | Dylan Johnson <Dylan.Johnson@ARM.com> | 2016-08-02 10:38:02 +0100 |
| commit | c2271e301dc441944dfc4c19ac932ea4f926a863 (patch) | |
| tree | 651f335ff013c76759d533bd50e06aac94dd4c16 /src/arch/arm/interrupts.cc | |
| parent | 996c1ed33c251f80ebdfd972477709f95bdcbe65 (diff) | |
| download | gem5-c2271e301dc441944dfc4c19ac932ea4f926a863.tar.xz | |
arm: Fix secure state checking in various places
Faults that could potentially be routed to the hypervisor checked
whether or not they were in a secure state without checking if security
was enabled or not. This caused faults not to be routed correctly. This
patch causes secure state checking to first ask if security is enabled.
Change-Id: I179e9b181b27f552734c9bab2b18d05ac579a119
Diffstat (limited to 'src/arch/arm/interrupts.cc')
| -rw-r--r-- | src/arch/arm/interrupts.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/arm/interrupts.cc b/src/arch/arm/interrupts.cc index 4f57ecc51..d3ba16142 100644 --- a/src/arch/arm/interrupts.cc +++ b/src/arch/arm/interrupts.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2012-2013 ARM Limited + * Copyright (c) 2009, 2012-2013, 2016 ARM Limited * All rights reserved. * * The license below extends only to copyright in the software and shall @@ -65,7 +65,7 @@ ArmISA::Interrupts::takeInt(ThreadContext *tc, InterruptTypes int_type) const else scr = tc->readMiscReg(MISCREG_SCR_EL3); - bool is_secure = inSecureState(scr, cpsr); + bool is_secure = inSecureState(tc); switch(int_type) { case INT_FIQ: |