change source code to unified layout

Minres · May 21, 2022 · 1dd870d · 1dd870d
1 parent 5a19e01
commit 1dd870d
Show file tree

Hide file tree

Showing 37 changed files with 29 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,19 +25,23 @@ if(WITH_LLVM)
 endif()
 
 set(LIB_SOURCES
-    src/dbgsrvbase.cpp
-    src/gdb_session.cpp
-    src/vm_base.cpp
-    src/cmdhandler.cpp
-    src/target_adapter_base.cpp
-    src/encoderdecoder.cpp
-    src/loader.cpp
+	src/iss/debugger/gdb_session.cpp
+	src/iss/debugger/encoderdecoder.cpp
+	src/iss/debugger/target_adapter_base.cpp
+	src/iss/debugger/cmdhandler.cpp
+	src/iss/debugger/server_base.cpp
+	src/iss/vm_base.cpp
+	src/iss/plugin/loader.cpp
 )
+if(WITH_LLVM)
+    list(APPEND LIB_SOURCES src/iss/llvm/jit_helper.cpp src/iss/llvm/vm_base.cpp)
+endif()
 if(WITH_TCC)
-    list(APPEND LIB_SOURCES src/tcc_jit_helper.cpp)
+    list(APPEND LIB_SOURCES src/iss/tcc/jit_helper.cpp)
 endif()
 
 add_library(${PROJECT_NAME} STATIC ${LIB_SOURCES})
+	target_include_directories(${PROJECT_NAME} PUBLIC src) 
 if (MSVC)
     target_compile_definitions(${PROJECT_NAME} PUBLIC NOMINMAX)
 endif()
@@ -86,7 +90,7 @@ else()
 endif()
 target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS})
 
-set(LIB_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/incl/dbt_rise_common.h)
+set(LIB_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/dbt_rise_common.h)
 set_target_properties(${PROJECT_NAME} PROPERTIES
   VERSION ${PROJECT_VERSION}
   FRAMEWORK FALSE
@@ -103,7 +107,7 @@ install(TARGETS ${PROJECT_NAME} COMPONENT ${PROJECT_NAME}
   INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}      # headers
 )
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/incl/iss COMPONENT ${PROJECT_NAME}
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/iss COMPONENT ${PROJECT_NAME}
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} # target directory
         FILES_MATCHING # install only matched files
         PATTERN "*.h" # select header files

diff --git a/incl/dbt_rise_common.h → src/dbt_rise_common.h b/incl/dbt_rise_common.h → src/dbt_rise_common.h
diff --git a/incl/iss/arch/traits.h → src/iss/arch/traits.h b/incl/iss/arch/traits.h → src/iss/arch/traits.h
diff --git a/incl/iss/arch_if.h → src/iss/arch_if.h b/incl/iss/arch_if.h → src/iss/arch_if.h
diff --git a/src/cmdhandler.cpp → src/iss/debugger/cmdhandler.cpp b/src/cmdhandler.cpp → src/iss/debugger/cmdhandler.cpp
@@ -32,9 +32,9 @@
  *       eyck@minres.com - initial API and implementation
  ******************************************************************************/
 
-#include "iss/debugger/cmdhandler.h"
-#include "iss/log_categories.h"
-#include "util/ities.h"
+#include "cmdhandler.h"
+#include <iss/log_categories.h>
+#include <util/ities.h>
 
 #include <boost/tokenizer.hpp>
 #include <cstdarg>

diff --git a/incl/iss/debugger/cmdhandler.h → src/iss/debugger/cmdhandler.h b/incl/iss/debugger/cmdhandler.h → src/iss/debugger/cmdhandler.h
diff --git a/src/encoderdecoder.cpp → src/iss/debugger/encoderdecoder.cpp b/src/encoderdecoder.cpp → src/iss/debugger/encoderdecoder.cpp
@@ -31,7 +31,7 @@
  *       eyck@minres.com - initial API and implementation
  ******************************************************************************/
 
