On Thu, Apr 19, 2012 at 13:33, Richard Henderson <r...@twiddle.net> wrote: > > Signed-off-by: Richard Henderson <r...@twiddle.net> > --- > exec-all.h | 9 ++++++--- > tcg/sparc/tcg-target.c | 19 ++++++++++++++++--- > 2 files changed, 22 insertions(+), 6 deletions(-) > > diff --git a/exec-all.h b/exec-all.h > index 6bcc075..ece4226 100644 > --- a/exec-all.h > +++ b/exec-all.h > @@ -121,9 +121,10 @@ void tb_invalidate_phys_addr(target_phys_addr_t addr); > #define CODE_GEN_AVG_BLOCK_SIZE 64 > #endif > > -#if defined(_ARCH_PPC) || defined(__x86_64__) || defined(__arm__) || > defined(__i386__) > -#define USE_DIRECT_JUMP > -#elif defined(CONFIG_TCG_INTERPRETER) > +#if defined(__arm__) || defined(_ARCH_PPC) \ > + || defined(__x86_64__) || defined(__i386__) \ > + || defined(__sparc__) \ > + || defined(CONFIG_TCG_INTERPRETER) > #define USE_DIRECT_JUMP > #endif > > @@ -233,6 +234,8 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr, > uintptr_t addr) > __asm __volatile__ ("swi 0x9f0002" : : "r" (_beg), "r" (_end), "r" > (_flg)); > #endif > } > +#elif defined(__sparc__) > +extern void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr);
Using 'extern' for functions is not useful in C. Please also use uintptr_t to match other functions here. > #else > #error tb_set_jmp_target1 is missing > #endif > diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c > index 72d65cb..ac214e6 100644 > --- a/tcg/sparc/tcg-target.c > +++ b/tcg/sparc/tcg-target.c > @@ -1102,10 +1102,8 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode > opc, const TCGArg *args, > case INDEX_op_goto_tb: > if (s->tb_jmp_offset) { > /* direct jump method */ > - tcg_out_sethi(s, TCG_REG_T1, args[0] & 0xffffe000); > - tcg_out32(s, JMPL | INSN_RD(TCG_REG_G0) | INSN_RS1(TCG_REG_T1) | > - INSN_IMM13((args[0] & 0x1fff))); > s->tb_jmp_offset[args[0]] = s->code_ptr - s->code_buf; > + tcg_out32(s, CALL | (8 >> 2)); > } else { > /* indirect jump method */ > tcg_out_ld_ptr(s, TCG_REG_T1, (tcg_target_long)(s->tb_next + > args[0])); > @@ -1624,3 +1622,18 @@ void tcg_register_jit(void *buf, size_t buf_size) > > tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame)); > } > + > +void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr) > +{ > + uint32_t *ptr = (uint32_t *)jmp_addr; > + tcg_target_long disp = (tcg_target_long)(addr - jmp_addr) >> 2; > + > + /* We can reach the entire address space for 32-bit. For 64-bit > + the code_gen_buffer can't be larger than 2GB. */ > + if (TCG_TARGET_REG_BITS == 64 && !check_fit_tl(disp, 30)) { > + tcg_abort(); > + } > + > + *ptr = CALL | (disp & 0x3fffffff); > + flush_icache_range(jmp_addr, jmp_addr + 4); > +} > -- > 1.7.7.6 >