diff options
| author | bd <bdunahu@operationnull.com> | 2025-03-29 02:36:38 -0400 |
|---|---|---|
| committer | bd <bdunahu@operationnull.com> | 2025-03-29 02:36:38 -0400 |
| commit | bc47d9131869b1f072e21d9cb61746d14bf30751 (patch) | |
| tree | 3da9c04aa06f606d729c6267248966cd17ea7c63 /src/sim/instr.cc | |
| parent | b06f7b0546d679958153263e15ea857659819499 (diff) | |
get_instr_fields return mnemonic rather than opcode and type
Diffstat (limited to 'src/sim/instr.cc')
| -rw-r--r-- | src/sim/instr.cc | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/src/sim/instr.cc b/src/sim/instr.cc index 50aa71d..08edf5e 100644 --- a/src/sim/instr.cc +++ b/src/sim/instr.cc @@ -1,6 +1,7 @@ #include "instr.h" #include <functional> #include <map> +#include <unordered_map> // clang-format off #define INIT_INSTRUCTION(mnemonic, body) \ @@ -12,7 +13,7 @@ namespace instr { // clang-format off -const std::map<Mnemonic, std::function<void(signed int &s1, signed int &s2, signed int &s3)>> +const std::unordered_map<Mnemonic, std::function<void(signed int &s1, signed int &s2, signed int &s3)>> // clang-format on instr_map = { @@ -20,26 +21,33 @@ const std::map<Mnemonic, std::function<void(signed int &s1, signed int &s2, sign // 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(ADD, s3 = s1 + s2), - INIT_INSTRUCTION(SUB, s3 = s1 - s2), + INIT_INSTRUCTION(ADD, s3 = s1 + s2;), + INIT_INSTRUCTION(SUB, s3 = s1 - s2;), /* I type instructions */ /* J type instructions */ + + /* NOP */ + INIT_INSTRUCTION(NOP, (void)s3; (void)s2; (void)s1;), + }; -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}, +const std::unordered_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}, {0b0001101, ADDI}, {0b0010001, SUBI}, + {0b0010101, SFTRI}, {0b0011101, SFTLI}, {0b0100001, ANDI}, + {0b0100101, ORI}, {0b0101001, XORI}, {0b0101101, STORE}, + {0b0110001, STOREV}, {0b0000101, CEV}, {0b0000101, LOAD}, + {0b0001001, LOADV}, {0b0001001, LOADV}, {0b0000110, JMP}, + {0b0001010, JRL}, {0b0001110, JAL}, {0b0010010, BEQ}, + {0b0010110, BGT}, {0b0011010, BUF}, {0b0011110, BOF}, + {0b0100010, PUSH}, {0b0100110, POP}, }; } // namespace instr |