Skip to content

Commit 3eda43f

Browse files
nullableVoidPtremesare
nullableVoidPtr
and
emesare
authored
[x86] Intel APX support (#6423)
Co-authored-by: Mason Reed <mason@vector35.com>
1 parent 13fccf3 commit 3eda43f

3 files changed

Lines changed: 1031 additions & 252 deletions

File tree

‎arch/x86/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ target_include_directories(arch_x86
4747
PRIVATE ${PROJECT_BINARY_DIR}/obj/include-private)
4848

4949
add_compile_definitions(XED_DECODER XED_AMD_ENABLED XED_VIA_ENABLED XED_AVX XED_SUPPORTS_AVX512
50-
XED_MPX XED_CET XED_SUPPORTS_SHA XED_SUPPORTS_WBNOINVD)
50+
XED_MPX XED_CET XED_SUPPORTS_SHA XED_SUPPORTS_WBNOINVD XED_APX)
5151

5252
target_link_libraries(arch_x86 binaryninjaapi)
5353

‎arch/x86/arch_x86.cpp‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,6 +1423,7 @@ void X86CommonArchitecture::GetOperandTextBNIntel(const xed_decoded_inst_t* cons
14231423
break;
14241424
}
14251425
case XED_OPERAND_PTR:
1426+
case XED_OPERAND_ABSBR:
14261427
{
14271428
stringstream sstream;
14281429
sstream << "0x" << hex;
@@ -3282,6 +3283,8 @@ class X64Architecture: public X86CommonArchitecture
32823283

32833284
XED_REG_RAX, XED_REG_RCX, XED_REG_RDX, XED_REG_RBX, // 64+
32843285
XED_REG_R8, XED_REG_R9, XED_REG_R10, XED_REG_R11, XED_REG_R12, XED_REG_R13, XED_REG_R14, XED_REG_R15, // 64+
3286+
XED_REG_R16, XED_REG_R17, XED_REG_R18, XED_REG_R19, XED_REG_R20, XED_REG_R21, XED_REG_R22, XED_REG_R23, // APX
3287+
XED_REG_R24, XED_REG_R25, XED_REG_R26, XED_REG_R27, XED_REG_R28, XED_REG_R29, XED_REG_R30, XED_REG_R31, // APX
32853288

32863289
XED_REG_BNDCFGU, XED_REG_BNDSTATUS, // 64 briefly. MPX control registers
32873290
XED_REG_K0, XED_REG_K1, XED_REG_K2, XED_REG_K3, XED_REG_K4, XED_REG_K5, XED_REG_K6, XED_REG_K7, // 64+ AVX bit-masking registers (also not confident in size)
@@ -3310,6 +3313,8 @@ class X64Architecture: public X86CommonArchitecture
33103313
XED_REG_AH, XED_REG_CH, XED_REG_DH, XED_REG_BH, XED_REG_AL, XED_REG_CL, XED_REG_DL, XED_REG_BL, // 16+
33113314
XED_REG_SPL, XED_REG_BPL, XED_REG_SIL, XED_REG_DIL, // 64+
33123315
XED_REG_R8B, XED_REG_R9B, XED_REG_R10B, XED_REG_R11B, XED_REG_R12B, XED_REG_R13B, XED_REG_R14B, XED_REG_R15B, // 64+
3316+
XED_REG_R16B, XED_REG_R17B, XED_REG_R18B, XED_REG_R19B, XED_REG_R20B, XED_REG_R21B, XED_REG_R22B, XED_REG_R23B, // APX
3317+
XED_REG_R24B, XED_REG_R25B, XED_REG_R26B, XED_REG_R27B, XED_REG_R28B, XED_REG_R29B, XED_REG_R30B, XED_REG_R31B, // APX
33133318

33143319
// 16-Bit
33153320
XED_REG_IP, // 16+
@@ -3323,6 +3328,8 @@ class X64Architecture: public X86CommonArchitecture
33233328

33243329
XED_REG_AX, XED_REG_CX, XED_REG_DX, XED_REG_BX, // 16+
33253330
XED_REG_R8W, XED_REG_R9W, XED_REG_R10W, XED_REG_R11W, XED_REG_R12W, XED_REG_R13W, XED_REG_R14W, XED_REG_R15W, // 64+
3331+
XED_REG_R16W, XED_REG_R17W, XED_REG_R18W, XED_REG_R19W, XED_REG_R20W, XED_REG_R21W, XED_REG_R22W, XED_REG_R23W, // APX
3332+
XED_REG_R24W, XED_REG_R25W, XED_REG_R26W, XED_REG_R27W, XED_REG_R28W, XED_REG_R29W, XED_REG_R30W, XED_REG_R31W, // APX
33263333

33273334
// 32-Bit
33283335
XED_REG_EIP, // 32+
@@ -3331,6 +3338,8 @@ class X64Architecture: public X86CommonArchitecture
33313338

33323339
XED_REG_EAX, XED_REG_ECX, XED_REG_EDX, XED_REG_EBX, // 32+
33333340
XED_REG_R8D, XED_REG_R9D, XED_REG_R10D, XED_REG_R11D, XED_REG_R12D, XED_REG_R13D, XED_REG_R14D, XED_REG_R15D, // 64+
3341+
XED_REG_R16D, XED_REG_R17D, XED_REG_R18D, XED_REG_R19D, XED_REG_R20D, XED_REG_R21D, XED_REG_R22D, XED_REG_R23D, // APX
3342+
XED_REG_R24D, XED_REG_R25D, XED_REG_R26D, XED_REG_R27D, XED_REG_R28D, XED_REG_R29D, XED_REG_R30D, XED_REG_R31D, // APX
33343343

33353344
// 48-Bit (All 32+)
33363345
XED_REG_GDTR, // Global Descriptor Table Register
@@ -3350,6 +3359,8 @@ class X64Architecture: public X86CommonArchitecture
33503359

33513360
XED_REG_RAX, XED_REG_RCX, XED_REG_RDX, XED_REG_RBX, // 64+
33523361
XED_REG_R8, XED_REG_R9, XED_REG_R10, XED_REG_R11, XED_REG_R12, XED_REG_R13, XED_REG_R14, XED_REG_R15, // 64+
3362+
XED_REG_R16, XED_REG_R17, XED_REG_R18, XED_REG_R19, XED_REG_R20, XED_REG_R21, XED_REG_R22, XED_REG_R23, // APX
3363+
XED_REG_R24, XED_REG_R25, XED_REG_R26, XED_REG_R27, XED_REG_R28, XED_REG_R29, XED_REG_R30, XED_REG_R31, // APX
33533364

33543365
XED_REG_BNDCFGU, XED_REG_BNDSTATUS, // 64 briefly. MPX control registers
33553366
XED_REG_K0, XED_REG_K1, XED_REG_K2, XED_REG_K3, XED_REG_K4, XED_REG_K5, XED_REG_K6, XED_REG_K7, // 64+ AVX bit-masking registers (also not confident in size)
@@ -3405,6 +3416,23 @@ class X64Architecture: public X86CommonArchitecture
34053416
case XED_REG_R14B: return RegisterInfo(XED_REG_R14, 0, 1);
34063417
case XED_REG_R15B: return RegisterInfo(XED_REG_R15, 0, 1);
34073418

3419+
case XED_REG_R16B: return RegisterInfo(XED_REG_R16, 0, 1);
3420+
case XED_REG_R17B: return RegisterInfo(XED_REG_R17, 0, 1);
3421+
case XED_REG_R18B: return RegisterInfo(XED_REG_R18, 0, 1);
3422+
case XED_REG_R19B: return RegisterInfo(XED_REG_R19, 0, 1);
3423+
case XED_REG_R20B: return RegisterInfo(XED_REG_R20, 0, 1);
3424+
case XED_REG_R21B: return RegisterInfo(XED_REG_R21, 0, 1);
3425+
case XED_REG_R22B: return RegisterInfo(XED_REG_R22, 0, 1);
3426+
case XED_REG_R23B: return RegisterInfo(XED_REG_R23, 0, 1);
3427+
case XED_REG_R24B: return RegisterInfo(XED_REG_R24, 0, 1);
3428+
case XED_REG_R25B: return RegisterInfo(XED_REG_R25, 0, 1);
3429+
case XED_REG_R26B: return RegisterInfo(XED_REG_R26, 0, 1);
3430+
case XED_REG_R27B: return RegisterInfo(XED_REG_R27, 0, 1);
3431+
case XED_REG_R28B: return RegisterInfo(XED_REG_R28, 0, 1);
3432+
case XED_REG_R29B: return RegisterInfo(XED_REG_R29, 0, 1);
3433+
case XED_REG_R30B: return RegisterInfo(XED_REG_R30, 0, 1);
3434+
case XED_REG_R31B: return RegisterInfo(XED_REG_R31, 0, 1);
3435+
34083436
// 16-Bit
34093437
case XED_REG_IP: return RegisterInfo(XED_REG_RIP, 0, 2);
34103438

@@ -3435,6 +3463,23 @@ class X64Architecture: public X86CommonArchitecture
34353463
case XED_REG_R14W: return RegisterInfo(XED_REG_R14, 0, 2);
34363464
case XED_REG_R15W: return RegisterInfo(XED_REG_R15, 0, 2);
34373465

3466+
case XED_REG_R16W: return RegisterInfo(XED_REG_R16, 0, 2);
3467+
case XED_REG_R17W: return RegisterInfo(XED_REG_R17, 0, 2);
3468+
case XED_REG_R18W: return RegisterInfo(XED_REG_R18, 0, 2);
3469+
case XED_REG_R19W: return RegisterInfo(XED_REG_R19, 0, 2);
3470+
case XED_REG_R20W: return RegisterInfo(XED_REG_R20, 0, 2);
3471+
case XED_REG_R21W: return RegisterInfo(XED_REG_R21, 0, 2);
3472+
case XED_REG_R22W: return RegisterInfo(XED_REG_R22, 0, 2);
3473+
case XED_REG_R23W: return RegisterInfo(XED_REG_R23, 0, 2);
3474+
case XED_REG_R24W: return RegisterInfo(XED_REG_R24, 0, 2);
3475+
case XED_REG_R25W: return RegisterInfo(XED_REG_R25, 0, 2);
3476+
case XED_REG_R26W: return RegisterInfo(XED_REG_R26, 0, 2);
3477+
case XED_REG_R27W: return RegisterInfo(XED_REG_R27, 0, 2);
3478+
case XED_REG_R28W: return RegisterInfo(XED_REG_R28, 0, 2);
3479+
case XED_REG_R29W: return RegisterInfo(XED_REG_R29, 0, 2);
3480+
case XED_REG_R30W: return RegisterInfo(XED_REG_R30, 0, 2);
3481+
case XED_REG_R31W: return RegisterInfo(XED_REG_R31, 0, 2);
3482+
34383483
// 32-Bit
34393484
case XED_REG_EIP: return RegisterInfo(XED_REG_RIP, 0, 4);
34403485

@@ -3472,6 +3517,23 @@ class X64Architecture: public X86CommonArchitecture
34723517
case XED_REG_R14D: return RegisterInfo(XED_REG_R14, 0, 4, true);
34733518
case XED_REG_R15D: return RegisterInfo(XED_REG_R15, 0, 4, true);
34743519

3520+
case XED_REG_R16D: return RegisterInfo(XED_REG_R16, 0, 4, true);
3521+
case XED_REG_R17D: return RegisterInfo(XED_REG_R17, 0, 4, true);
3522+
case XED_REG_R18D: return RegisterInfo(XED_REG_R18, 0, 4, true);
3523+
case XED_REG_R19D: return RegisterInfo(XED_REG_R19, 0, 4, true);
3524+
case XED_REG_R20D: return RegisterInfo(XED_REG_R20, 0, 4, true);
3525+
case XED_REG_R21D: return RegisterInfo(XED_REG_R21, 0, 4, true);
3526+
case XED_REG_R22D: return RegisterInfo(XED_REG_R22, 0, 4, true);
3527+
case XED_REG_R23D: return RegisterInfo(XED_REG_R23, 0, 4, true);
3528+
case XED_REG_R24D: return RegisterInfo(XED_REG_R24, 0, 4, true);
3529+
case XED_REG_R25D: return RegisterInfo(XED_REG_R25, 0, 4, true);
3530+
case XED_REG_R26D: return RegisterInfo(XED_REG_R26, 0, 4, true);
3531+
case XED_REG_R27D: return RegisterInfo(XED_REG_R27, 0, 4, true);
3532+
case XED_REG_R28D: return RegisterInfo(XED_REG_R28, 0, 4, true);
3533+
case XED_REG_R29D: return RegisterInfo(XED_REG_R29, 0, 4, true);
3534+
case XED_REG_R30D: return RegisterInfo(XED_REG_R30, 0, 4, true);
3535+
case XED_REG_R31D: return RegisterInfo(XED_REG_R31, 0, 4, true);
3536+
34753537
// 48-Bit
34763538
case XED_REG_GDTR: return RegisterInfo(XED_REG_GDTR, 0, 6);
34773539
case XED_REG_LDTR: return RegisterInfo(XED_REG_LDTR, 0, 6);
@@ -3519,6 +3581,24 @@ class X64Architecture: public X86CommonArchitecture
35193581
case XED_REG_R14: return RegisterInfo(XED_REG_R14, 0, 8);
35203582
case XED_REG_R15: return RegisterInfo(XED_REG_R15, 0, 8);
35213583

3584+
case XED_REG_R16: return RegisterInfo(XED_REG_R16, 0, 8);
3585+
case XED_REG_R17: return RegisterInfo(XED_REG_R17, 0, 8);
3586+
case XED_REG_R18: return RegisterInfo(XED_REG_R18, 0, 8);
3587+
case XED_REG_R19: return RegisterInfo(XED_REG_R19, 0, 8);
3588+
case XED_REG_R20: return RegisterInfo(XED_REG_R20, 0, 8);
3589+
case XED_REG_R21: return RegisterInfo(XED_REG_R21, 0, 8);
3590+
case XED_REG_R22: return RegisterInfo(XED_REG_R22, 0, 8);
3591+
case XED_REG_R23: return RegisterInfo(XED_REG_R23, 0, 8);
3592+
case XED_REG_R24: return RegisterInfo(XED_REG_R24, 0, 8);
3593+
case XED_REG_R25: return RegisterInfo(XED_REG_R25, 0, 8);
3594+
case XED_REG_R26: return RegisterInfo(XED_REG_R26, 0, 8);
3595+
case XED_REG_R27: return RegisterInfo(XED_REG_R27, 0, 8);
3596+
case XED_REG_R28: return RegisterInfo(XED_REG_R28, 0, 8);
3597+
case XED_REG_R29: return RegisterInfo(XED_REG_R29, 0, 8);
3598+
case XED_REG_R30: return RegisterInfo(XED_REG_R30, 0, 8);
3599+
case XED_REG_R31: return RegisterInfo(XED_REG_R31, 0, 8);
3600+
3601+
35223602
case XED_REG_BNDCFGU: return RegisterInfo(XED_REG_BNDCFGU, 0, 8);
35233603
case XED_REG_BNDSTATUS: return RegisterInfo(XED_REG_BNDSTATUS, 0, 8);
35243604

0 commit comments

Comments
 (0)