[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/9] target/arm/tcg/cpu32.c: swap ATCM and BTCM register names
From: |
Peter Maydell |
Subject: |
[PULL 1/9] target/arm/tcg/cpu32.c: swap ATCM and BTCM register names |
Date: |
Tue, 26 Nov 2024 17:02:16 +0000 |
From: Michael Tokarev <mjt@tls.msk.ru>
According to Cortex-R5 r1p2 manual, register with opcode2=0 is
BTCM and with opcode2=1 is ATCM, - exactly the opposite from how
qemu labels them. Just swap the labels to avoid confusion, -
both registers are implemented as always-zero.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20241121171602.3273252-1-mjt@tls.msk.ru
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/tcg/cpu32.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c
index 20c2737f17b..2a77701f8dc 100644
--- a/target/arm/tcg/cpu32.c
+++ b/target/arm/tcg/cpu32.c
@@ -574,9 +574,9 @@ static void cortex_a15_initfn(Object *obj)
static const ARMCPRegInfo cortexr5_cp_reginfo[] = {
/* Dummy the TCM region regs for the moment */
- { .name = "ATCM", .cp = 15, .opc1 = 0, .crn = 9, .crm = 1, .opc2 = 0,
+ { .name = "BTCM", .cp = 15, .opc1 = 0, .crn = 9, .crm = 1, .opc2 = 0,
.access = PL1_RW, .type = ARM_CP_CONST },
- { .name = "BTCM", .cp = 15, .opc1 = 0, .crn = 9, .crm = 1, .opc2 = 1,
+ { .name = "ATCM", .cp = 15, .opc1 = 0, .crn = 9, .crm = 1, .opc2 = 1,
.access = PL1_RW, .type = ARM_CP_CONST },
{ .name = "DCACHE_INVAL", .cp = 15, .opc1 = 0, .crn = 15, .crm = 5,
.opc2 = 0, .access = PL1_W, .type = ARM_CP_NOP },
--
2.34.1
- [PULL 0/9] target-arm queue, Peter Maydell, 2024/11/26
- [PULL 1/9] target/arm/tcg/cpu32.c: swap ATCM and BTCM register names,
Peter Maydell <=
- [PULL 4/9] docs/system/arm/emulation: add FEAT_SSBS2, Peter Maydell, 2024/11/26
- [PULL 2/9] docs/system/arm/emulation: mention armv9, Peter Maydell, 2024/11/26
- [PULL 5/9] target/arm/tcg/: fix typo in FEAT name, Peter Maydell, 2024/11/26
- [PULL 3/9] docs/system/arm/emulation: fix typo in feature name, Peter Maydell, 2024/11/26
- [PULL 6/9] docs/system/arm/: add FEAT_MTE_ASYNC, Peter Maydell, 2024/11/26
- [PULL 7/9] docs/system/arm/: add FEAT_DoubleLock, Peter Maydell, 2024/11/26
- [PULL 8/9] docs/system/arm/fby35: update link to product page, Peter Maydell, 2024/11/26
- [PULL 9/9] docs/system/arm/aspeed: add missing model supermicrox11spi-bmc, Peter Maydell, 2024/11/26
- Re: [PULL 0/9] target-arm queue, Peter Maydell, 2024/11/26