mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-xtensa: fix extui shift amount

Browse Source 
extui opcode only uses lowermost op1 bit for sa4.

Reported-by: malc <av1474@comtv.ru>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Cc: qemu-stable <qemu-stable@nongnu.org>
Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
Max Filippov 2012-09-21 02:59:49 +04:00 committed by malc
parent a255066039
commit f9cb5045d1
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target-xtensa/translate.c
View File

@ -1778,12 +1778,30 @@ static void disas_xtensa_insn(DisasContext *dc)
case 5:
gen_window_check2(dc, RRR_R, RRR_T);
{
int shiftimm = RRR_S | (OP1 << 4);
int shiftimm = RRR_S | ((OP1 & 1) << 4);
int maskimm = (1 << (OP2 + 1)) - 1;
TCGv_i32 tmp = tcg_temp_new_i32();
tcg_gen_shri_i32(tmp, cpu_R[RRR_T], shiftimm);
tcg_gen_andi_i32(cpu_R[RRR_R], tmp, maskimm);
if (shiftimm) {
tcg_gen_shri_i32(tmp, cpu_R[RRR_T], shiftimm);
} else {
tcg_gen_mov_i32(tmp, cpu_R[RRR_T]);
}
switch (maskimm) {
case 0xff:
tcg_gen_ext8u_i32(cpu_R[RRR_R], tmp);
break;
case 0xffff:
tcg_gen_ext16u_i32(cpu_R[RRR_R], tmp);
break;
default:
tcg_gen_andi_i32(cpu_R[RRR_R], tmp, maskimm);
break;
}
tcg_temp_free(tmp);
}
break;