提交 4cc633c3 编写于 作者: B balrog

Patch holes in ARM translation (Laurent Desnogues).

 - gen_set_CF_bit31:  use the right value to set carry flag
 - shifter_out_im:  remove a spurious semi-colon
 - add a break for VSHRN, VRSHRN, VQSHRN, VQRSHRN
   size 2 case
 - sbfx, ubfx are v6t2 instructions

The correct cps user mode behaviour is unclear so it's left out from the
commit until ARM decides it.
Signed-off-by: NLaurent Desnogues <laurent.desnogues@gmail.com>
Signed-off-by: NAndrzej Zaborowski <andrew.zaborowski@intel.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5908 c046a42c-6fe2-441c-8c8c-71466251a162
上级 aaf2d97d
...@@ -415,7 +415,7 @@ static void gen_set_CF_bit31(TCGv var) ...@@ -415,7 +415,7 @@ static void gen_set_CF_bit31(TCGv var)
{ {
TCGv tmp = new_tmp(); TCGv tmp = new_tmp();
tcg_gen_shri_i32(tmp, var, 31); tcg_gen_shri_i32(tmp, var, 31);
gen_set_CF(var); gen_set_CF(tmp);
dead_tmp(tmp); dead_tmp(tmp);
} }
...@@ -490,7 +490,7 @@ static void shifter_out_im(TCGv var, int shift) ...@@ -490,7 +490,7 @@ static void shifter_out_im(TCGv var, int shift)
tcg_gen_andi_i32(tmp, var, 1); tcg_gen_andi_i32(tmp, var, 1);
} else { } else {
tcg_gen_shri_i32(tmp, var, shift); tcg_gen_shri_i32(tmp, var, shift);
if (shift != 31); if (shift != 31)
tcg_gen_andi_i32(tmp, tmp, 1); tcg_gen_andi_i32(tmp, tmp, 1);
} }
gen_set_CF(tmp); gen_set_CF(tmp);
...@@ -4618,6 +4618,7 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn) ...@@ -4618,6 +4618,7 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn)
imm = (uint32_t)shift; imm = (uint32_t)shift;
tmp2 = tcg_const_i32(imm); tmp2 = tcg_const_i32(imm);
TCGV_UNUSED_I64(tmp64); TCGV_UNUSED_I64(tmp64);
break;
case 3: case 3:
tmp64 = tcg_const_i64(shift); tmp64 = tcg_const_i64(shift);
TCGV_UNUSED(tmp2); TCGV_UNUSED(tmp2);
...@@ -6583,6 +6584,7 @@ static void disas_arm_insn(CPUState * env, DisasContext *s) ...@@ -6583,6 +6584,7 @@ static void disas_arm_insn(CPUState * env, DisasContext *s)
break; break;
case 0x12: case 0x16: case 0x1a: case 0x1e: /* sbfx */ case 0x12: case 0x16: case 0x1a: case 0x1e: /* sbfx */
case 0x32: case 0x36: case 0x3a: case 0x3e: /* ubfx */ case 0x32: case 0x36: case 0x3a: case 0x3e: /* ubfx */
ARCH(6T2);
tmp = load_reg(s, rm); tmp = load_reg(s, rm);
shift = (insn >> 7) & 0x1f; shift = (insn >> 7) & 0x1f;
i = ((insn >> 16) & 0x1f) + 1; i = ((insn >> 16) & 0x1f) + 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册