[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/33] target/ppc: Fix compilation with DEBUG_BATS debug option
From: |
David Gibson |
Subject: |
[PULL 15/33] target/ppc: Fix compilation with DEBUG_BATS debug option |
Date: |
Fri, 9 Jul 2021 15:17:10 +1000 |
From: Fabiano Rosas <farosas@linux.ibm.com>
../target/ppc/mmu-hash32.c: In function 'ppc_hash32_bat_lookup':
../target/ppc/mmu-hash32.c:204:13: error: 'BATu' undeclared (first use in this
function);
204 | BATu = &BATut[i];
| ^~~~
| BATut
../target/ppc/mmu-hash32.c:205:13: error: 'BATl' undeclared (first use in this
function);
205 | BATl = &BATlt[i];
| ^~~~
| BATlt
../target/ppc/mmu-hash32.c:206:13: error: 'BEPIu' undeclared (first use in this
function)
206 | BEPIu = *BATu & BATU32_BEPIU;
| ^~~~~
../target/ppc/mmu-hash32.c:206:29: error: 'BATU32_BEPIU' undeclared (first use
in this function);
206 | BEPIu = *BATu & BATU32_BEPIU;
| ^~~~~~~~~~~~
| BATU32_BEPI
../target/ppc/mmu-hash32.c:207:13: error: 'BEPIl' undeclared (first use in this
function)
207 | BEPIl = *BATu & BATU32_BEPIL;
| ^~~~~
../target/ppc/mmu-hash32.c:207:29: error: 'BATU32_BEPIL' undeclared (first use
in this function);
207 | BEPIl = *BATu & BATU32_BEPIL;
| ^~~~~~~~~~~~
| BATU32_BEPI
../target/ppc/mmu-hash32.c:208:13: error: 'bl' undeclared (first use in this
function)
208 | bl = (*BATu & 0x00001FFC) << 15;
| ^~
Fixes: 9813279664 ("target-ppc: Disentangle BAT code for 32-bit hash MMUs")
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Message-Id: <20210702215235.1941771-4-farosas@linux.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
target/ppc/mmu-hash32.c | 5 ++++-
target/ppc/mmu-hash32.h | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c
index 6a07c345e4..4edd5ffe14 100644
--- a/target/ppc/mmu-hash32.c
+++ b/target/ppc/mmu-hash32.c
@@ -27,7 +27,7 @@
#include "mmu-hash32.h"
#include "exec/log.h"
-/* #define DEBUG_BAT */
+/* #define DEBUG_BATS */
#ifdef DEBUG_BATS
# define LOG_BATS(...) qemu_log_mask(CPU_LOG_MMU, __VA_ARGS__)
@@ -199,6 +199,9 @@ static hwaddr ppc_hash32_bat_lookup(PowerPCCPU *cpu,
target_ulong ea,
/* No hit */
#if defined(DEBUG_BATS)
if (qemu_log_enabled()) {
+ target_ulong *BATu, *BATl;
+ target_ulong BEPIl, BEPIu, bl;
+
LOG_BATS("no BAT match for " TARGET_FMT_lx ":\n", ea);
for (i = 0; i < 4; i++) {
BATu = &BATut[i];
diff --git a/target/ppc/mmu-hash32.h b/target/ppc/mmu-hash32.h
index 8694eccabd..c9f584b8ee 100644
--- a/target/ppc/mmu-hash32.h
+++ b/target/ppc/mmu-hash32.h
@@ -22,6 +22,8 @@ bool ppc_hash32_xlate(PowerPCCPU *cpu, vaddr eaddr,
MMUAccessType access_type,
* Block Address Translation (BAT) definitions
*/
+#define BATU32_BEPIU 0xf0000000
+#define BATU32_BEPIL 0x0ffe0000
#define BATU32_BEPI 0xfffe0000
#define BATU32_BL 0x00001ffc
#define BATU32_VS 0x00000002
--
2.31.1
- [PULL 00/33] ppc-for-6.1 queue 20210709, David Gibson, 2021/07/09
- [PULL 02/33] target/ppc: Drop PowerPCCPUClass::interrupts_big_endian(), David Gibson, 2021/07/09
- [PULL 04/33] target/ppc: Remove PowerPCCPUClass.handle_mmu_fault, David Gibson, 2021/07/09
- [PULL 01/33] target/ppc: Introduce ppc_interrupts_little_endian(), David Gibson, 2021/07/09
- [PULL 05/33] target/ppc: Use MMUAccessType with *_handle_mmu_fault, David Gibson, 2021/07/09
- [PULL 03/33] spapr: tune rtas-size, David Gibson, 2021/07/09
- [PULL 07/33] target/ppc: Use bool success for ppc_radix64_xlate, David Gibson, 2021/07/09
- [PULL 06/33] target/ppc: Push real-mode handling into ppc_radix64_xlate, David Gibson, 2021/07/09
- [PULL 12/33] target/ppc: Restrict ppc_cpu_tlb_fill to TCG, David Gibson, 2021/07/09
- [PULL 14/33] target/ppc: Fix compilation with FLUSH_ALL_TLBS debug option, David Gibson, 2021/07/09
- [PULL 15/33] target/ppc: Fix compilation with DEBUG_BATS debug option,
David Gibson <=
- [PULL 08/33] target/ppc: Split out ppc_hash64_xlate, David Gibson, 2021/07/09
- [PULL 18/33] target/ppc: introduce mmu-books.h, David Gibson, 2021/07/09
- [PULL 17/33] target/ppc: changed ppc_hash64_xlate to use mmu_idx, David Gibson, 2021/07/09
- [PULL 09/33] target/ppc: Split out ppc_hash32_xlate, David Gibson, 2021/07/09
- [PULL 10/33] target/ppc: Split out ppc_jumbo_xlate, David Gibson, 2021/07/09
- [PULL 13/33] target/ppc: Fix compilation with DUMP_PAGE_TABLES debug option, David Gibson, 2021/07/09
- [PULL 11/33] target/ppc: Introduce ppc_xlate, David Gibson, 2021/07/09
- [PULL 21/33] docs/system: ppc: Update ppce500 documentation with eTSEC support, David Gibson, 2021/07/09
- [PULL 19/33] target/ppc: change ppc_hash32_xlate to use mmu_idx, David Gibson, 2021/07/09
- [PULL 23/33] target/ppc: mtmsrd is an illegal instruction on BookE, David Gibson, 2021/07/09