Skip to content

Commit c34a155

Browse files
committed
amd64: Remap int imm8 Ijk_{NoDecode,Sys_int*}->Ijk_Sys_syscall
Instead of handling vectors with unique jumpkinds or NoDecode, simply exit with a Ijk_Sys_syscall for higher level handling.
1 parent c0bace1 commit c34a155

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

priv/guest_amd64_toIR.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21318,15 +21318,10 @@ Long dis_ESC_NONE (
2131821318

2131921319
case 0xCD: /* INT imm8 */
2132021320
d64 = getUChar(delta); delta++;
21321-
21322-
/* Handle int $0xD2 (Solaris fasttrap syscalls). */
21323-
if (d64 == 0xD2) {
21324-
jmp_lit(dres, Ijk_Sys_int210, guest_RIP_bbstart + delta);
21325-
vassert(dres->whatNext == Dis_StopHere);
21326-
DIP("int $0xD2\n");
21327-
return delta;
21328-
}
21329-
goto decode_failure;
21321+
jmp_lit(dres, Ijk_Sys_syscall, guest_RIP_bbstart + delta);
21322+
vassert(dres->whatNext == Dis_StopHere);
21323+
DIP("int $0x%x\n", d64);
21324+
return delta;
2133021325

2133121326
case 0xD0: { /* Grp2 1,Eb */
2133221327
Bool decode_OK = True;

0 commit comments

Comments
 (0)