OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tcg-hppa: Fix GUEST_BASE initialization in prologue.

Browse Source 
Load from the guest_base variable rather than embed a constant.
Always reserve TCG_GUEST_BASE_REG if guest base support enabled.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Richard Henderson 2010-04-09 10:46:40 -07:00 committed by Aurelien Jarno
parent 0085bd5161
commit 884d348b7b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tcg/hppa/tcg-target.c
View File

@ -34,10 +34,6 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
/* This is an 8 byte temp slot in the stack frame. */
#define STACK_TEMP_OFS -16
#ifndef GUEST_BASE
#define GUEST_BASE 0
#endif
#ifdef CONFIG_USE_GUEST_BASE
#define TCG_GUEST_BASE_REG TCG_REG_R16
#else
@ -1649,9 +1645,13 @@ void tcg_target_qemu_prologue(TCGContext *s)
TCG_REG_SP, -frame_size + i * 4);
}
if (GUEST_BASE != 0) {
tcg_out_movi(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, GUEST_BASE);
}
#ifdef CONFIG_USE_GUEST_BASE
/* Note that GUEST_BASE can change after the prologue is generated.
To combat that, load the value from the variable instead of
embedding a constant here. */
tcg_out_ld(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG,
TCG_REG_R0, (tcg_target_long)&guest_base);
#endif
/* Jump to TB, and adjust R18 to be the return address. */
tcg_out32(s, INSN_BLE_SR4 | INSN_R2(TCG_REG_R26));
@ -1696,9 +1696,9 @@ 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_SP); /* stack pointer */
tcg_regset_set_reg(s->reserved_regs, TCG_REG_R31); /* ble link reg */
if (GUEST_BASE != 0) {
tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_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);
}