interrupts.cc (11793:ef606668d247) interrupts.cc (14171:58d343fa3194)
1/*
1/*
2 * Copyright (c) 2009, 2012-2013, 2016 ARM Limited
2 * Copyright (c) 2009, 2012-2013, 2016, 2019 ARM Limited
3 * All rights reserved.
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software
9 * licensed hereunder. You may use the software subject to the license
10 * terms below provided that you ensure that this notice is replicated

--- 42 unchanged lines hidden (view full) ---

53 // Table G1-17~19 of ARM V8 ARM
54 InterruptMask mask;
55 bool highest_el_is_64 = ArmSystem::highestELIs64(tc);
56
57 CPSR cpsr = tc->readMiscReg(MISCREG_CPSR);
58 SCR scr;
59 HCR hcr;
60 hcr = tc->readMiscReg(MISCREG_HCR);
3 * All rights reserved.
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software
9 * licensed hereunder. You may use the software subject to the license
10 * terms below provided that you ensure that this notice is replicated

--- 42 unchanged lines hidden (view full) ---

53 // Table G1-17~19 of ARM V8 ARM
54 InterruptMask mask;
55 bool highest_el_is_64 = ArmSystem::highestELIs64(tc);
56
57 CPSR cpsr = tc->readMiscReg(MISCREG_CPSR);
58 SCR scr;
59 HCR hcr;
60 hcr = tc->readMiscReg(MISCREG_HCR);
61 ExceptionLevel el = (ExceptionLevel) ((uint32_t) cpsr.el);
61 ExceptionLevel el = currEL(tc);
62 bool cpsr_mask_bit, scr_routing_bit, scr_fwaw_bit, hcr_mask_override_bit;
63
64 if (!highest_el_is_64)
65 scr = tc->readMiscReg(MISCREG_SCR);
66 else
67 scr = tc->readMiscReg(MISCREG_SCR_EL3);
68
69 bool is_secure = inSecureState(tc);

--- 97 unchanged lines hidden --- 		62 bool cpsr_mask_bit, scr_routing_bit, scr_fwaw_bit, hcr_mask_override_bit;
63
64 if (!highest_el_is_64)
65 scr = tc->readMiscReg(MISCREG_SCR);
66 else
67 scr = tc->readMiscReg(MISCREG_SCR_EL3);
68
69 bool is_secure = inSecureState(tc);

--- 97 unchanged lines hidden ---