-
Notifications
You must be signed in to change notification settings - Fork 125
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FEXCore: Convert Base tables over to constexpr
Only doing the single table for review purposes. Once reviewed I will hammer out the remaining tables. Similar to #3320, most of the OpcodeDispatcher tables can be consteval and made to be a compile time constant. This just requires shuffling the code slightly. The idea is to get almost all of the table setup out of the `InstallOpcodeHandlers` function and instead only install the handlers that change based on 32-bit or 64-bit, just like the x86 tables we also did.
- Loading branch information
1 parent
a4acd64
commit ac4a917
Showing
4 changed files
with
170 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
FEXCore/Source/Interface/Core/OpcodeDispatcher/BaseTables.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| #pragma once | ||
| #include "Interface/Core/OpcodeDispatcher.h" | ||
|
|
||
| namespace FEXCore::IR { | ||
| constexpr inline void InstallToTable(auto& FinalTable, auto& LocalTable) { | ||
| for (auto Op : LocalTable) { | ||
| auto OpNum = std::get<0>(Op); | ||
| auto Dispatcher = std::get<2>(Op); | ||
| for (uint8_t i = 0; i < std::get<1>(Op); ++i) { | ||
| auto& TableOp = FinalTable[OpNum + i]; | ||
| if (TableOp.OpcodeDispatcher) { | ||
| ERROR_AND_DIE_FMT("Duplicate Entry {}", TableOp.Name); | ||
| } | ||
|
|
||
| TableOp.OpcodeDispatcher = Dispatcher; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| consteval inline void BaseTables_Install(auto& FinalTable) { | ||
| constexpr std::tuple<uint8_t, uint8_t, X86Tables::OpDispatchPtr> BaseOpTable[] = { | ||
| // Instructions | ||
| {0x00, 6, &OpDispatchBuilder::Bind<&OpDispatchBuilder::ALUOp, FEXCore::IR::IROps::OP_ADD, FEXCore::IR::IROps::OP_ATOMICFETCHADD, 0>}, | ||
|
|
||
| {0x08, 6, &OpDispatchBuilder::Bind<&OpDispatchBuilder::ALUOp, FEXCore::IR::IROps::OP_OR, FEXCore::IR::IROps::OP_ATOMICFETCHOR, 0>}, | ||
|
|
||
| {0x10, 6, &OpDispatchBuilder::ADCOp<0>}, | ||
|
|
||
| {0x18, 6, &OpDispatchBuilder::SBBOp<0>}, | ||
|
|
||
| {0x20, 6, &OpDispatchBuilder::Bind<&OpDispatchBuilder::ALUOp, FEXCore::IR::IROps::OP_ANDWITHFLAGS, FEXCore::IR::IROps::OP_ATOMICFETCHAND, 0>}, | ||
|
|
||
| {0x28, 6, &OpDispatchBuilder::Bind<&OpDispatchBuilder::ALUOp, FEXCore::IR::IROps::OP_SUB, FEXCore::IR::IROps::OP_ATOMICFETCHSUB, 0>}, | ||
|
|
||
| {0x30, 6, &OpDispatchBuilder::Bind<&OpDispatchBuilder::ALUOp, FEXCore::IR::IROps::OP_XOR, FEXCore::IR::IROps::OP_ATOMICFETCHXOR, 0>}, | ||
|
|
||
| {0x38, 6, &OpDispatchBuilder::CMPOp<0>}, | ||
| {0x50, 8, &OpDispatchBuilder::PUSHREGOp}, | ||
| {0x58, 8, &OpDispatchBuilder::POPOp}, | ||
| {0x68, 1, &OpDispatchBuilder::PUSHOp}, | ||
| {0x69, 1, &OpDispatchBuilder::IMUL2SrcOp}, | ||
| {0x6A, 1, &OpDispatchBuilder::PUSHOp}, | ||
| {0x6B, 1, &OpDispatchBuilder::IMUL2SrcOp}, | ||
| {0x6C, 4, &OpDispatchBuilder::PermissionRestrictedOp}, | ||
|
|
||
| {0x70, 16, &OpDispatchBuilder::CondJUMPOp}, | ||
| {0x84, 2, &OpDispatchBuilder::TESTOp<0>}, | ||
| {0x86, 2, &OpDispatchBuilder::XCHGOp}, | ||
| {0x88, 4, &OpDispatchBuilder::MOVGPROp<0>}, | ||
|
|
||
| {0x8C, 1, &OpDispatchBuilder::MOVSegOp<false>}, | ||
| {0x8D, 1, &OpDispatchBuilder::LEAOp}, | ||
| {0x8E, 1, &OpDispatchBuilder::MOVSegOp<true>}, | ||
| {0x8F, 1, &OpDispatchBuilder::POPOp}, | ||
| {0x90, 8, &OpDispatchBuilder::XCHGOp}, | ||
|
|
||
| {0x98, 1, &OpDispatchBuilder::CDQOp}, | ||
| {0x99, 1, &OpDispatchBuilder::CQOOp}, | ||
| {0x9B, 1, &OpDispatchBuilder::NOPOp}, | ||
| {0x9C, 1, &OpDispatchBuilder::PUSHFOp}, | ||
| {0x9D, 1, &OpDispatchBuilder::POPFOp}, | ||
| {0x9E, 1, &OpDispatchBuilder::SAHFOp}, | ||
| {0x9F, 1, &OpDispatchBuilder::LAHFOp}, | ||
| {0xA4, 2, &OpDispatchBuilder::MOVSOp}, | ||
|
|
||
| {0xA6, 2, &OpDispatchBuilder::CMPSOp}, | ||
| {0xA8, 2, &OpDispatchBuilder::TESTOp<0>}, | ||
| {0xAA, 2, &OpDispatchBuilder::STOSOp}, | ||
| {0xAC, 2, &OpDispatchBuilder::LODSOp}, | ||
| {0xAE, 2, &OpDispatchBuilder::SCASOp}, | ||
| {0xB0, 16, &OpDispatchBuilder::MOVGPROp<0>}, | ||
| {0xC2, 2, &OpDispatchBuilder::RETOp}, | ||
| {0xC8, 1, &OpDispatchBuilder::EnterOp}, | ||
| {0xC9, 1, &OpDispatchBuilder::LEAVEOp}, | ||
| {0xCC, 2, &OpDispatchBuilder::INTOp}, | ||
| {0xCF, 1, &OpDispatchBuilder::IRETOp}, | ||
| {0xD7, 2, &OpDispatchBuilder::XLATOp}, | ||
| {0xE0, 3, &OpDispatchBuilder::LoopOp}, | ||
| {0xE3, 1, &OpDispatchBuilder::CondJUMPRCXOp}, | ||
| {0xE4, 4, &OpDispatchBuilder::PermissionRestrictedOp}, | ||
| {0xE8, 1, &OpDispatchBuilder::CALLOp}, | ||
| {0xE9, 1, &OpDispatchBuilder::JUMPOp}, | ||
| {0xEB, 1, &OpDispatchBuilder::JUMPOp}, | ||
| {0xEC, 4, &OpDispatchBuilder::PermissionRestrictedOp}, | ||
| {0xF1, 1, &OpDispatchBuilder::INTOp}, | ||
| {0xF4, 1, &OpDispatchBuilder::INTOp}, | ||
|
|
||
| {0xF5, 1, &OpDispatchBuilder::FLAGControlOp}, | ||
| {0xF8, 2, &OpDispatchBuilder::FLAGControlOp}, | ||
| {0xFA, 2, &OpDispatchBuilder::PermissionRestrictedOp}, | ||
| {0xFC, 2, &OpDispatchBuilder::FLAGControlOp}, | ||
| }; | ||
|
|
||
| InstallToTable(FinalTable, BaseOpTable); | ||
| } | ||
|
|
||
| inline void BaseTables_Install64(auto& FinalTable) { | ||
| constexpr std::tuple<uint8_t, uint8_t, X86Tables::OpDispatchPtr> BaseOpTable_64[] = { | ||
| {0x63, 1, &OpDispatchBuilder::MOVSXDOp}, | ||
| {0xA0, 4, &OpDispatchBuilder::MOVOffsetOp}, | ||
| }; | ||
|
|
||
| InstallToTable(FinalTable, BaseOpTable_64); | ||
| } | ||
|
|
||
| inline void BaseTables_Install32(auto& FinalTable) { | ||
| constexpr std::tuple<uint8_t, uint8_t, X86Tables::OpDispatchPtr> BaseOpTable_32[] = { | ||
| {0x06, 1, &OpDispatchBuilder::PUSHSegmentOp<FEXCore::X86Tables::DecodeFlags::FLAG_ES_PREFIX>}, | ||
| {0x07, 1, &OpDispatchBuilder::POPSegmentOp<FEXCore::X86Tables::DecodeFlags::FLAG_ES_PREFIX>}, | ||
| {0x0E, 1, &OpDispatchBuilder::PUSHSegmentOp<FEXCore::X86Tables::DecodeFlags::FLAG_CS_PREFIX>}, | ||
| {0x16, 1, &OpDispatchBuilder::PUSHSegmentOp<FEXCore::X86Tables::DecodeFlags::FLAG_SS_PREFIX>}, | ||
| {0x17, 1, &OpDispatchBuilder::POPSegmentOp<FEXCore::X86Tables::DecodeFlags::FLAG_SS_PREFIX>}, | ||
| {0x1E, 1, &OpDispatchBuilder::PUSHSegmentOp<FEXCore::X86Tables::DecodeFlags::FLAG_DS_PREFIX>}, | ||
| {0x1F, 1, &OpDispatchBuilder::POPSegmentOp<FEXCore::X86Tables::DecodeFlags::FLAG_DS_PREFIX>}, | ||
| {0x27, 1, &OpDispatchBuilder::DAAOp}, | ||
| {0x2F, 1, &OpDispatchBuilder::DASOp}, | ||
| {0x37, 1, &OpDispatchBuilder::AAAOp}, | ||
| {0x3F, 1, &OpDispatchBuilder::AASOp}, | ||
| {0x40, 8, &OpDispatchBuilder::INCOp}, | ||
| {0x48, 8, &OpDispatchBuilder::DECOp}, | ||
|
|
||
| {0x60, 1, &OpDispatchBuilder::PUSHAOp}, | ||
| {0x61, 1, &OpDispatchBuilder::POPAOp}, | ||
| {0xA0, 4, &OpDispatchBuilder::MOVOffsetOp}, | ||
| {0xCE, 1, &OpDispatchBuilder::INTOp}, | ||
| {0xD4, 1, &OpDispatchBuilder::AAMOp}, | ||
| {0xD5, 1, &OpDispatchBuilder::AADOp}, | ||
| {0xD6, 1, &OpDispatchBuilder::SALCOp}, | ||
| }; | ||
|
|
||
| InstallToTable(FinalTable, BaseOpTable_32); | ||
| } | ||
| } // namespace FEXCore::IR |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters