From de83caf6234cc22935fc6dd41b0dc1097010c6bf Mon Sep 17 00:00:00 2001 From: "Edgar E. Iglesias" Date: Thu, 15 Feb 2018 11:18:14 -0500 Subject: [PATCH] target-arm: Correct opc1 for AT_S12Exx Backports commit 7a379c7e68f1b2286602b0beeeb58dcef7c9e760 from qemu --- qemu/target-arm/helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c index 273a582e..b9638e46 100644 --- a/qemu/target-arm/helper.c +++ b/qemu/target-arm/helper.c @@ -2639,16 +2639,16 @@ static const ARMCPRegInfo v8_cp_reginfo[] = { { "AT_S1E0W", 0,7,8, 1,0,3, ARM_CP_STATE_AA64, ARM_CP_NO_RAW, PL1_W, 0, NULL, 0, 0, {0, 0}, NULL, NULL, ats_write64 }, - { "AT_S12E1R", 0,7,8, 1,0,4, ARM_CP_STATE_AA64, ARM_CP_NO_RAW, + { "AT_S12E1R", 0,7,8, 1,4,4, ARM_CP_STATE_AA64, ARM_CP_NO_RAW, PL2_W, 0, NULL, 0, 0, {0, 0}, NULL, NULL, ats_write64 }, - { "AT_S12E1W", 0,7,8, 1,0,5, ARM_CP_STATE_AA64, ARM_CP_NO_RAW, + { "AT_S12E1W", 0,7,8, 1,4,5, ARM_CP_STATE_AA64, ARM_CP_NO_RAW, PL2_W, 0, NULL, 0, 0, {0, 0}, NULL, NULL, ats_write64 }, - { "AT_S12E0R", 0,7,8, 1,0,6, ARM_CP_STATE_AA64, ARM_CP_NO_RAW, + { "AT_S12E0R", 0,7,8, 1,4,6, ARM_CP_STATE_AA64, ARM_CP_NO_RAW, PL2_W, 0, NULL, 0, 0, {0, 0}, NULL, NULL, ats_write64 }, - { "AT_S12E0W", 0,7,8, 1,0,7, ARM_CP_STATE_AA64, ARM_CP_NO_RAW, + { "AT_S12E0W", 0,7,8, 1,4,7, ARM_CP_STATE_AA64, ARM_CP_NO_RAW, PL2_W, 0, NULL, 0, 0, {0, 0}, NULL, NULL, ats_write64 }, /* AT S1E2* are elsewhere as they UNDEF from EL3 if EL2 is not present */