Reviewed-by: Helge Deller <deller@gmx.de>
Signed-off-by: Anton Johansson <anjo@rev.ng>
---
target/hppa/cpu.h | 11 ++++++++---
hw/hppa/machine.c | 4 ++--
hw/pci-host/astro.c | 2 +-
target/hppa/cpu.c | 9 ++++++++-
target/hppa/mem_helper.c | 39 +++++++++++----------------------------
5 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index 43b4882fb4..487f0f5e9e 100644
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -320,6 +320,11 @@ static inline const HPPACPUDef *hppa_def(CPUHPPAState *env)
return HPPA_CPU_GET_CLASS(env_cpu(env))->def;
}
+static inline uint8_t hppa_phys_addr_bits(CPUHPPAState *env)
+{
+ return hppa_def(env)->phys_addr_bits;
+}
+
static inline bool hppa_is_pa20(CPUHPPAState *env)
{
return hppa_def(env)->is_pa20;
@@ -352,9 +357,9 @@ static inline vaddr hppa_form_gva(CPUHPPAState *env, uint64_t spc,
return hppa_form_gva_mask(env->gva_offset_mask, spc, off);
}
-hwaddr hppa_abs_to_phys_pa1x(vaddr addr);
-hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr);
-hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr);
+hwaddr hppa_abs_to_phys_pa1x(CPUHPPAState *env, vaddr addr);
+hwaddr hppa_abs_to_phys_pa2_w0(CPUHPPAState *env, vaddr addr);
+hwaddr hppa_abs_to_phys_pa2_w1(CPUHPPAState *env, vaddr addr);
/*
* Since PSW_{I,CB} will never need to be in tb->flags, reuse them.
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 5d0d4de09e..bb6b7dc76c 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -181,12 +181,12 @@ static uint64_t linux_kernel_virt_to_phys(void *opaque, uint64_t addr)
static uint64_t translate_pa10(void *dummy, uint64_t addr)
{
- return hppa_abs_to_phys_pa1x(addr);
+ return hppa_abs_to_phys_pa1x(cpu_env(first_cpu), addr);
}
static uint64_t translate_pa20(void *dummy, uint64_t addr)
{
- return hppa_abs_to_phys_pa2_w0(addr);
+ return hppa_abs_to_phys_pa2_w0(cpu_env(first_cpu), addr);
}
static HPPACPU *cpu[HPPA_MAX_CPUS];
diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c
index 00a904277c..d38f81e553 100644
--- a/hw/pci-host/astro.c
+++ b/hw/pci-host/astro.c
@@ -303,7 +303,7 @@ static IOMMUTLBEntry astro_translate_iommu(IOMMUMemoryRegion *iommu,
* language which not-coincidentally matches the PSW.W=0 mapping.
*/
if (addr <= UINT32_MAX) {
- entry = hppa_abs_to_phys_pa2_w0(addr);
+ entry = hppa_abs_to_phys_pa2_w0(cpu_env(first_cpu), addr);
} else {
entry = addr;
}
diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
index cc755da8be..b04bcfa6a0 100644
--- a/target/hppa/cpu.c
+++ b/target/hppa/cpu.c
@@ -282,7 +282,14 @@ static void hppa_cpu_class_base_init(ObjectClass *oc, const void *data)
HPPACPUClass *acc = HPPA_CPU_CLASS(oc);
/* Make sure all CPU models define a HPPACPUDef */
g_assert(!object_class_is_abstract(oc) && data != NULL);
- acc->def = data;
+ if (data) {
+ acc->def = data;
+ /*
+ * Verify assumptions made in hppa_abs_to_phys_pa2_w1() on the size
+ * of the physical address space.
+ */
+ g_assert(acc->def->phys_addr_bits <= 54);
+ }
}
static void hppa_cpu_class_init(ObjectClass *oc, const void *data)
diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c
index 9199d1e06a..9a11294f75 100644
--- a/target/hppa/mem_helper.c
+++ b/target/hppa/mem_helper.c
@@ -29,29 +29,12 @@
#include "hw/core/cpu.h"
#include "trace.h"
-/*
- * 64-bit (PA-RISC 2.0) machines are assumed to run PA-8700, and 32-bit
- * machines 7300LC. This should give 44 and 32 bits of physical address
- * space respectively.
- *
- * CPU model Physical address space bits
- * PA-7000--7300LC 32
- * PA-8000--8600 40
- * PA-8700--8900 44
- *
- * FIXME: However, the SeaBIOS firmware that is that tested against
- * uses 40-bit physical addresses, despite supposedly running a C3700
- * with a PA-8700 cpu, so use 40-bits for 64-bit.
- */
-#define HPPA_PHYS_ADDR_SPACE_BITS_PA20 40
-#define HPPA_PHYS_ADDR_SPACE_BITS_PA1X 32
-
-hwaddr hppa_abs_to_phys_pa1x(vaddr addr)
+hwaddr hppa_abs_to_phys_pa1x(CPUHPPAState *env, vaddr addr)
{
- return extract64(addr, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA1X);
+ return extract64(addr, 0, hppa_phys_addr_bits(env));
}
-hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr)
+hwaddr hppa_abs_to_phys_pa2_w1(CPUHPPAState *env, vaddr addr)
{
/*
* Figure H-8 "62-bit Absolute Accesses when PSW W-bit is 1" describes
@@ -64,11 +47,11 @@ hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr)
* Since the supported physical address space is below 54 bits, the
* H-8 algorithm is moot and all that is left is to truncate.
*/
- QEMU_BUILD_BUG_ON(HPPA_PHYS_ADDR_SPACE_BITS_PA20 > 54);
- return sextract64(addr, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA20);
+ const uint8_t pa = hppa_phys_addr_bits(env);
+ return sextract64(addr, 0, pa);
}
-hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr)
+hwaddr hppa_abs_to_phys_pa2_w0(CPUHPPAState *env, vaddr addr)
{
/*
* See Figure H-10, "Absolute Accesses when PSW W-bit is 0",
@@ -89,7 +72,7 @@ hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr)
* is what can be seen on physical machines too.
*/
addr = (uint32_t)addr;
- addr |= -1ull << (HPPA_PHYS_ADDR_SPACE_BITS_PA20 - 4);
+ addr |= -1ull << (hppa_phys_addr_bits(env) - 4);
}
return addr;
}
@@ -233,13 +216,13 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx,
if (MMU_IDX_MMU_DISABLED(mmu_idx)) {
switch (mmu_idx) {
case MMU_ABS_W_IDX:
- phys = hppa_abs_to_phys_pa2_w1(addr);
+ phys = hppa_abs_to_phys_pa2_w1(env, addr);
break;
case MMU_ABS_IDX:
if (hppa_is_pa20(env)) {
- phys = hppa_abs_to_phys_pa2_w0(addr);
+ phys = hppa_abs_to_phys_pa2_w0(env, addr);
} else {
- phys = hppa_abs_to_phys_pa1x(addr);
+ phys = hppa_abs_to_phys_pa1x(env, addr);
}
break;
default:
@@ -580,7 +563,7 @@ static void itlbt_pa20(CPUHPPAState *env, target_ulong r1,
/* Align per the page size. */
ent->pa &= TARGET_PAGE_MASK << mask_shift;
/* Ignore the bits beyond physical address space. */
- ent->pa = sextract64(ent->pa, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA20);
+ ent->pa = sextract64(ent->pa, 0, hppa_phys_addr_bits(env));
ent->t = extract64(r2, 61, 1);
ent->d = extract64(r2, 60, 1);
--
2.52.0On 3/3/26 17:11, Anton Johansson via qemu development wrote:
> Reviewed-by: Helge Deller <deller@gmx.de>
> Signed-off-by: Anton Johansson <anjo@rev.ng>
> ---
> target/hppa/cpu.h | 11 ++++++++---
> hw/hppa/machine.c | 4 ++--
> hw/pci-host/astro.c | 2 +-
> target/hppa/cpu.c | 9 ++++++++-
> target/hppa/mem_helper.c | 39 +++++++++++----------------------------
> 5 files changed, 30 insertions(+), 35 deletions(-)
> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> index 5d0d4de09e..bb6b7dc76c 100644
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -181,12 +181,12 @@ static uint64_t linux_kernel_virt_to_phys(void *opaque, uint64_t addr)
>
> static uint64_t translate_pa10(void *dummy, uint64_t addr)
> {
> - return hppa_abs_to_phys_pa1x(addr);
> + return hppa_abs_to_phys_pa1x(cpu_env(first_cpu), addr);
I'm not keen of these @first_cpu uses (for heterogeneous emulation
we want to restrict this variable to accel/, and poison it elsewhere
like in hw/). Can we resolve earlier or pass CPUState* around?
> }
>
> static uint64_t translate_pa20(void *dummy, uint64_t addr)
> {
> - return hppa_abs_to_phys_pa2_w0(addr);
> + return hppa_abs_to_phys_pa2_w0(cpu_env(first_cpu), addr);
> }
>
> static HPPACPU *cpu[HPPA_MAX_CPUS];
> diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c
> index 00a904277c..d38f81e553 100644
> --- a/hw/pci-host/astro.c
> +++ b/hw/pci-host/astro.c
> @@ -303,7 +303,7 @@ static IOMMUTLBEntry astro_translate_iommu(IOMMUMemoryRegion *iommu,
> * language which not-coincidentally matches the PSW.W=0 mapping.
> */
> if (addr <= UINT32_MAX) {
> - entry = hppa_abs_to_phys_pa2_w0(addr);
> + entry = hppa_abs_to_phys_pa2_w0(cpu_env(first_cpu), addr);
> } else {
> entry = addr;
> }
> - * CPU model Physical address space bits
> - * PA-7000--7300LC 32
> - * PA-8000--8600 40
> - * PA-8700--8900 44
> - *
> - * FIXME: However, the SeaBIOS firmware that is that tested against
> - * uses 40-bit physical addresses, despite supposedly running a C3700
> - * with a PA-8700 cpu, so use 40-bits for 64-bit.
> - */
> -#define HPPA_PHYS_ADDR_SPACE_BITS_PA20 40
> -#define HPPA_PHYS_ADDR_SPACE_BITS_PA1X 32
> -
> -hwaddr hppa_abs_to_phys_pa1x(vaddr addr)
> +hwaddr hppa_abs_to_phys_pa1x(CPUHPPAState *env, vaddr addr)
> {
> - return extract64(addr, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA1X);
> + return extract64(addr, 0, hppa_phys_addr_bits(env));
> }
>
> -hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr)
> +hwaddr hppa_abs_to_phys_pa2_w1(CPUHPPAState *env, vaddr addr)
> {
> /*
> * Figure H-8 "62-bit Absolute Accesses when PSW W-bit is 1" describes
> @@ -64,11 +47,11 @@ hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr)
> * Since the supported physical address space is below 54 bits, the
> * H-8 algorithm is moot and all that is left is to truncate.
> */
> - QEMU_BUILD_BUG_ON(HPPA_PHYS_ADDR_SPACE_BITS_PA20 > 54);
> - return sextract64(addr, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA20);
> + const uint8_t pa = hppa_phys_addr_bits(env);
> + return sextract64(addr, 0, pa);
> }
>
> -hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr)
> +hwaddr hppa_abs_to_phys_pa2_w0(CPUHPPAState *env, vaddr addr)
> {
> /*
> * See Figure H-10, "Absolute Accesses when PSW W-bit is 0",
> @@ -89,7 +72,7 @@ hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr)
> * is what can be seen on physical machines too.
> */
> addr = (uint32_t)addr;
> - addr |= -1ull << (HPPA_PHYS_ADDR_SPACE_BITS_PA20 - 4);
> + addr |= -1ull << (hppa_phys_addr_bits(env) - 4);
> }
> return addr;
> }
> @@ -233,13 +216,13 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx,
> if (MMU_IDX_MMU_DISABLED(mmu_idx)) {
> switch (mmu_idx) {
> case MMU_ABS_W_IDX:
> - phys = hppa_abs_to_phys_pa2_w1(addr);
> + phys = hppa_abs_to_phys_pa2_w1(env, addr);
> break;
> case MMU_ABS_IDX:
> if (hppa_is_pa20(env)) {
> - phys = hppa_abs_to_phys_pa2_w0(addr);
> + phys = hppa_abs_to_phys_pa2_w0(env, addr);
> } else {
> - phys = hppa_abs_to_phys_pa1x(addr);
> + phys = hppa_abs_to_phys_pa1x(env, addr);
> }
> break;
> default:
> @@ -580,7 +563,7 @@ static void itlbt_pa20(CPUHPPAState *env, target_ulong r1,
> /* Align per the page size. */
> ent->pa &= TARGET_PAGE_MASK << mask_shift;
> /* Ignore the bits beyond physical address space. */
> - ent->pa = sextract64(ent->pa, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA20);
> + ent->pa = sextract64(ent->pa, 0, hppa_phys_addr_bits(env));
>
> ent->t = extract64(r2, 61, 1);
> ent->d = extract64(r2, 60, 1);
>
On 04/03/26, Philippe Mathieu-Daudé wrote:
> On 3/3/26 17:11, Anton Johansson via qemu development wrote:
> > Reviewed-by: Helge Deller <deller@gmx.de>
> > Signed-off-by: Anton Johansson <anjo@rev.ng>
> > ---
> > target/hppa/cpu.h | 11 ++++++++---
> > hw/hppa/machine.c | 4 ++--
> > hw/pci-host/astro.c | 2 +-
> > target/hppa/cpu.c | 9 ++++++++-
> > target/hppa/mem_helper.c | 39 +++++++++++----------------------------
> > 5 files changed, 30 insertions(+), 35 deletions(-)
>
>
> > diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> > index 5d0d4de09e..bb6b7dc76c 100644
> > --- a/hw/hppa/machine.c
> > +++ b/hw/hppa/machine.c
> > @@ -181,12 +181,12 @@ static uint64_t linux_kernel_virt_to_phys(void *opaque, uint64_t addr)
> > static uint64_t translate_pa10(void *dummy, uint64_t addr)
> > {
> > - return hppa_abs_to_phys_pa1x(addr);
> > + return hppa_abs_to_phys_pa1x(cpu_env(first_cpu), addr);
>
> I'm not keen of these @first_cpu uses (for heterogeneous emulation
> we want to restrict this variable to accel/, and poison it elsewhere
> like in hw/). Can we resolve earlier or pass CPUState* around?
Right, I had this in the back of my mind somewhere. Both uses in
machine.c can be changed to instead use the first created HPPA cpu
through `&cpu[0]->env`, which is commonly used in machine.c.
As for the use in astro.c, I think the best option is to add a property
for `phys_addr_bits`. However, this requires changing
hppa_abs_to_phys*() to take `uint8_t phys_addr_bits` instead of
`CPUHPPAState *env`, which IMO is preferable as
`hppa_get_physical_address()` becomes a bit simpler
int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx,
int type, MemOp mop, hwaddr *pphys, int *pprot)
{
hwaddr phys;
int prot, r_prot, w_prot, x_prot, priv;
HPPATLBEntry *ent;
int ret = -1;
/* Virtual translation disabled. Map absolute to physical. */
if (MMU_IDX_MMU_DISABLED(mmu_idx)) {
+ const uint8_t pa_bits = hppa_phys_addr_bits(env);
switch (mmu_idx) {
case MMU_ABS_W_IDX:
- phys = hppa_abs_to_phys_pa2_w1(env, addr);
+ phys = hppa_abs_to_phys_pa2_w1(pa_bits, addr);
break;
case MMU_ABS_IDX:
if (hppa_is_pa20(env)) {
- phys = hppa_abs_to_phys_pa2_w0(env, addr);
+ phys = hppa_abs_to_phys_pa2_w0(pa_bits, addr);
} else {
- phys = hppa_abs_to_phys_pa1x(env, addr);
+ phys = hppa_abs_to_phys_pa1x(pa_bits, addr);
}
break;
default:
g_assert_not_reached();
}
prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
goto egress_align;
}
...
}
--
Anton Johansson
rev.ng Labs Srl.
On 3/4/26 03:11, Anton Johansson wrote:
> Reviewed-by: Helge Deller <deller@gmx.de>
> Signed-off-by: Anton Johansson <anjo@rev.ng>
> ---
> target/hppa/cpu.h | 11 ++++++++---
> hw/hppa/machine.c | 4 ++--
> hw/pci-host/astro.c | 2 +-
> target/hppa/cpu.c | 9 ++++++++-
> target/hppa/mem_helper.c | 39 +++++++++++----------------------------
> 5 files changed, 30 insertions(+), 35 deletions(-)
>
> diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
> index 43b4882fb4..487f0f5e9e 100644
> --- a/target/hppa/cpu.h
> +++ b/target/hppa/cpu.h
> @@ -320,6 +320,11 @@ static inline const HPPACPUDef *hppa_def(CPUHPPAState *env)
> return HPPA_CPU_GET_CLASS(env_cpu(env))->def;
> }
>
> +static inline uint8_t hppa_phys_addr_bits(CPUHPPAState *env)
> +{
> + return hppa_def(env)->phys_addr_bits;
> +}
> +
> static inline bool hppa_is_pa20(CPUHPPAState *env)
> {
> return hppa_def(env)->is_pa20;
> @@ -352,9 +357,9 @@ static inline vaddr hppa_form_gva(CPUHPPAState *env, uint64_t spc,
> return hppa_form_gva_mask(env->gva_offset_mask, spc, off);
> }
>
> -hwaddr hppa_abs_to_phys_pa1x(vaddr addr);
> -hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr);
> -hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr);
> +hwaddr hppa_abs_to_phys_pa1x(CPUHPPAState *env, vaddr addr);
> +hwaddr hppa_abs_to_phys_pa2_w0(CPUHPPAState *env, vaddr addr);
> +hwaddr hppa_abs_to_phys_pa2_w1(CPUHPPAState *env, vaddr addr);
>
> /*
> * Since PSW_{I,CB} will never need to be in tb->flags, reuse them.
> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> index 5d0d4de09e..bb6b7dc76c 100644
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -181,12 +181,12 @@ static uint64_t linux_kernel_virt_to_phys(void *opaque, uint64_t addr)
>
> static uint64_t translate_pa10(void *dummy, uint64_t addr)
> {
> - return hppa_abs_to_phys_pa1x(addr);
> + return hppa_abs_to_phys_pa1x(cpu_env(first_cpu), addr);
> }
>
> static uint64_t translate_pa20(void *dummy, uint64_t addr)
> {
> - return hppa_abs_to_phys_pa2_w0(addr);
> + return hppa_abs_to_phys_pa2_w0(cpu_env(first_cpu), addr);
> }
>
> static HPPACPU *cpu[HPPA_MAX_CPUS];
> diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c
> index 00a904277c..d38f81e553 100644
> --- a/hw/pci-host/astro.c
> +++ b/hw/pci-host/astro.c
> @@ -303,7 +303,7 @@ static IOMMUTLBEntry astro_translate_iommu(IOMMUMemoryRegion *iommu,
> * language which not-coincidentally matches the PSW.W=0 mapping.
> */
> if (addr <= UINT32_MAX) {
> - entry = hppa_abs_to_phys_pa2_w0(addr);
> + entry = hppa_abs_to_phys_pa2_w0(cpu_env(first_cpu), addr);
> } else {
> entry = addr;
> }
> diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
> index cc755da8be..b04bcfa6a0 100644
> --- a/target/hppa/cpu.c
> +++ b/target/hppa/cpu.c
> @@ -282,7 +282,14 @@ static void hppa_cpu_class_base_init(ObjectClass *oc, const void *data)
> HPPACPUClass *acc = HPPA_CPU_CLASS(oc);
> /* Make sure all CPU models define a HPPACPUDef */
> g_assert(!object_class_is_abstract(oc) && data != NULL);
> - acc->def = data;
> + if (data) {
You just asserted data != NULL.
r~
On 03/03/26, Richard Henderson wrote:
> On 3/4/26 03:11, Anton Johansson wrote:
> > Reviewed-by: Helge Deller <deller@gmx.de>
> > Signed-off-by: Anton Johansson <anjo@rev.ng>
> > ---
> > target/hppa/cpu.h | 11 ++++++++---
> > hw/hppa/machine.c | 4 ++--
> > hw/pci-host/astro.c | 2 +-
> > target/hppa/cpu.c | 9 ++++++++-
> > target/hppa/mem_helper.c | 39 +++++++++++----------------------------
> > 5 files changed, 30 insertions(+), 35 deletions(-)
> >
> > diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
> > index 43b4882fb4..487f0f5e9e 100644
> > --- a/target/hppa/cpu.h
> > +++ b/target/hppa/cpu.h
> > @@ -320,6 +320,11 @@ static inline const HPPACPUDef *hppa_def(CPUHPPAState *env)
> > return HPPA_CPU_GET_CLASS(env_cpu(env))->def;
> > }
> > +static inline uint8_t hppa_phys_addr_bits(CPUHPPAState *env)
> > +{
> > + return hppa_def(env)->phys_addr_bits;
> > +}
> > +
> > static inline bool hppa_is_pa20(CPUHPPAState *env)
> > {
> > return hppa_def(env)->is_pa20;
> > @@ -352,9 +357,9 @@ static inline vaddr hppa_form_gva(CPUHPPAState *env, uint64_t spc,
> > return hppa_form_gva_mask(env->gva_offset_mask, spc, off);
> > }
> > -hwaddr hppa_abs_to_phys_pa1x(vaddr addr);
> > -hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr);
> > -hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr);
> > +hwaddr hppa_abs_to_phys_pa1x(CPUHPPAState *env, vaddr addr);
> > +hwaddr hppa_abs_to_phys_pa2_w0(CPUHPPAState *env, vaddr addr);
> > +hwaddr hppa_abs_to_phys_pa2_w1(CPUHPPAState *env, vaddr addr);
> > /*
> > * Since PSW_{I,CB} will never need to be in tb->flags, reuse them.
> > diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> > index 5d0d4de09e..bb6b7dc76c 100644
> > --- a/hw/hppa/machine.c
> > +++ b/hw/hppa/machine.c
> > @@ -181,12 +181,12 @@ static uint64_t linux_kernel_virt_to_phys(void *opaque, uint64_t addr)
> > static uint64_t translate_pa10(void *dummy, uint64_t addr)
> > {
> > - return hppa_abs_to_phys_pa1x(addr);
> > + return hppa_abs_to_phys_pa1x(cpu_env(first_cpu), addr);
> > }
> > static uint64_t translate_pa20(void *dummy, uint64_t addr)
> > {
> > - return hppa_abs_to_phys_pa2_w0(addr);
> > + return hppa_abs_to_phys_pa2_w0(cpu_env(first_cpu), addr);
> > }
> > static HPPACPU *cpu[HPPA_MAX_CPUS];
> > diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c
> > index 00a904277c..d38f81e553 100644
> > --- a/hw/pci-host/astro.c
> > +++ b/hw/pci-host/astro.c
> > @@ -303,7 +303,7 @@ static IOMMUTLBEntry astro_translate_iommu(IOMMUMemoryRegion *iommu,
> > * language which not-coincidentally matches the PSW.W=0 mapping.
> > */
> > if (addr <= UINT32_MAX) {
> > - entry = hppa_abs_to_phys_pa2_w0(addr);
> > + entry = hppa_abs_to_phys_pa2_w0(cpu_env(first_cpu), addr);
> > } else {
> > entry = addr;
> > }
> > diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
> > index cc755da8be..b04bcfa6a0 100644
> > --- a/target/hppa/cpu.c
> > +++ b/target/hppa/cpu.c
> > @@ -282,7 +282,14 @@ static void hppa_cpu_class_base_init(ObjectClass *oc, const void *data)
> > HPPACPUClass *acc = HPPA_CPU_CLASS(oc);
> > /* Make sure all CPU models define a HPPACPUDef */
> > g_assert(!object_class_is_abstract(oc) && data != NULL);
> > - acc->def = data;
> > + if (data) {
>
> You just asserted data != NULL.
Agh I see I misunderstood class_base_init().. I thought it,
counterintuitively, would also be called for the parent class.
I'll remove this.
Thanks!
//Anton
© 2016 - 2026 Red Hat, Inc.