mirror of https://github.com/xqemu/xqemu.git
tcg-hppa: Load GUEST_BASE as an immediate.
Now that the prologue is generated after GUEST_BASE is fixed, we can load it as an immediate, and also avoid reserving the register if it isn't necessary. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
parent
9002ec794e
commit
4b31713dc4
|
@ -1629,11 +1629,10 @@ void tcg_target_qemu_prologue(TCGContext *s)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_USE_GUEST_BASE
|
#ifdef CONFIG_USE_GUEST_BASE
|
||||||
/* Note that GUEST_BASE can change after the prologue is generated.
|
if (GUEST_BASE != 0) {
|
||||||
To combat that, load the value from the variable instead of
|
tcg_out_movi(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, GUEST_BASE);
|
||||||
embedding a constant here. */
|
tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_REG);
|
||||||
tcg_out_ld(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG,
|
}
|
||||||
TCG_REG_R0, (tcg_target_long)&guest_base);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Jump to TB, and adjust R18 to be the return address. */
|
/* Jump to TB, and adjust R18 to be the return address. */
|
||||||
|
@ -1679,9 +1678,6 @@ void tcg_target_init(TCGContext *s)
|
||||||
tcg_regset_set_reg(s->reserved_regs, TCG_REG_DP); /* data pointer */
|
tcg_regset_set_reg(s->reserved_regs, TCG_REG_DP); /* data pointer */
|
||||||
tcg_regset_set_reg(s->reserved_regs, TCG_REG_SP); /* stack pointer */
|
tcg_regset_set_reg(s->reserved_regs, TCG_REG_SP); /* stack pointer */
|
||||||
tcg_regset_set_reg(s->reserved_regs, TCG_REG_R31); /* ble link reg */
|
tcg_regset_set_reg(s->reserved_regs, TCG_REG_R31); /* ble link reg */
|
||||||
#ifdef CONFIG_USE_GUEST_BASE
|
|
||||||
tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_REG);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
tcg_add_target_add_op_defs(hppa_op_defs);
|
tcg_add_target_add_op_defs(hppa_op_defs);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue