| Message ID | 20210702215235.1941771-4-farosas@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/ppc: MMU debug fixes | expand |
On Fri, Jul 02, 2021 at 06:52:35PM -0300, Fabiano Rosas wrote: > ../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> Applied to ppc-for-6.1, thanks. > --- > 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 9f0a497657..330bb0432e 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 898021f0d8..4fdeaf1937 100644 > --- a/target/ppc/mmu-hash32.h > +++ b/target/ppc/mmu-hash32.h > @@ -22,6 +22,8 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr address, int rw, > * 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
diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c index 9f0a497657..330bb0432e 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 898021f0d8..4fdeaf1937 100644 --- a/target/ppc/mmu-hash32.h +++ b/target/ppc/mmu-hash32.h @@ -22,6 +22,8 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr address, int rw, * 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
../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> --- target/ppc/mmu-hash32.c | 5 ++++- target/ppc/mmu-hash32.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)