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

encode: Fix erroneous encoding of high registers

Browse Source
This commit is contained in:
Alexis Engelke
2021-01-07 10:03:17 +01:00
parent db183ee6f9
commit 3fdbd70153
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
parseinstrs.py
View File

@@ -558,7 +558,11 @@ def encode_table(entries):
if ot == "m":
tys.append(0xf)
elif op.kind == "GP":
tys.append(2 if op.abssize(opsize//8) == 1 else 1)
if (desc.mnemonic == "MOVSX" or desc.mnemonic == "MOVZX" or
opsize == 8):
tys.append(2 if op.abssize(opsize//8) == 1 else 1)
else:
tys.append(1)
else:
tys.append({
"imm": 0, "SEG": 3, "FPU": 4, "MMX": 5, "XMM": 6,

15
tests/test_encode.c
View File

@@ -96,6 +96,18 @@ main(int argc, char** argv)
TEST("\xb0\xff", FE_MOV8ri, FE_AX, (int8_t) 0xff);
TEST("\xb4\xff", FE_MOV8ri, FE_AH, -1);
TEST("\xb7\x64", FE_MOV8ri, FE_BH, 0x64);
TEST("\x66\x0f\xbe\xc2", FE_MOVSXr16r8, FE_AX, FE_DX);
TEST("\x0f\xbe\xc2", FE_MOVSXr32r8, FE_AX, FE_DX);
TEST("\x48\x0f\xbe\xc2", FE_MOVSXr64r8, FE_AX, FE_DX);
TEST("\x66\x0f\xbe\xc6", FE_MOVSXr16r8, FE_AX, FE_DH);
TEST("\x0f\xbe\xc6", FE_MOVSXr32r8, FE_AX, FE_DH);
TEST("", FE_MOVSXr64r8, FE_AX, FE_DH);
TEST("\x66\x0f\xbf\xc2", FE_MOVSXr16r16, FE_AX, FE_DX);
TEST("\x0f\xbf\xc2", FE_MOVSXr32r16, FE_AX, FE_DX);
TEST("\x48\x0f\xbf\xc2", FE_MOVSXr64r16, FE_AX, FE_DX);
TEST("\x66\x63\xc2", FE_MOVSXr16r32, FE_AX, FE_DX);
TEST("\x63\xc2", FE_MOVSXr32r32, FE_AX, FE_DX);
TEST("\x48\x63\xc2", FE_MOVSXr64r32, FE_AX, FE_DX);
TEST("\xc8\x33\x22\x11", FE_ENTERi, 0x112233);
TEST("\x0f\x05", FE_SYSCALL);
TEST("\x0f\x90\xc4", FE_SETO8r, FE_AH);
@@ -132,6 +144,9 @@ main(int argc, char** argv)
TEST("\xf3\xab", FE_REP_STOS32);
TEST("\x48\xab", FE_STOS64);
TEST("\xf3\x48\xab", FE_REP_STOS64);
TEST("\x66\xf2\x0f\x38\xf1\xc1", FE_CRC32_16rr, FE_AX, FE_CX);
TEST("\x66\x0f\x3a\x14\xc1\x02", FE_SSE_PEXTRBrri, FE_CX, FE_XMM0, 2);
TEST("", FE_SSE_PEXTRBrri, FE_CH, FE_XMM0, 2);
// Test ModRM encoding
TEST("\x01\x00", FE_ADD32mr, FE_MEM(FE_AX, 0, 0, 0), FE_AX);