ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set the L field of CMP[L][I] when dealing with 64 bit quantities 

This (along with previous 2 commits) makes X86_64 work on ppc64 too.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4960 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
malc 2008-07-28 19:42:23 +00:00
parent 880e52b8b0
commit e924bbec7a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tcg/ppc64/tcg-target.c
View File

@ -34,8 +34,10 @@ static uint8_t *tb_ret_addr;
#if TARGET_LONG_BITS == 32 #if TARGET_LONG_BITS == 32
#define LD_ADDR LWZU #define LD_ADDR LWZU
#define CMP_L 0
#else #else
#define LD_ADDR LDU #define LD_ADDR LDU
#define CMP_L (1<<21)
#endif #endif
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
@ -588,7 +590,7 @@ static void tcg_out_qemu_ld (TCGContext *s, const TCGArg *args, int opc)
tcg_out_tlb_read (s, r0, r1, r2, addr_reg, s_bits, tcg_out_tlb_read (s, r0, r1, r2, addr_reg, s_bits,
offsetof (CPUState, tlb_table[mem_index][0].addr_read)); offsetof (CPUState, tlb_table[mem_index][0].addr_read));
tcg_out32 (s, CMP | BF (7) | RA (r2) | RB (r1)); tcg_out32 (s, CMP | BF (7) | RA (r2) | RB (r1) | CMP_L);
label1_ptr = s->code_ptr; label1_ptr = s->code_ptr;
#ifdef FAST_PATH #ifdef FAST_PATH
@ -715,7 +717,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc)
tcg_out_tlb_read (s, r0, r1, r2, addr_reg, opc, tcg_out_tlb_read (s, r0, r1, r2, addr_reg, opc,
offsetof (CPUState, tlb_table[mem_index][0].addr_write)); offsetof (CPUState, tlb_table[mem_index][0].addr_write));
tcg_out32 (s, CMP | BF (7) | RA (r2) | RB (r1)); tcg_out32 (s, CMP | BF (7) | RA (r2) | RB (r1) | CMP_L);
label1_ptr = s->code_ptr; label1_ptr = s->code_ptr;
#ifdef FAST_PATH #ifdef FAST_PATH
@ -882,7 +884,7 @@ static void tcg_out_addi (TCGContext *s, int reg, tcg_target_long val)
} }
static void tcg_out_cmp (TCGContext *s, int cond, TCGArg arg1, TCGArg arg2, static void tcg_out_cmp (TCGContext *s, int cond, TCGArg arg1, TCGArg arg2,
int const_arg2, int cr) int const_arg2, int cr, int arch64)
{ {
int imm; int imm;
uint32_t op; uint32_t op;
@ -939,7 +941,7 @@ static void tcg_out_cmp (TCGContext *s, int cond, TCGArg arg1, TCGArg arg2,
default: default:
tcg_abort (); tcg_abort ();
} }
op |= BF (cr); op |= BF (cr) | (arch64 << 21);
if (imm) if (imm)
tcg_out32 (s, op | RA (arg1) | (arg2 & 0xffff)); tcg_out32 (s, op | RA (arg1) | (arg2 & 0xffff));
@ -971,9 +973,9 @@ static void tcg_out_bc (TCGContext *s, int bc, int label_index)
static void tcg_out_brcond (TCGContext *s, int cond, static void tcg_out_brcond (TCGContext *s, int cond,
TCGArg arg1, TCGArg arg2, int const_arg2, TCGArg arg1, TCGArg arg2, int const_arg2,
int label_index) int label_index, int arch64)
{ {
tcg_out_cmp (s, cond, arg1, arg2, const_arg2, 7); tcg_out_cmp (s, cond, arg1, arg2, const_arg2, 7, arch64);
tcg_out_bc (s, tcg_to_bc[cond], label_index); tcg_out_bc (s, tcg_to_bc[cond], label_index);
} }
@ -1245,8 +1247,11 @@ static void tcg_out_op (TCGContext *s, int opc, const TCGArg *args,
break; break;
case INDEX_op_brcond_i32: case INDEX_op_brcond_i32:
tcg_out_brcond (s, args[2], args[0], args[1], const_args[1], args[3], 0);
break;
case INDEX_op_brcond_i64: case INDEX_op_brcond_i64:
tcg_out_brcond (s, args[2], args[0], args[1], const_args[1], args[3]); tcg_out_brcond (s, args[2], args[0], args[1], const_args[1], args[3], 1);
break; break;
case INDEX_op_neg_i32: case INDEX_op_neg_i32: