diff options
author | Karel Kočí <cynerd@email.cz> | 2017-12-17 13:31:25 +0100 |
---|---|---|
committer | Karel Kočí <cynerd@email.cz> | 2017-12-17 13:31:25 +0100 |
commit | e0c757926743ee21f1a60b4b6948ca3eb895c373 (patch) | |
tree | d2acad9475849d5abed15cdd4b6bf3b8d9030f06 /qtmips_machine/tests | |
parent | 7fa050ddefca5373b09bdbcbb3aa0902eacd5d2f (diff) | |
download | qtmips-e0c757926743ee21f1a60b4b6948ca3eb895c373.tar.gz qtmips-e0c757926743ee21f1a60b4b6948ca3eb895c373.tar.bz2 qtmips-e0c757926743ee21f1a60b4b6948ca3eb895c373.zip |
Put qtmips_machine to machine namespace
Diffstat (limited to 'qtmips_machine/tests')
-rw-r--r-- | qtmips_machine/tests/testalu.cpp | 2 | ||||
-rw-r--r-- | qtmips_machine/tests/testcore.cpp | 2 | ||||
-rw-r--r-- | qtmips_machine/tests/testinstruction.cpp | 2 | ||||
-rw-r--r-- | qtmips_machine/tests/testmemory.cpp | 2 | ||||
-rw-r--r-- | qtmips_machine/tests/testprogramloader.cpp | 2 | ||||
-rw-r--r-- | qtmips_machine/tests/testregisters.cpp | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/qtmips_machine/tests/testalu.cpp b/qtmips_machine/tests/testalu.cpp index 603a610..7668679 100644 --- a/qtmips_machine/tests/testalu.cpp +++ b/qtmips_machine/tests/testalu.cpp @@ -2,6 +2,8 @@ #include "alu.h" #include "qtmipsexception.h" +using namespace machine; + void MachineTests::alu_data() { QTest::addColumn<AluOp>("op"); QTest::addColumn<std::uint32_t>("s"); diff --git a/qtmips_machine/tests/testcore.cpp b/qtmips_machine/tests/testcore.cpp index efc06da..0bd18ba 100644 --- a/qtmips_machine/tests/testcore.cpp +++ b/qtmips_machine/tests/testcore.cpp @@ -1,6 +1,8 @@ #include "tst_machine.h" #include "core.h" +using namespace machine; + static void core_regs_data() { QTest::addColumn<Instruction>("i"); QTest::addColumn<Registers>("init"); diff --git a/qtmips_machine/tests/testinstruction.cpp b/qtmips_machine/tests/testinstruction.cpp index 4efedac..2cdf119 100644 --- a/qtmips_machine/tests/testinstruction.cpp +++ b/qtmips_machine/tests/testinstruction.cpp @@ -1,6 +1,8 @@ #include "tst_machine.h" #include "instruction.h" +using namespace machine; + // Test that we are correctly encoding instructions in constructor void MachineTests::instruction() { QCOMPARE(Instruction(0x00), Instruction(0,0)); diff --git a/qtmips_machine/tests/testmemory.cpp b/qtmips_machine/tests/testmemory.cpp index f1c6b80..bef1a59 100644 --- a/qtmips_machine/tests/testmemory.cpp +++ b/qtmips_machine/tests/testmemory.cpp @@ -1,6 +1,8 @@ #include "tst_machine.h" #include "memory.h" +using namespace machine; + void MachineTests::memory_data() { QTest::addColumn<std::uint32_t>("address"); diff --git a/qtmips_machine/tests/testprogramloader.cpp b/qtmips_machine/tests/testprogramloader.cpp index 7ff1c54..057bf3f 100644 --- a/qtmips_machine/tests/testprogramloader.cpp +++ b/qtmips_machine/tests/testprogramloader.cpp @@ -3,6 +3,8 @@ #include "programloader.h" #include "instruction.h" +using namespace machine; + // This is common program start (initial value of program counter) #define PC_INIT 0x80020000 diff --git a/qtmips_machine/tests/testregisters.cpp b/qtmips_machine/tests/testregisters.cpp index b498c11..57a6479 100644 --- a/qtmips_machine/tests/testregisters.cpp +++ b/qtmips_machine/tests/testregisters.cpp @@ -2,6 +2,8 @@ #include <qtmipsexception.h> #include <registers.h> +using namespace machine; + void MachineTests::registers_gp0() { Registers r; QCOMPARE(r.read_gp(0), (unsigned)0); |