Use QString and QVector instead of std ones and more

3 files changed, 46 insertions, 1 deletions

diff --git a/qtmips_machine/tests/testprogrammemory.cpp b/qtmips_machine/tests/testprogrammemory.cpp
new file mode 100644
index 0000000..a08bbab
--- /dev/null
+++ b/qtmips_machine/tests/testprogrammemory.cpp
@@ -0,0 +1,41 @@
+#include "tst_machine.h"
+#include "programmemory.h"
+#include <qstring.h>
+#include <qvector.h>
+
+QVector<QString> str_inst_r(const char *inst, const char *rs, const char *rd, const char *rt, const char *sa) {
+    QVector<QString> ret;
+    ret << inst;
+    if (rs)
+        ret << rs;
+    if (rd)
+        ret << rd;
+    if (rt)
+        ret << rt;
+    if (sa)
+        ret << sa;
+    return ret;
+}
+
+#define I(II) ((std::uint32_t) II)
+
+void MachineTests::program_memory_data() {
+    QTest::addColumn<std::uint32_t>("bin");
+    QTest::addColumn<QVector<QString>>("str");
+
+    // TODO correct instruction
+    QTest::newRow("NOP") << I(0x000000) << str_inst_r("nop", nullptr, nullptr, nullptr, nullptr);
+    //QTest::newRow("SLL") << I(0x000000) << str_inst_r("sll", "", "", nullptr, nullptr);
+    // TODO other instructions
+}
+
+void MachineTests::program_memory() {
+    Memory m;
+    ProgramMemory pm(&m);
+
+   QFETCH(std::uint32_t, bin);
+   QFETCH(QVector<QString>, str);
+
+   m.write_word(0x00, bin);
+   QCOMPARE(pm.at(0x00)->to_strs(), str);
+}
diff --git a/qtmips_machine/tests/tests.pro b/qtmips_machine/tests/tests.pro
index 9477e08..b9f1497 100644
--- a/qtmips_machine/tests/tests.pro
+++ b/qtmips_machine/tests/tests.pro
@@ -17,7 +17,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += tst_machine.cpp \
     testmemory.cpp \
-    testregisters.cpp
+    testregisters.cpp \
+    testprogrammemory.cpp
 
 HEADERS += tst_machine.h
 
diff --git a/qtmips_machine/tests/tst_machine.h b/qtmips_machine/tests/tst_machine.h
index e5137c4..50915f5 100644
--- a/qtmips_machine/tests/tst_machine.h
+++ b/qtmips_machine/tests/tst_machine.h
@@ -17,6 +17,9 @@ private Q_SLOTS:
     void memory_section();
     void memory_section_data();
     void memory_endian();
+    // ProgramMemory
+    void program_memory();
+    void program_memory_data();
 };
 
 #endif // TST_MACHINE_H