target/arm: Fix HCR_EL2.TGE check in arm_phys_excp_target_el

The enable for TGE has already occurred within arm_hcr_el2_amo
and friends. Moreover, when E2H is also set, the sense is
supposed to be reversed, which has also already occurred within
the helpers.

Backports commit 619959c3583dad325c36f09ce670e7d091382cae from qemu
This commit is contained in:
Richard Henderson 2018-12-18 04:17:07 -05:00 committed by Lioncash
parent a8fb6fc8d5
commit 52ac2b2f7c
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7

View File

@ -5719,9 +5719,6 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint32_t excp_idx,
break;
};
/* If HCR.TGE is set then HCR is treated as being 1 */
hcr |= ((env->cp15.hcr_el2 & HCR_TGE) == HCR_TGE);
/* Perform a table-lookup for the target EL given the current state */
target_el = target_el_table[is64][scr][rw][hcr][secure][cur_el];