From 499a88621d12ff0cdcba1f8c796b7031d6adc649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 21 Nov 2017 19:48:51 +0100 Subject: Add possibility to compare memory and registers state For core testing we want to compare whole memory and registers. Registers are pretty simple but in case of memory it is some what more complicated and required its own tests to be sure that it works. --- qtmips_machine/tests/testalu.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'qtmips_machine/tests/testalu.cpp') diff --git a/qtmips_machine/tests/testalu.cpp b/qtmips_machine/tests/testalu.cpp index 37accdf..2943906 100644 --- a/qtmips_machine/tests/testalu.cpp +++ b/qtmips_machine/tests/testalu.cpp @@ -3,49 +3,49 @@ #include "qtmipsexception.h" void MachineTests::alu_data() { - QTest::addColumn("op"); + QTest::addColumn("op"); QTest::addColumn("s"); QTest::addColumn("t"); QTest::addColumn("sa"); QTest::addColumn("res"); // TODO SLL-SRAV - QTest::newRow("ADD") << (std::uint8_t)ALU_OP_ADD \ + QTest::newRow("ADD") << ALU_OP_ADD \ << (std::uint32_t)24 \ << (std::uint32_t)66 \ << (std::uint8_t)0 \ << (std::uint32_t)90; - QTest::newRow("ADDU") << (std::uint8_t)ALU_OP_ADDU \ + QTest::newRow("ADDU") << ALU_OP_ADDU \ << (std::uint32_t)24 \ << (std::uint32_t)66 \ << (std::uint8_t)0 \ << (std::uint32_t)90; - QTest::newRow("SUB") << (std::uint8_t)ALU_OP_SUB \ + QTest::newRow("SUB") << ALU_OP_SUB \ << (std::uint32_t)66 \ << (std::uint32_t)24 \ << (std::uint8_t)0 \ << (std::uint32_t)42; - QTest::newRow("SUBU") << (std::uint8_t)ALU_OP_SUBU \ + QTest::newRow("SUBU") << ALU_OP_SUBU \ << (std::uint32_t)24 \ << (std::uint32_t)66 \ << (std::uint8_t)0 \ << (std::uint32_t)-42; - QTest::newRow("AND") << (std::uint8_t)ALU_OP_AND \ + QTest::newRow("AND") << ALU_OP_AND \ << (std::uint32_t)0xA81 \ << (std::uint32_t)0x603 \ << (std::uint8_t)0 \ << (std::uint32_t)0x201; - QTest::newRow("OR") << (std::uint8_t)ALU_OP_OR \ + QTest::newRow("OR") << ALU_OP_OR \ << (std::uint32_t)0xA81 \ << (std::uint32_t)0x603 \ << (std::uint8_t)0 \ << (std::uint32_t)0xE83; - QTest::newRow("XOR") << (std::uint8_t)ALU_OP_XOR \ + QTest::newRow("XOR") << ALU_OP_XOR \ << (std::uint32_t)0xA81 \ << (std::uint32_t)0x603 \ << (std::uint8_t)0 \ << (std::uint32_t)0xC82; - QTest::newRow("NOR") << (std::uint8_t)ALU_OP_NOR \ + QTest::newRow("NOR") << ALU_OP_NOR \ << (std::uint32_t)0xA81 \ << (std::uint32_t)0x603 \ << (std::uint8_t)0 \ @@ -54,13 +54,13 @@ void MachineTests::alu_data() { } void MachineTests::alu() { - QFETCH(std::uint8_t, op); + QFETCH(AluOp, op); QFETCH(std::uint32_t, s); QFETCH(std::uint32_t, t); QFETCH(std::uint8_t, sa); QFETCH(std::uint32_t, res); - QCOMPARE(alu_operate((enum AluOp)op, s , t, sa), res); + QCOMPARE(alu_operate(op, s , t, sa), res); } void MachineTests::alu_except_data() { -- cgit v1.2.3