yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-25 19:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Rearrange decode in disas_data_proc_1src

Browse source 
Now properly signals unallocated for REV64 with SF=0.
Allows for the opcode2 field to be decoded shortly.

Backports commit 18de2813c35e359621a24a0a2a77570e83cb73b9 from qemu
This commit is contained in:
Richard Henderson 2019-01-22 15:35:41 -05:00 committed by Lioncash
parent 02fd7e2472
commit 967e6a1e90
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
qemu/target/arm/translate-a64.c
View file

@ -4654,38 +4654,51 @@ static void handle_rev16(DisasContext *s, unsigned int sf,
*/ */
static void disas_data_proc_1src(DisasContext *s, uint32_t insn) static void disas_data_proc_1src(DisasContext *s, uint32_t insn)
{ {
unsigned int sf, opcode, rn, rd; unsigned int sf, opcode, opcode2, rn, rd;
if (extract32(insn, 29, 1) || extract32(insn, 16, 5)) { if (extract32(insn, 29, 1)) {
unallocated_encoding(s); unallocated_encoding(s);
return; return;
} }
sf = extract32(insn, 31, 1); sf = extract32(insn, 31, 1);
opcode = extract32(insn, 10, 6); opcode = extract32(insn, 10, 6);
opcode2 = extract32(insn, 16, 5);
rn = extract32(insn, 5, 5); rn = extract32(insn, 5, 5);
rd = extract32(insn, 0, 5); rd = extract32(insn, 0, 5);
switch (opcode) { #define MAP(SF, O2, O1) ((SF) | (O1 << 1) | (O2 << 7))
case 0: /* RBIT */
switch (MAP(sf, opcode2, opcode)) {
case MAP(0, 0x00, 0x00): /* RBIT */
case MAP(1, 0x00, 0x00):
handle_rbit(s, sf, rn, rd); handle_rbit(s, sf, rn, rd);
break; break;
case 1: /* REV16 */ case MAP(0, 0x00, 0x01): /* REV16 */
case MAP(1, 0x00, 0x01):
handle_rev16(s, sf, rn, rd); handle_rev16(s, sf, rn, rd);
break; break;
case 2: /* REV32 */ case MAP(0, 0x00, 0x02): /* REV/REV32 */
case MAP(1, 0x00, 0x02):
handle_rev32(s, sf, rn, rd); handle_rev32(s, sf, rn, rd);
break; break;
case 3: /* REV64 */ case MAP(1, 0x00, 0x03): /* REV64 */
handle_rev64(s, sf, rn, rd); handle_rev64(s, sf, rn, rd);
break; break;
case 4: /* CLZ */ case MAP(0, 0x00, 0x04): /* CLZ */
case MAP(1, 0x00, 0x04):
handle_clz(s, sf, rn, rd); handle_clz(s, sf, rn, rd);
break; break;
case 5: /* CLS */ case MAP(0, 0x00, 0x05): /* CLS */
case MAP(1, 0x00, 0x05):
handle_cls(s, sf, rn, rd); handle_cls(s, sf, rn, rd);
break; break;
default:
unallocated_encoding(s);
break;
} }
#undef MAP
} }
static void handle_div(DisasContext *s, bool is_signed, unsigned int sf, static void handle_div(DisasContext *s, bool is_signed, unsigned int sf,