Reorganize some sources

Signed-off-by: Robert Young <[email protected]>
nbhuiyan · May 3, 2018 · 5529440 · 5529440
1 parent b645387
commit 5529440
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 59 deletions.
diff --git a/b9/CMakeLists.txt b/b9/CMakeLists.txt
@@ -1,12 +1,12 @@
 add_library(b9 SHARED
+	src/assemble.cpp
+	src/Compiler.cpp
+	src/deserialize.cpp
 	src/ExecutionContext.cpp
 	src/MethodBuilder.cpp
-	src/core.cpp
-	src/Compiler.cpp
 	src/primitives.cpp
 	src/serialize.cpp
-	src/deserialize.cpp
-	src/assemble.cpp
+	src/VirtualMachine.cpp
 )
 
 target_include_directories(b9

diff --git a/b9/include/b9/module.hpp → b9/include/b9/Module.hpp b/b9/include/b9/module.hpp → b9/include/b9/Module.hpp
diff --git a/b9/include/b9/VirtualMachine.hpp b/b9/include/b9/VirtualMachine.hpp
@@ -4,7 +4,7 @@
 #include <b9/OperandStack.hpp>
 #include <b9/compiler/Compiler.hpp>
 #include <b9/instructions.hpp>
-#include <b9/module.hpp>
+#include <b9/Module.hpp>
 
 #include <OMR/Om/Allocator.inl.hpp>
 #include <OMR/Om/Context.inl.hpp>

diff --git a/b9/include/b9/deserialize.hpp b/b9/include/b9/deserialize.hpp
@@ -2,7 +2,7 @@
 #define B9_DESERIALIZE_HPP_
 
 #include <b9/instructions.hpp>
-#include <b9/module.hpp>
+#include <b9/Module.hpp>
 
 #include <string.h>
 #include <iostream>

diff --git a/b9/include/b9/serialize.hpp b/b9/include/b9/serialize.hpp
@@ -1,7 +1,7 @@
 #ifndef B9_SERIALIZE_HPP_
 #define B9_SERIALIZE_HPP_
 
-#include <b9/module.hpp>
+#include <b9/Module.hpp>
 #include <fstream>
 #include <iostream>
 

diff --git a/b9/src/core.cpp → b9/src/VirtualMachine.cpp b/b9/src/core.cpp → b9/src/VirtualMachine.cpp
diff --git a/b9/src/deserialize.cpp b/b9/src/deserialize.cpp
@@ -6,7 +6,7 @@
 
 #include <b9/deserialize.hpp>
 #include <b9/instructions.hpp>
-#include <b9/module.hpp>
+#include <b9/Module.hpp>
 
 namespace b9 {
 

diff --git a/b9/src/serialize.cpp b/b9/src/serialize.cpp
@@ -5,7 +5,7 @@
 #include <vector>
 
 #include <b9/instructions.hpp>
-#include <b9/module.hpp>
+#include <b9/Module.hpp>
 #include <b9/serialize.hpp>
 
 namespace b9 {

diff --git a/b9asm/CMakeLists.txt b/b9asm/CMakeLists.txt
@@ -6,20 +6,3 @@ target_link_libraries(b9asm
   PUBLIC
     b9
 )
-
-add_executable(b9asmTest
-  testAsm.cpp
-)
-
-target_link_libraries(b9asmTest
-  PUBLIC
-    b9
-    gtest_main
-)
-
-add_test(
-  NAME run_asmTest
-  COMMAND b9asmTest
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
diff --git a/b9asm/b9asm.cpp b/b9asm/b9asm.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 
 #include <b9/assemble.hpp>
-#include <b9/module.hpp>
+#include <b9/Module.hpp>
 
 using namespace b9;
 

diff --git a/b9disasm/CMakeLists.txt b/b9disasm/CMakeLists.txt
@@ -1,37 +1,8 @@
 add_executable (b9disasm
-  b9disasm.cpp 
+  b9disasm.cpp
 )
 
 target_link_libraries(b9disasm
-  PUBLIC
-    b9 
-)
-
-add_executable(b9serializeTest
-  testDisasm.cpp
-)
-
-target_link_libraries(b9serializeTest
   PUBLIC
     b9
-    gtest_main
 )
-
-add_test(
-  NAME run_b9serializeTest
-  COMMAND b9serializeTest
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-function(b9disasm_test module)
-  add_test(
-    NAME disasm_${module}
-    COMMAND b9disasm ${CMAKE_CURRENT_SOURCE_DIR}/${module}
-  ) 
-endfunction()
-
-# This test material is missing from the repository
-#b9disasm_test(empty.mod)
-#b9disasm_test(simple.mod)
-#b9disasm_test(corrupt.mod)
-#b9disasm_test(complex.mod)
diff --git a/b9disasm/b9disasm.cpp b/b9disasm/b9disasm.cpp
@@ -2,7 +2,7 @@
 #include <fstream>
 
 #include <b9/deserialize.hpp>
-#include <b9/module.hpp>
+#include <b9/Module.hpp>
 
 using namespace b9;
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -23,3 +23,53 @@ add_test(
 	NAME run_b9test
 	COMMAND env B9_TEST_MODULE=interpreter_test.b9mod $<TARGET_FILE:b9test>
 )
+
+# b9 asm test
+
+add_executable(b9asmTest
+  testAsm.cpp
+)
+
+target_link_libraries(b9asmTest
+  PUBLIC
+    b9
+    gtest_main
+)
+
+add_test(
+  NAME run_asmTest
+  COMMAND b9asmTest
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+# b9 disasm test
+
+add_executable(b9serializeTest
+  testDisasm.cpp
+)
+
+target_link_libraries(b9serializeTest
+  PUBLIC
+    b9
+    gtest_main
+)
+
+add_test(
+  NAME run_b9serializeTest
+  COMMAND b9serializeTest
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+function(b9disasm_test module)
+  add_test(
+    NAME disasm_${module}
+    COMMAND b9disasm ${CMAKE_CURRENT_SOURCE_DIR}/${module}
+  ) 
+endfunction()
+
+# This test material is missing from the repository
+
+#b9disasm_test(empty.mod)
+#b9disasm_test(simple.mod)
+#b9disasm_test(corrupt.mod)
+#b9disasm_test(complex.mod)
diff --git a/b9asm/testAsm.cpp → test/testAsm.cpp b/b9asm/testAsm.cpp → test/testAsm.cpp
diff --git a/b9disasm/testDisasm.cpp → test/testDisasm.cpp b/b9disasm/testDisasm.cpp → test/testDisasm.cpp
@@ -1,7 +1,7 @@
 #include <b9/ExecutionContext.hpp>
 #include <b9/VirtualMachine.hpp>
 #include <b9/deserialize.hpp>
-#include <b9/module.hpp>
+#include <b9/Module.hpp>
 #include <b9/serialize.hpp>
 
 #include <gtest/gtest.h>