openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

On ppc32 make tb_set_jmp_target1 behave like it does on a ppc64 

Avoids nasty warnings about flush_icache_range from gcc4 and inability
to compile [cpu-]exec.c with gcc3 and -O, also the function is much
too large to be candidate for inlining anyway.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4974 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
malc 2008-07-29 20:08:17 +00:00
parent 23cde8bb12
commit 52781543ad
2 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
exec-all.h
View File

@ -191,43 +191,8 @@ extern int code_gen_max_blocks;
#if defined(USE_DIRECT_JUMP)
#if defined(__powerpc__)
#if defined(__powerpc64__)
extern void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr);
#define tb_set_jmp_target1 ppc_tb_set_jmp_target
#else
static inline void flush_icache_range(unsigned long start, unsigned long stop);
static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr)
{
/* This must be in concord with INDEX_op_goto_tb inside tcg_out_op */
uint32_t *ptr;
long disp = addr - jmp_addr;
unsigned long patch_size;
ptr = (uint32_t *)jmp_addr;
if ((disp << 6) >> 6 != disp) {
ptr[0] = 0x3c000000 | (addr >> 16); /* lis 0,addr@ha */
ptr[1] = 0x60000000 | (addr & 0xffff); /* la 0,addr@l(0) */
ptr[2] = 0x7c0903a6; /* mtctr 0 */
ptr[3] = 0x4e800420; /* brctr */
patch_size = 16;
} else {
/* patch the branch destination */
if (disp != 16) {
*ptr = 0x48000000 | (disp & 0x03fffffc); /* b disp */
patch_size = 4;
} else {
ptr[0] = 0x60000000; /* nop */
ptr[1] = 0x60000000;
ptr[2] = 0x60000000;
ptr[3] = 0x60000000;
patch_size = 16;
}
}
/* flush icache */
flush_icache_range(jmp_addr, jmp_addr + patch_size);
}
#endif
#elif defined(__i386__) || defined(__x86_64__)
static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr)
{

31
tcg/ppc/tcg-target.c
View File

@ -1015,6 +1015,37 @@ static void tcg_out_brcond2 (TCGContext *s, const TCGArg *args,
tcg_out_bc (s, (BC | BI (7, CR_EQ) | BO_COND_TRUE), label_index);
}
void ppc_tb_set_jmp_target (unsigned long jmp_addr, unsigned long addr)
{
uint32_t *ptr;
long disp = addr - jmp_addr;
unsigned long patch_size;
ptr = (uint32_t *)jmp_addr;
if ((disp << 6) >> 6 != disp) {
ptr[0] = 0x3c000000 | (addr >> 16); /* lis 0,addr@ha */
ptr[1] = 0x60000000 | (addr & 0xffff); /* la 0,addr@l(0) */
ptr[2] = 0x7c0903a6; /* mtctr 0 */
ptr[3] = 0x4e800420; /* brctr */
patch_size = 16;
} else {
/* patch the branch destination */
if (disp != 16) {
*ptr = 0x48000000 | (disp & 0x03fffffc); /* b disp */
patch_size = 4;
} else {
ptr[0] = 0x60000000; /* nop */
ptr[1] = 0x60000000;
ptr[2] = 0x60000000;
ptr[3] = 0x60000000;
patch_size = 16;
}
}
/* flush icache */
flush_icache_range(jmp_addr, jmp_addr + patch_size);
}
static void tcg_out_op(TCGContext *s, int opc, const TCGArg *args,
const int *const_args)
{