diff options
| author | malc <av1474@comtv.ru> | 2012-11-21 10:55:28 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2012-11-21 10:56:22 +0400 |
| commit | ecf51c9abe63eae282e5f912d9367ce75f36636a (patch) | |
| tree | 59df43c0bb5821575b18a1df6f71ff653e10181f | |
| parent | 1d2a67f89abee0cef4e3d8a8dec739ef0be77120 (diff) | |
tcg/ppc: Fix !softmmu case
Signed-off-by: malc <av1474@comtv.ru>
| -rw-r--r-- | tcg/ppc/tcg-target.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c index a42a04a62a..d72d396270 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c @@ -628,9 +628,9 @@ static void tcg_out_tlb_check (TCGContext *s, int r0, int r1, int r2, static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc) { - int addr_reg, addr_reg2, data_reg, data_reg2, r0, r1, rbase, bswap; + int addr_reg, data_reg, data_reg2, r0, r1, rbase, bswap; #ifdef CONFIG_SOFTMMU - int mem_index, s_bits, r2; + int mem_index, s_bits, r2, addr_reg2; uint8_t *label_ptr; #endif @@ -741,9 +741,9 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc) static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc) { - int addr_reg, addr_reg2, r0, r1, data_reg, data_reg2, bswap, rbase; + int addr_reg, r0, r1, data_reg, data_reg2, bswap, rbase; #ifdef CONFIG_SOFTMMU - int mem_index, r2; + int mem_index, r2, addr_reg2; uint8_t *label_ptr; #endif @@ -979,6 +979,7 @@ void tcg_out_tb_finalize(TCGContext *s) } #endif +#ifdef CONFIG_SOFTMMU static void emit_ldst_trampoline (TCGContext *s, const void *ptr) { tcg_out32 (s, MFSPR | RT (3) | LR); @@ -987,6 +988,7 @@ static void emit_ldst_trampoline (TCGContext *s, const void *ptr) tcg_out_mov (s, TCG_TYPE_I32, 3, TCG_AREG0); tcg_out_b (s, 0, (tcg_target_long) ptr); } +#endif static void tcg_target_qemu_prologue (TCGContext *s) { @@ -1049,6 +1051,7 @@ static void tcg_target_qemu_prologue (TCGContext *s) tcg_out32 (s, ADDI | RT (1) | RA (1) | frame_size); tcg_out32 (s, BCLR | BO_ALWAYS); +#ifdef CONFIG_SOFTMMU for (i = 0; i < 4; ++i) { ld_trampolines[i] = s->code_ptr; emit_ldst_trampoline (s, qemu_ld_helpers[i]); @@ -1056,6 +1059,7 @@ static void tcg_target_qemu_prologue (TCGContext *s) st_trampolines[i] = s->code_ptr; emit_ldst_trampoline (s, qemu_st_helpers[i]); } +#endif } static void tcg_out_ld (TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1, |