T0b1/test-repo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parseinstrs: Add support for BCST16

Browse Source 
2-byte broadcasts cannot be inferred from the encoding and need to be
indicated in the descriptor.
This commit is contained in:
Alexis Engelke
2022-12-26 17:10:39 +01:00
parent 06832825ec
commit 8550e2cac9
2 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
decode.c
View File

@@ -94,6 +94,7 @@ struct InstrDesc
#define DESC_IGN66(desc) (((desc)->reg_types >> 15) & 1) #define DESC_IGN66(desc) (((desc)->reg_types >> 15) & 1)
#define DESC_EVEX_SAE(desc) (((desc)->reg_types >> 8) & 1) #define DESC_EVEX_SAE(desc) (((desc)->reg_types >> 8) & 1)
#define DESC_EVEX_ER(desc) (((desc)->reg_types >> 9) & 1) #define DESC_EVEX_ER(desc) (((desc)->reg_types >> 9) & 1)
#define DESC_EVEX_BCST16(desc) (((desc)->reg_types >> 10) & 1)
#define DESC_REGTY_MODRM(desc) (((desc)->reg_types >> 0) & 7) #define DESC_REGTY_MODRM(desc) (((desc)->reg_types >> 0) & 7)
#define DESC_REGTY_MODREG(desc) (((desc)->reg_types >> 3) & 7) #define DESC_REGTY_MODREG(desc) (((desc)->reg_types >> 3) & 7)
#define DESC_REGTY_VEXREG(desc) (((desc)->reg_types >> 6) & 3) #define DESC_REGTY_VEXREG(desc) (((desc)->reg_types >> 6) & 3)
@@ -495,7 +496,10 @@ prefix_end:
if (UNLIKELY(prefix_evex & 0x10)) { if (UNLIKELY(prefix_evex & 0x10)) {
if (UNLIKELY(!DESC_EVEX_BCST(desc))) if (UNLIKELY(!DESC_EVEX_BCST(desc)))
return FD_ERR_UD; return FD_ERR_UD;
scale = prefix_rex & PREFIX_REXW ? 3 : 2; if (UNLIKELY(DESC_EVEX_BCST16(desc)))
scale = 1;
else
scale = prefix_rex & PREFIX_REXW ? 3 : 2;
instr->segment |= scale << 6; // Store broadcast size instr->segment |= scale << 6; // Store broadcast size
op_modrm->type = FD_OT_MEMBCST; op_modrm->type = FD_OT_MEMBCST;
} else { } else {

55
parseinstrs.py
View File

@@ -33,7 +33,7 @@ INSTR_FLAGS_FIELDS, INSTR_FLAGS_SIZES = zip(*[
("vexreg_ty", 2), ("vexreg_ty", 2),
("imm_ty", 0), ("imm_ty", 0),
("evex_rc", 2), ("evex_rc", 2),
("unused", 1), ("evex_bcst16", 1),
("opsize", 3), ("opsize", 3),
("modrm", 1), ("modrm", 1),
("ign66", 1), ("ign66", 1),
@@ -308,6 +308,7 @@ class InstrDesc(NamedTuple):
# Miscellaneous Flags # Miscellaneous Flags
if "VSIB" in self.flags: extraflags["vsib"] = 1 if "VSIB" in self.flags: extraflags["vsib"] = 1
if "BCST" in self.flags: extraflags["evex_bcst"] = 1 if "BCST" in self.flags: extraflags["evex_bcst"] = 1
if "BCST16" in self.flags: extraflags["evex_bcst16"] = 1
if "MASK" in self.flags: extraflags["evex_mask"] = 1 if "MASK" in self.flags: extraflags["evex_mask"] = 1
if "SAE" in self.flags: extraflags["evex_rc"] = 1 if "SAE" in self.flags: extraflags["evex_rc"] = 1
if "ER" in self.flags: extraflags["evex_rc"] = 3 if "ER" in self.flags: extraflags["evex_rc"] = 3
@@ -406,32 +407,36 @@ def verifyOpcodeDesc(opcode, desc):
raise Exception(f"missing memory operand {opcode}, {desc}") raise Exception(f"missing memory operand {opcode}, {desc}")
# From Intel SDM # From Intel SDM
bcst, evexw, vszs = { bcst, evexw, vszs = {
"TUPLE_FULL_32": (True, "0", ( 16, 32, 64)), "TUPLE_FULL_32": (4, "0", ( 16, 32, 64)),
"TUPLE_FULL_64": (True, "1", ( 16, 32, 64)), "TUPLE_FULL_64": (8, "1", ( 16, 32, 64)),
"TUPLE_HALF_32": (True, "0", ( 8, 16, 32)), "TUPLE_HALF_32": (4, "0", ( 8, 16, 32)),
"TUPLE_HALF_64": (True, "1", ( 8, 16, 32)), "TUPLE_HALF_64": (8, "1", ( 8, 16, 32)),
"TUPLE_FULL_MEM": (False, None, ( 16, 32, 64)), "TUPLE_FULL_MEM": (None, None, ( 16, 32, 64)),
"TUPLE_HALF_MEM": (False, None, ( 8, 16, 32)), "TUPLE_HALF_MEM": (None, None, ( 8, 16, 32)),
"TUPLE_QUARTER_MEM": (False, None, ( 4, 8, 16)), "TUPLE_QUARTER_MEM": (None, None, ( 4, 8, 16)),
"TUPLE_EIGHTH_MEM": (False, None, ( 2, 4, 8)), "TUPLE_EIGHTH_MEM": (None, None, ( 2, 4, 8)),
"TUPLE1_SCALAR_8": (False, None, ( 1, 1, 1)), "TUPLE1_SCALAR_8": (None, None, ( 1, 1, 1)),
"TUPLE1_SCALAR_16": (False, None, ( 2, 2, 2)), "TUPLE1_SCALAR_16": (None, None, ( 2, 2, 2)),
"TUPLE1_SCALAR_32": (False, "0", ( 4, 4, 4)), "TUPLE1_SCALAR_32": (None, "0", ( 4, 4, 4)),
"TUPLE1_SCALAR_64": (False, "1", ( 8, 8, 8)), "TUPLE1_SCALAR_64": (None, "1", ( 8, 8, 8)),
"TUPLE1_SCALAR_OPSZ": (False, None, ( 0, 0, 0)), "TUPLE1_SCALAR_OPSZ": (None, None, ( 0, 0, 0)),
"TUPLE1_FIXED_32": (False, None, ( 4, 4, 4)), "TUPLE1_FIXED_32": (None, None, ( 4, 4, 4)),
"TUPLE1_FIXED_64": (False, None, ( 8, 8, 8)), "TUPLE1_FIXED_64": (None, None, ( 8, 8, 8)),
"TUPLE2_32": (False, "0", ( 8, 8, 8)), "TUPLE2_32": (None, "0", ( 8, 8, 8)),
"TUPLE2_64": (False, "1", (None, 16, 16)), "TUPLE2_64": (None, "1", (None, 16, 16)),
"TUPLE4_32": (False, "0", (None, 16, 16)), "TUPLE4_32": (None, "0", (None, 16, 16)),
"TUPLE4_64": (False, "1", (None, None, 32)), "TUPLE4_64": (None, "1", (None, None, 32)),
"TUPLE8_32": (False, "0", (None, None, 32)), "TUPLE8_32": (None, "0", (None, None, 32)),
"TUPLE_MEM128": (False, None, ( 16, 16, 16)), "TUPLE_MEM128": (None, None, ( 16, 16, 16)),
# TODO: Fix MOVDDUP tuple size :( # TODO: Fix MOVDDUP tuple size :(
"TUPLE_MOVDDUP": (False, None, ( 16, 32, 64)), "TUPLE_MOVDDUP": (None, None, ( 16, 32, 64)),
}[tts[0]] }[tts[0]]
if "BCST" in desc.flags and not bcst: if "BCST" in desc.flags:
raise Exception(f"broadcast on incompatible type {opcode}, {desc}") if bcst is None:
raise Exception(f"broadcast on incompatible type {opcode}, {desc}")
if ("BCST16" in desc.flags) != (bcst == 2):
raise Exception(f"bcst16 mismatch, should be {bcst} {opcode}, {desc}")
# EVEX.W is used to distinguish 4/8-byte broadcast size
if evexw and opcode.rexw != evexw: if evexw and opcode.rexw != evexw:
raise Exception(f"incompatible EVEX.W {opcode}, {desc}") raise Exception(f"incompatible EVEX.W {opcode}, {desc}")
for l, tupsz in enumerate(vszs): for l, tupsz in enumerate(vszs):