aboutsummaryrefslogtreecommitdiff
path: root/qtmips_machine
diff options
context:
space:
mode:
Diffstat (limited to 'qtmips_machine')
-rw-r--r--qtmips_machine/core.cpp16
-rw-r--r--qtmips_machine/tests/testcore.cpp34
2 files changed, 42 insertions, 8 deletions
diff --git a/qtmips_machine/core.cpp b/qtmips_machine/core.cpp
index c79801c..d86a6f4 100644
--- a/qtmips_machine/core.cpp
+++ b/qtmips_machine/core.cpp
@@ -18,6 +18,8 @@
// This is temporally operation place holder
#define NOPE { .flags = 0, .alu = ALU_OP_SLL }
+#define FLAGS_ALU_I (DM_SUPPORTED | DM_ALUSRC | DM_REGWRITE)
+
// This is map from opcode to signals.
static const struct DecodeMap dmap[] = {
{ .flags = DM_SUPPORTED | DM_REGD | DM_REGWRITE, .alu = ALU_OP_SLL }, // Alu operations
@@ -28,13 +30,13 @@ static const struct DecodeMap dmap[] = {
NOPE, // BNE
NOPE, // BLEZ
NOPE, // BGTZ
- { .flags = DM_SUPPORTED | DM_ALUSRC | DM_REGWRITE, .alu = ALU_OP_ADD }, // ADDI
- { .flags = DM_SUPPORTED | DM_ALUSRC | DM_REGWRITE, .alu = ALU_OP_ADDU }, // ADDIU
- { .flags = DM_SUPPORTED | DM_ALUSRC | DM_REGWRITE, .alu = ALU_OP_SLT }, // SLTI
- { .flags = DM_SUPPORTED | DM_ALUSRC | DM_REGWRITE, .alu = ALU_OP_SLTU }, // SLTIU
- NOPE, // ANDI
- NOPE, // ORI
- NOPE, // XORI
+ { .flags = FLAGS_ALU_I, .alu = ALU_OP_ADD }, // ADDI
+ { .flags = FLAGS_ALU_I, .alu = ALU_OP_ADDU }, // ADDIU
+ { .flags = FLAGS_ALU_I, .alu = ALU_OP_SLT }, // SLTI
+ { .flags = FLAGS_ALU_I, .alu = ALU_OP_SLTU }, // SLTIU
+ { .flags = FLAGS_ALU_I, .alu = ALU_OP_AND }, // ANDI
+ { .flags = FLAGS_ALU_I, .alu = ALU_OP_OR }, // ORI
+ { .flags = FLAGS_ALU_I, .alu = ALU_OP_XOR }, // XORI
NOPE, // LUI
NOPE, // 16
NOPE, // 17
diff --git a/qtmips_machine/tests/testcore.cpp b/qtmips_machine/tests/testcore.cpp
index 3a48f1d..43d4c90 100644
--- a/qtmips_machine/tests/testcore.cpp
+++ b/qtmips_machine/tests/testcore.cpp
@@ -88,7 +88,39 @@ void MachineTests::core_regs_data() {
<< regs_init \
<< regs_res;
}
- // TODO test other operations
+
+ // Logical instructions
+ {
+ Registers regs_init;
+ regs_init.write_gp(24, 0xf0);
+ regs_init.write_gp(25, 0xe1);
+ Registers regs_res(regs_init);
+ regs_res.write_gp(26, 0xe0);
+ QTest::newRow("AND") << Instruction(0, 24, 25, 26, 0, 36) \
+ << regs_init \
+ << regs_res;
+ QTest::newRow("ANDI") << Instruction(12, 24, 26, 0xe1) \
+ << regs_init \
+ << regs_res;
+ regs_res.write_gp(26, 0xf1);
+ QTest::newRow("OR") << Instruction(0, 24, 25, 26, 0, 37) \
+ << regs_init \
+ << regs_res;
+ QTest::newRow("ORI") << Instruction(13, 24, 26, 0xe1) \
+ << regs_init \
+ << regs_res;
+ regs_res.write_gp(26, 0x11);
+ QTest::newRow("XOR") << Instruction(0, 24, 25, 26, 0, 38) \
+ << regs_init \
+ << regs_res;
+ QTest::newRow("XORI") << Instruction(14, 24, 26, 0xe1) \
+ << regs_init \
+ << regs_res;
+ regs_res.write_gp(26, 0xffffff0e);
+ QTest::newRow("NOR") << Instruction(0, 24, 25, 26, 0, 39) \
+ << regs_init \
+ << regs_res;
+ }
}
#include <iostream>