diff options
| author | bd <bdunahu@operationnull.com> | 2025-03-28 19:55:04 -0400 |
|---|---|---|
| committer | bd <bdunahu@operationnull.com> | 2025-03-28 19:55:04 -0400 |
| commit | 7b3abbd51c91b51725a12d17fad6ecbfcdb19975 (patch) | |
| tree | 4fdd60cc2de9f0a68814bf47d42d675593a965a0 /src/sim/instr.cc | |
| parent | 9cd1f287f0c86b36788cd8ede812b847c584f711 (diff) | |
Move get_instr_fields, add all instruction mnemonics
Diffstat (limited to 'src/sim/instr.cc')
| -rw-r--r-- | src/sim/instr.cc | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/sim/instr.cc b/src/sim/instr.cc index 608b871..50aa71d 100644 --- a/src/sim/instr.cc +++ b/src/sim/instr.cc @@ -3,16 +3,16 @@ #include <map> // clang-format off -#define INIT_INSTRUCTION(type, opcode, body) \ - {type, {{opcode, [](signed int &s1, signed int &s2, signed int &s3) { \ +#define INIT_INSTRUCTION(mnemonic, body) \ + {mnemonic, [](signed int &s1, signed int &s2, signed int &s3) { \ body; \ - }}}} + }} // clang-format on namespace instr { // clang-format off -const std::map<int, std::map<int, std::function<void(signed int &s1, signed int &s2, signed int &s3)>>> +const std::map<Mnemonic, std::function<void(signed int &s1, signed int &s2, signed int &s3)>> // clang-format on instr_map = { @@ -20,11 +20,26 @@ const std::map<int, std::map<int, std::function<void(signed int &s1, signed int // TODO these need to be WRAPPED with a function that sets overflow. // future note to self, if these are more than 2 lines each, you're // doing it wrong - INIT_INSTRUCTION(0b00, 0b00001, s3 = s1 + s2), - INIT_INSTRUCTION(0b00, 0b00010, s3 = s1 - s2), + INIT_INSTRUCTION(ADD, s3 = s1 + s2), + INIT_INSTRUCTION(SUB, s3 = s1 - s2), /* I type instructions */ /* J type instructions */ }; + +const std::map<unsigned int, Mnemonic> mnemonic_map = { + {0b0000100, ADD}, {0b0001000, SUB}, {0b0001100, MUL}, {0b0010000, QUOT}, + {0b0010100, REM}, {0b0011000, SFTR}, {0b0011100, SFTL}, {0b0100000, AND}, + {0b0100100, OR}, {0b0101000, NOT}, {0b0101100, XOR}, {0b0110000, ADDV}, + {0b0110100, SUBV}, {0b0111000, MULV}, {0b0111100, DIVV}, {0b1000000, CMP}, + {0b1000100, CEV}, {0b000101, LOAD}, {0b001001, LOADV}, {0b001101, ADDI}, + {0b010001, SUBI}, {0b010101, SFTRI}, {0b011101, SFTLI}, {0b100001, ANDI}, + {0b100101, ORI}, {0b101001, XORI}, {0b101101, STORE}, {0b110001, STOREV}, + {0b000101, CEV}, {0b000101, LOAD}, {0b001001, LOADV}, {0b001001, LOADV}, + {0b000110, JMP}, {0b001010, JRL}, {0b001110, JAL}, {0b010010, BEQ}, + {0b010110, BGT}, {0b011010, BUF}, {0b011110, BOF}, {0b100010, PUSH}, + {0b100110, POP}, + +}; } // namespace instr |