-#include "iss/debugger/encoderdecoder.h"
+#include "encoderdecoder.h"
 
 #include <iomanip>
 #include <sstream>

diff --git a/incl/iss/debugger/encoderdecoder.h → src/iss/debugger/encoderdecoder.h b/incl/iss/debugger/encoderdecoder.h → src/iss/debugger/encoderdecoder.h
diff --git a/src/gdb_session.cpp → src/iss/debugger/gdb_session.cpp b/src/gdb_session.cpp → src/iss/debugger/gdb_session.cpp
@@ -32,7 +32,7 @@
  ******************************************************************************/
 
 // clang-format off
-#include <iss/debugger/gdb_session.h>
+#include "gdb_session.h"
 #include <algorithm>
 #include <exception>
 #include <iomanip>

diff --git a/incl/iss/debugger/gdb_session.h → src/iss/debugger/gdb_session.h b/incl/iss/debugger/gdb_session.h → src/iss/debugger/gdb_session.h
diff --git a/incl/iss/debugger/serialized_connection.h → src/iss/debugger/serialized_connection.h b/incl/iss/debugger/serialized_connection.h → src/iss/debugger/serialized_connection.h
diff --git a/incl/iss/debugger/server.h → src/iss/debugger/server.h b/incl/iss/debugger/server.h → src/iss/debugger/server.h
diff --git a/src/dbgsrvbase.cpp → src/iss/debugger/server_base.cpp b/src/dbgsrvbase.cpp → src/iss/debugger/server_base.cpp
@@ -33,7 +33,7 @@
 
 // switch off warning C4996: 'std::copy': Function call with parameters that may
 // be unsafe
-#include "iss/debugger/server_base.h"
+#include "server_base.h"
 #include <functional>
 #include <future>
 #include <iss/debugger_if.h>

diff --git a/incl/iss/debugger/server_base.h → src/iss/debugger/server_base.h b/incl/iss/debugger/server_base.h → src/iss/debugger/server_base.h
diff --git a/incl/iss/debugger/server_if.h → src/iss/debugger/server_if.h b/incl/iss/debugger/server_if.h → src/iss/debugger/server_if.h
diff --git a/src/target_adapter_base.cpp → src/iss/debugger/target_adapter_base.cpp b/src/target_adapter_base.cpp → src/iss/debugger/target_adapter_base.cpp
@@ -31,7 +31,7 @@
  *       eyck@minres.com - initial API and implementation
  ******************************************************************************/
 
-#include <iss/debugger/target_adapter_base.h>
+#include "target_adapter_base.h"
 
 using namespace iss::debugger;
 

diff --git a/incl/iss/debugger/target_adapter_base.h → src/iss/debugger/target_adapter_base.h b/incl/iss/debugger/target_adapter_base.h → src/iss/debugger/target_adapter_base.h
diff --git a/incl/iss/debugger/target_adapter_if.h → src/iss/debugger/target_adapter_if.h b/incl/iss/debugger/target_adapter_if.h → src/iss/debugger/target_adapter_if.h
diff --git a/incl/iss/debugger_if.h → src/iss/debugger_if.h b/incl/iss/debugger_if.h → src/iss/debugger_if.h
diff --git a/incl/iss/instrumentation_if.h → src/iss/instrumentation_if.h b/incl/iss/instrumentation_if.h → src/iss/instrumentation_if.h
diff --git a/incl/iss/interp/vm_base.h → src/iss/interp/vm_base.h b/incl/iss/interp/vm_base.h → src/iss/interp/vm_base.h
diff --git a/incl/iss/iss.h → src/iss/iss.h b/incl/iss/iss.h → src/iss/iss.h
diff --git a/src/llvm_jit_helper.cpp → src/iss/llvm/jit_helper.cpp b/src/llvm_jit_helper.cpp → src/iss/llvm/jit_helper.cpp
@@ -31,7 +31,7 @@
  *       eyck@minres.com - initial API and implementation
  ******************************************************************************/
 
-#include <iss/llvm/jit_helper.h>
+#include "jit_helper.h"
 #include <iss/log_categories.h>
 #include <llvm/Support/Debug.h> //EnableDebugBuffering
 #include <llvm/Support/Error.h>

diff --git a/incl/iss/llvm/jit_helper.h → src/iss/llvm/jit_helper.h b/incl/iss/llvm/jit_helper.h → src/iss/llvm/jit_helper.h
diff --git a/src/llvm_vm_base.cpp → src/iss/llvm/vm_base.cpp b/src/llvm_vm_base.cpp → src/iss/llvm/vm_base.cpp
@@ -32,7 +32,7 @@
  ******************************************************************************/
 
 #include <iss/iss.h>
-#include <iss/llvm/vm_base.h>
+#include "vm_base.h"
 #include <iss/vm_plugin.h>
 #include <util/logging.h>
 

diff --git a/incl/iss/llvm/vm_base.h → src/iss/llvm/vm_base.h b/incl/iss/llvm/vm_base.h → src/iss/llvm/vm_base.h
diff --git a/incl/iss/log_categories.h → src/iss/log_categories.h b/incl/iss/log_categories.h → src/iss/log_categories.h
diff --git a/src/loader.cpp → src/iss/plugin/loader.cpp b/src/loader.cpp → src/iss/plugin/loader.cpp
@@ -53,7 +53,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <iss/plugin/loader.h>
+#include "loader.h"
 
 using namespace iss::plugin;
 std::unordered_map<std::string, std::shared_ptr<loader::plugin_data>> loader::_cache;

diff --git a/incl/iss/plugin/loader.h → src/iss/plugin/loader.h b/incl/iss/plugin/loader.h → src/iss/plugin/loader.h
diff --git a/incl/iss/tcc/code_builder.h → src/iss/tcc/code_builder.h b/incl/iss/tcc/code_builder.h → src/iss/tcc/code_builder.h
diff --git a/src/tcc_jit_helper.cpp → src/iss/tcc/jit_helper.cpp b/src/tcc_jit_helper.cpp → src/iss/tcc/jit_helper.cpp
@@ -31,7 +31,7 @@
  *       eyck@minres.com - initial API and implementation
  ******************************************************************************/
 
-#include <iss/tcc/jit_helper.h>
+#include "jit_helper.h"
 #include <iss/log_categories.h>
 #include <fmt/format.h>
 #include <array>

diff --git a/incl/iss/tcc/jit_helper.h → src/iss/tcc/jit_helper.h b/incl/iss/tcc/jit_helper.h → src/iss/tcc/jit_helper.h
diff --git a/incl/iss/tcc/vm_base.h → src/iss/tcc/vm_base.h b/incl/iss/tcc/vm_base.h → src/iss/tcc/vm_base.h
diff --git a/src/vm_base.cpp → src/iss/vm_base.cpp b/src/vm_base.cpp → src/iss/vm_base.cpp
@@ -31,10 +31,10 @@
  *       eyck@minres.com - initial API and implementation
  ******************************************************************************/
 
-#include <iss/arch_if.h>
-#include <iss/iss.h>
-#include <iss/vm_if.h>
-#include <iss/vm_plugin.h>
+#include "arch_if.h"
+#include "iss.h"
+#include "vm_if.h"
+#include "vm_plugin.h"
 #include <util/logging.h>
 
 using namespace iss;

diff --git a/incl/iss/vm_if.h → src/iss/vm_if.h b/incl/iss/vm_if.h → src/iss/vm_if.h
diff --git a/incl/iss/vm_plugin.h → src/iss/vm_plugin.h b/incl/iss/vm_plugin.h → src/iss/vm_plugin.h
diff --git a/incl/iss/vm_types.h → src/iss/vm_types.h b/incl/iss/vm_types.h → src/iss/vm_types.h