Refactor project structure and CMake

mortbopet · Dec 18, 2022 · fe5264c · fe5264c
1 parent 190418a
commit fe5264c
Show file tree

Hide file tree

Showing 219 changed files with 210 additions and 151 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@
 *.o
 Makefile
 
+CMakeLists.txt.user*
+
 
 # Qt generated files
 moc_*

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "cmake.buildDirectory": "C:/Users/Morten/Downloads/build-Ripes-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug"
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,6 +32,8 @@ elseif(MINGW)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mbig-obj") # Allow big object
 endif()
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 ######################################################################
 ## GUI setup
 ######################################################################
@@ -48,11 +50,13 @@ find_package(Qt5Widgets CONFIG REQUIRED)
 find_package(Qt5Svg REQUIRED)
 find_package(Qt5Charts CONFIG REQUIRED)
 
-# Finding Qt includes
+# Include Qt includes
+# TODO: fix this, it's VSRTL which relies on global includes...
 include_directories(${Qt5Widgets_INCLUDE_DIRS})
 include_directories(${Qt5Core_INCLUDE_DIRS})
 include_directories(${Qt5Charts_INCLUDE_DIRS})
 
+
 ######################################################################
 ## Resources setup
 ######################################################################
@@ -65,14 +69,6 @@ qt5_add_resources(FONTS_SRC ${CMAKE_SOURCE_DIR}/resources/fonts/fonts.qrc)
 ## Library setup
 ######################################################################
 
-# Header-only libraries used in the project must be included from top CMakeLists.txt file
-include_directories(${RIPES_LIB} SYSTEM PUBLIC external/VSRTL/external/cereal/include)
-include_directories(${RIPES_LIB} PUBLIC external/VSRTL/external)
-include_directories(SYSTEM external/ELFIO)
-include_directories(SYSTEM external/VSRTL/external/Signals)
-include_directories(external/libelfin_cmake)
-include_directories(external)
-
 option(RIPES_BUILD_VERILATOR_PROCESSORS "Build verilator processors" OFF)
 if(RIPES_BUILD_VERILATOR_PROCESSORS)
     if(NOT DEFINED ENV{VERILATOR_ROOT})

diff --git a/src/STLExtras.h → include/STLExtras.h b/src/STLExtras.h → include/STLExtras.h
diff --git a/src/addressdialog.h → include/addressdialog.h b/src/addressdialog.h → include/addressdialog.h
diff --git a/src/assembler/assembler.h → include/assembler/assembler.h b/src/assembler/assembler.h → include/assembler/assembler.h
diff --git a/src/assembler/assembler_defines.h → include/assembler/assembler_defines.h b/src/assembler/assembler_defines.h → include/assembler/assembler_defines.h
diff --git a/src/assembler/assemblerbase.h → include/assembler/assemblerbase.h b/src/assembler/assemblerbase.h → include/assembler/assemblerbase.h
diff --git a/src/assembler/assemblererror.h → include/assembler/assemblererror.h b/src/assembler/assemblererror.h → include/assembler/assemblererror.h
diff --git a/src/assembler/directive.h → include/assembler/directive.h b/src/assembler/directive.h → include/assembler/directive.h
diff --git a/src/assembler/expreval.h → include/assembler/expreval.h b/src/assembler/expreval.h → include/assembler/expreval.h
diff --git a/src/assembler/gnudirectives.h → include/assembler/gnudirectives.h b/src/assembler/gnudirectives.h → include/assembler/gnudirectives.h
diff --git a/src/assembler/instruction.h → include/assembler/instruction.h b/src/assembler/instruction.h → include/assembler/instruction.h
diff --git a/src/assembler/location.h → include/assembler/location.h b/src/assembler/location.h → include/assembler/location.h
diff --git a/src/assembler/matcher.h → include/assembler/matcher.h b/src/assembler/matcher.h → include/assembler/matcher.h
diff --git a/src/assembler/objdump.h → include/assembler/objdump.h b/src/assembler/objdump.h → include/assembler/objdump.h
diff --git a/src/assembler/parserutilities.h → include/assembler/parserutilities.h b/src/assembler/parserutilities.h → include/assembler/parserutilities.h
diff --git a/src/assembler/program.h → include/assembler/program.h b/src/assembler/program.h → include/assembler/program.h
diff --git a/src/assembler/pseudoinstruction.h → include/assembler/pseudoinstruction.h b/src/assembler/pseudoinstruction.h → include/assembler/pseudoinstruction.h
diff --git a/src/assembler/relocation.h → include/assembler/relocation.h b/src/assembler/relocation.h → include/assembler/relocation.h
diff --git a/src/assembler/rv32i_assembler.h → include/assembler/rv32i_assembler.h b/src/assembler/rv32i_assembler.h → include/assembler/rv32i_assembler.h
diff --git a/src/assembler/rv64i_assembler.h → include/assembler/rv64i_assembler.h b/src/assembler/rv64i_assembler.h → include/assembler/rv64i_assembler.h
diff --git a/src/assembler/rv_c_ext.h → include/assembler/rv_c_ext.h b/src/assembler/rv_c_ext.h → include/assembler/rv_c_ext.h
diff --git a/src/assembler/rv_i_ext.h → include/assembler/rv_i_ext.h b/src/assembler/rv_i_ext.h → include/assembler/rv_i_ext.h
diff --git a/src/assembler/rv_m_ext.h → include/assembler/rv_m_ext.h b/src/assembler/rv_m_ext.h → include/assembler/rv_m_ext.h
diff --git a/src/assembler/rvassembler_common.h → include/assembler/rvassembler_common.h b/src/assembler/rvassembler_common.h → include/assembler/rvassembler_common.h
diff --git a/src/assembler/rvrelocations.h → include/assembler/rvrelocations.h b/src/assembler/rvrelocations.h → include/assembler/rvrelocations.h
diff --git a/src/assembler/symbolmap.h → include/assembler/symbolmap.h b/src/assembler/symbolmap.h → include/assembler/symbolmap.h
diff --git a/src/binutils.h → include/binutils.h b/src/binutils.h → include/binutils.h
diff --git a/src/cachesim/cacheconfigwidget.h → include/cachesim/cacheconfigwidget.h b/src/cachesim/cacheconfigwidget.h → include/cachesim/cacheconfigwidget.h
diff --git a/src/cachesim/cachegraphic.h → include/cachesim/cachegraphic.h b/src/cachesim/cachegraphic.h → include/cachesim/cachegraphic.h
diff --git a/src/cachesim/cacheplotview.h → include/cachesim/cacheplotview.h b/src/cachesim/cacheplotview.h → include/cachesim/cacheplotview.h
diff --git a/src/cachesim/cacheplotwidget.h → include/cachesim/cacheplotwidget.h b/src/cachesim/cacheplotwidget.h → include/cachesim/cacheplotwidget.h
diff --git a/src/cachesim/cachesim.h → include/cachesim/cachesim.h b/src/cachesim/cachesim.h → include/cachesim/cachesim.h
diff --git a/src/cachesim/cacheview.h → include/cachesim/cacheview.h b/src/cachesim/cacheview.h → include/cachesim/cacheview.h
diff --git a/src/cachesim/cachewidget.h → include/cachesim/cachewidget.h b/src/cachesim/cachewidget.h → include/cachesim/cachewidget.h
diff --git a/src/cachesim/callout.h → include/cachesim/callout.h b/src/cachesim/callout.h → include/cachesim/callout.h
diff --git a/src/cachesim/chartlinemarker.h → include/cachesim/chartlinemarker.h b/src/cachesim/chartlinemarker.h → include/cachesim/chartlinemarker.h
diff --git a/src/cachesim/l1cacheshim.h → include/cachesim/l1cacheshim.h b/src/cachesim/l1cacheshim.h → include/cachesim/l1cacheshim.h
diff --git a/src/cachetab.h → include/cachetab.h b/src/cachetab.h → include/cachetab.h
diff --git a/src/cachetabwidget.h → include/cachetabwidget.h b/src/cachetabwidget.h → include/cachetabwidget.h
diff --git a/src/ccmanager.h → include/ccmanager.h b/src/ccmanager.h → include/ccmanager.h
diff --git a/src/cli/clioptions.h → include/cli/clioptions.h b/src/cli/clioptions.h → include/cli/clioptions.h
diff --git a/src/cli/clirunner.h → include/cli/clirunner.h b/src/cli/clirunner.h → include/cli/clirunner.h
diff --git a/src/cli/programutilities.h → include/cli/programutilities.h b/src/cli/programutilities.h → include/cli/programutilities.h
diff --git a/src/cli/telemetry.h → include/cli/telemetry.h b/src/cli/telemetry.h → include/cli/telemetry.h
diff --git a/src/colors.h → include/colors.h b/src/colors.h → include/colors.h
diff --git a/src/compilererrordialog.h → include/compilererrordialog.h b/src/compilererrordialog.h → include/compilererrordialog.h
diff --git a/src/console.h → include/console.h b/src/console.h → include/console.h
diff --git a/src/consolewidget.h → include/consolewidget.h b/src/consolewidget.h → include/consolewidget.h
diff --git a/src/ctkrangeslider.h → include/ctkrangeslider.h b/src/ctkrangeslider.h → include/ctkrangeslider.h
diff --git a/src/editor/codeeditor.h → include/editor/codeeditor.h b/src/editor/codeeditor.h → include/editor/codeeditor.h
diff --git a/src/editor/csyntaxhighlighter.h → include/editor/csyntaxhighlighter.h b/src/editor/csyntaxhighlighter.h → include/editor/csyntaxhighlighter.h
diff --git a/src/editor/highlightabletextedit.h → include/editor/highlightabletextedit.h b/src/editor/highlightabletextedit.h → include/editor/highlightabletextedit.h
diff --git a/src/editor/rvsyntaxhighlighter.h → include/editor/rvsyntaxhighlighter.h b/src/editor/rvsyntaxhighlighter.h → include/editor/rvsyntaxhighlighter.h
diff --git a/src/editor/syntaxhighlighter.h → include/editor/syntaxhighlighter.h b/src/editor/syntaxhighlighter.h → include/editor/syntaxhighlighter.h
diff --git a/src/edittab.h → include/edittab.h b/src/edittab.h → include/edittab.h
diff --git a/src/elfinfostrings.h → include/elfinfostrings.h b/src/elfinfostrings.h → include/elfinfostrings.h
diff --git a/src/enumcombobox.h → include/enumcombobox.h b/src/enumcombobox.h → include/enumcombobox.h
diff --git a/src/flowlayout.h → include/flowlayout.h b/src/flowlayout.h → include/flowlayout.h
diff --git a/src/fonts.h → include/fonts.h b/src/fonts.h → include/fonts.h
diff --git a/src/formattermanager.h → include/formattermanager.h b/src/formattermanager.h → include/formattermanager.h
diff --git a/src/gotocombobox.h → include/gotocombobox.h b/src/gotocombobox.h → include/gotocombobox.h
diff --git a/src/instructionmodel.h → include/instructionmodel.h b/src/instructionmodel.h → include/instructionmodel.h
diff --git a/src/io/iobase.h → include/io/iobase.h b/src/io/iobase.h → include/io/iobase.h
diff --git a/src/io/iodpad.h → include/io/iodpad.h b/src/io/iodpad.h → include/io/iodpad.h
diff --git a/src/io/ioledmatrix.h → include/io/ioledmatrix.h b/src/io/ioledmatrix.h → include/io/ioledmatrix.h
diff --git a/src/io/iomanager.h → include/io/iomanager.h b/src/io/iomanager.h → include/io/iomanager.h
diff --git a/src/io/ioregistry.h → include/io/ioregistry.h b/src/io/ioregistry.h → include/io/ioregistry.h
diff --git a/src/io/ioswitches.h → include/io/ioswitches.h b/src/io/ioswitches.h → include/io/ioswitches.h
diff --git a/src/io/memorymapmodel.h → include/io/memorymapmodel.h b/src/io/memorymapmodel.h → include/io/memorymapmodel.h
diff --git a/src/io/periphparammodel.h → include/io/periphparammodel.h b/src/io/periphparammodel.h → include/io/periphparammodel.h
diff --git a/src/io/registermapmodel.h → include/io/registermapmodel.h b/src/io/registermapmodel.h → include/io/registermapmodel.h
diff --git a/src/ioperipheraltab.h → include/ioperipheraltab.h b/src/ioperipheraltab.h → include/ioperipheraltab.h
diff --git a/src/iotab.h → include/iotab.h b/src/iotab.h → include/iotab.h
diff --git a/src/isa/isainfo.h → include/isa/isainfo.h b/src/isa/isainfo.h → include/isa/isainfo.h
diff --git a/src/isa/rv32isainfo.h → include/isa/rv32isainfo.h b/src/isa/rv32isainfo.h → include/isa/rv32isainfo.h
diff --git a/src/isa/rv64isainfo.h → include/isa/rv64isainfo.h b/src/isa/rv64isainfo.h → include/isa/rv64isainfo.h
diff --git a/src/isa/rvisainfo_common.h → include/isa/rvisainfo_common.h b/src/isa/rvisainfo_common.h → include/isa/rvisainfo_common.h
diff --git a/src/loaddialog.h → include/loaddialog.h b/src/loaddialog.h → include/loaddialog.h
diff --git a/src/mainwindow.h → include/mainwindow.h b/src/mainwindow.h → include/mainwindow.h
diff --git a/src/memorymodel.h → include/memorymodel.h b/src/memorymodel.h → include/memorymodel.h
diff --git a/src/memorytab.h → include/memorytab.h b/src/memorytab.h → include/memorytab.h
diff --git a/src/memoryview.h → include/memoryview.h b/src/memoryview.h → include/memoryview.h
diff --git a/src/memoryviewerwidget.h → include/memoryviewerwidget.h b/src/memoryviewerwidget.h → include/memoryviewerwidget.h
diff --git a/src/pipelinediagrammodel.h → include/pipelinediagrammodel.h b/src/pipelinediagrammodel.h → include/pipelinediagrammodel.h
diff --git a/src/pipelinediagramwidget.h → include/pipelinediagramwidget.h b/src/pipelinediagramwidget.h → include/pipelinediagramwidget.h
diff --git a/src/processmanager.h → include/processmanager.h b/src/processmanager.h → include/processmanager.h
diff --git a/src/processorhandler.h → include/processorhandler.h b/src/processorhandler.h → include/processorhandler.h
diff --git a/src/processorregistry.h → include/processorregistry.h b/src/processorregistry.h → include/processorregistry.h
diff --git a/include/processors/CMakeLists.txt b/include/processors/CMakeLists.txt
@@ -0,0 +1,60 @@
+cmake_minimum_required(VERSION 3.9)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Allow linking parent libraries with libraries defined in subdirectories
+cmake_policy(SET CMP0079 NEW)
+
+macro(create_isa_lib isa)
+    file(GLOB LIB_SOURCES  ${isa}/*.cpp)
+    file(GLOB LIB_HEADERS
+        RipesVSRTLProcessor.h
+        ripesvsrtlprocessor.h
+        ${isa}/*.h)
+    add_library(${isa}_lib ${LIB_SOURCES} ${LIB_HEADERS})
+endmacro()
+
+macro(create_vsrtl_processor isa name)
+    file(GLOB LIB_SOURCES  ${isa}/${name}/*.cpp)
+    file(GLOB LIB_HEADERS RipesVSRTLProcessor.h ${isa}/${name}/*.h)
+    add_library(${name} ${LIB_SOURCES} ${LIB_HEADERS})
+    target_link_libraries(${name} ${VSRTL_CORE_LIB} ${isa}_lib)
+    target_include_directories(${name} PUBLIC ${isa})
+    target_include_directories(${name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+    target_include_directories(${name} PUBLIC ${CMAKE_SOURCE_DIR}/external)
+    target_compile_features(${name} PRIVATE cxx_std_17)
+endmacro()
+
+macro(create_verilator_processor
+        SUBFOLDER
+        PROCFOLDER
+        SOURCES
+        TOP
+        ARGS
+    )
+    file(GLOB LIB_SOURCES ${SUBFOLDER}/*.cpp)
+    file(GLOB LIB_HEADERS ${SUBFOLDER}/*.h)
+
+    add_library(${SUBFOLDER} ${LIB_SOURCES} ${LIB_HEADERS})
+    target_compile_features(${SUBFOLDER} PRIVATE cxx_std_17)
+
+    # Link processor against Verilator runtime library
+    target_link_libraries(${SUBFOLDER} PUBLIC ${VERILATOR_LIB})
+    # Link Ripes lib against the processor library (Verilator processors are not header-only)
+    target_link_libraries(${RIPES_LIB} PUBLIC ${SUBFOLDER})
+
+    verilate(${SUBFOLDER}
+      TOP_MODULE ${TOP}
+      SOURCES ${SOURCES}
+      VERILATOR_ARGS ${ARGS})
+
+endmacro()
+
+# RISC-V Processors
+create_isa_lib(RISC-V)
+create_vsrtl_processor(RISC-V rvss)
+create_vsrtl_processor(RISC-V rv5s)
+create_vsrtl_processor(RISC-V rv5s_no_fw_hz)
+create_vsrtl_processor(RISC-V rv5s_no_hz)
+create_vsrtl_processor(RISC-V rv5s_no_fw)
+create_vsrtl_processor(RISC-V rv6s_dual)
diff --git a/src/processors/RISC-V/riscv.h → include/processors/RISC-V/riscv.h b/src/processors/RISC-V/riscv.h → include/processors/RISC-V/riscv.h
diff --git a/src/processors/RISC-V/rv5s/rv5s.h → include/processors/RISC-V/rv5s/rv5s.h b/src/processors/RISC-V/rv5s/rv5s.h → include/processors/RISC-V/rv5s/rv5s.h
@@ -6,7 +6,7 @@
 #include "VSRTL/core/vsrtl_logicgate.h"
 #include "VSRTL/core/vsrtl_multiplexer.h"
 
-#include "../../ripesvsrtlprocessor.h"
+#include "processors/ripesvsrtlprocessor.h"
 
 // Functional units
 #include "../riscv.h"

diff --git a/src/processors/RISC-V/rv5s/rv5s_exmem.h → include/processors/RISC-V/rv5s/rv5s_exmem.h b/src/processors/RISC-V/rv5s/rv5s_exmem.h → include/processors/RISC-V/rv5s/rv5s_exmem.h
diff --git a/...cessors/RISC-V/rv5s/rv5s_forwardingunit.h → ...cessors/RISC-V/rv5s/rv5s_forwardingunit.h b/...cessors/RISC-V/rv5s/rv5s_forwardingunit.h → ...cessors/RISC-V/rv5s/rv5s_forwardingunit.h
diff --git a/src/processors/RISC-V/rv5s/rv5s_hazardunit.h → .../processors/RISC-V/rv5s/rv5s_hazardunit.h b/src/processors/RISC-V/rv5s/rv5s_hazardunit.h → .../processors/RISC-V/rv5s/rv5s_hazardunit.h
diff --git a/src/processors/RISC-V/rv5s/rv5s_idex.h → include/processors/RISC-V/rv5s/rv5s_idex.h b/src/processors/RISC-V/rv5s/rv5s_idex.h → include/processors/RISC-V/rv5s/rv5s_idex.h
diff --git a/src/processors/RISC-V/rv5s/rv5s_memwb.h → include/processors/RISC-V/rv5s/rv5s_memwb.h b/src/processors/RISC-V/rv5s/rv5s_memwb.h → include/processors/RISC-V/rv5s/rv5s_memwb.h
diff --git a/...processors/RISC-V/rv5s_no_fw/rv5s_no_fw.h → ...processors/RISC-V/rv5s_no_fw/rv5s_no_fw.h b/...processors/RISC-V/rv5s_no_fw/rv5s_no_fw.h → ...processors/RISC-V/rv5s_no_fw/rv5s_no_fw.h
diff --git a/...RISC-V/rv5s_no_fw/rv5s_no_fw_hazardunit.h → ...RISC-V/rv5s_no_fw/rv5s_no_fw_hazardunit.h b/...RISC-V/rv5s_no_fw/rv5s_no_fw_hazardunit.h → ...RISC-V/rv5s_no_fw/rv5s_no_fw_hazardunit.h
diff --git a/...ssors/RISC-V/rv5s_no_fw/rv5s_no_fw_idex.h → ...ssors/RISC-V/rv5s_no_fw/rv5s_no_fw_idex.h b/...ssors/RISC-V/rv5s_no_fw/rv5s_no_fw_idex.h → ...ssors/RISC-V/rv5s_no_fw/rv5s_no_fw_idex.h
diff --git a/...sors/RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz.h → ...sors/RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz.h b/...sors/RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz.h → ...sors/RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz.h
diff --git a/...ISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_exmem.h → ...ISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_exmem.h b/...ISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_exmem.h → ...ISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_exmem.h
diff --git a/...RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_idex.h → ...RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_idex.h b/...RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_idex.h → ...RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_idex.h
diff --git a/...RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_ifid.h → ...RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_ifid.h b/...RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_ifid.h → ...RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_ifid.h
diff --git a/...ISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_memwb.h → ...ISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_memwb.h b/...ISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_memwb.h → ...ISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_memwb.h
diff --git a/...processors/RISC-V/rv5s_no_hz/rv5s_no_hz.h → ...processors/RISC-V/rv5s_no_hz/rv5s_no_hz.h b/...processors/RISC-V/rv5s_no_hz/rv5s_no_hz.h → ...processors/RISC-V/rv5s_no_hz/rv5s_no_hz.h
diff --git a/src/processors/RISC-V/rv6s_dual/rv6s_dual.h → ...e/processors/RISC-V/rv6s_dual/rv6s_dual.h b/src/processors/RISC-V/rv6s_dual/rv6s_dual.h → ...e/processors/RISC-V/rv6s_dual/rv6s_dual.h
diff --git a/...ssors/RISC-V/rv6s_dual/rv6s_dual_branch.h → ...ssors/RISC-V/rv6s_dual/rv6s_dual_branch.h b/...ssors/RISC-V/rv6s_dual/rv6s_dual_branch.h → ...ssors/RISC-V/rv6s_dual/rv6s_dual_branch.h
diff --git a/...ssors/RISC-V/rv6s_dual/rv6s_dual_common.h → ...ssors/RISC-V/rv6s_dual/rv6s_dual_common.h b/...ssors/RISC-V/rv6s_dual/rv6s_dual_common.h → ...ssors/RISC-V/rv6s_dual/rv6s_dual_common.h
diff --git a/...sors/RISC-V/rv6s_dual/rv6s_dual_control.h → ...sors/RISC-V/rv6s_dual/rv6s_dual_control.h b/...sors/RISC-V/rv6s_dual/rv6s_dual_control.h → ...sors/RISC-V/rv6s_dual/rv6s_dual_control.h
diff --git a/...essors/RISC-V/rv6s_dual/rv6s_dual_exmem.h → ...essors/RISC-V/rv6s_dual/rv6s_dual_exmem.h b/...essors/RISC-V/rv6s_dual/rv6s_dual_exmem.h → ...essors/RISC-V/rv6s_dual/rv6s_dual_exmem.h
diff --git a/...SC-V/rv6s_dual/rv6s_dual_forwardingunit.h → ...SC-V/rv6s_dual/rv6s_dual_forwardingunit.h b/...SC-V/rv6s_dual/rv6s_dual_forwardingunit.h → ...SC-V/rv6s_dual/rv6s_dual_forwardingunit.h
diff --git a/...s/RISC-V/rv6s_dual/rv6s_dual_hazardunit.h → ...s/RISC-V/rv6s_dual/rv6s_dual_hazardunit.h b/...s/RISC-V/rv6s_dual/rv6s_dual_hazardunit.h → ...s/RISC-V/rv6s_dual/rv6s_dual_hazardunit.h
diff --git a/...cessors/RISC-V/rv6s_dual/rv6s_dual_idii.h → ...cessors/RISC-V/rv6s_dual/rv6s_dual_idii.h b/...cessors/RISC-V/rv6s_dual/rv6s_dual_idii.h → ...cessors/RISC-V/rv6s_dual/rv6s_dual_idii.h
diff --git a/...cessors/RISC-V/rv6s_dual/rv6s_dual_ifid.h → ...cessors/RISC-V/rv6s_dual/rv6s_dual_ifid.h b/...cessors/RISC-V/rv6s_dual/rv6s_dual_ifid.h → ...cessors/RISC-V/rv6s_dual/rv6s_dual_ifid.h
diff --git a/...cessors/RISC-V/rv6s_dual/rv6s_dual_iiex.h → ...cessors/RISC-V/rv6s_dual/rv6s_dual_iiex.h b/...cessors/RISC-V/rv6s_dual/rv6s_dual_iiex.h → ...cessors/RISC-V/rv6s_dual/rv6s_dual_iiex.h
diff --git a/...rs/RISC-V/rv6s_dual/rv6s_dual_instr_mem.h → ...rs/RISC-V/rv6s_dual/rv6s_dual_instr_mem.h b/...rs/RISC-V/rv6s_dual/rv6s_dual_instr_mem.h → ...rs/RISC-V/rv6s_dual/rv6s_dual_instr_mem.h
diff --git a/...essors/RISC-V/rv6s_dual/rv6s_dual_memwb.h → ...essors/RISC-V/rv6s_dual/rv6s_dual_memwb.h b/...essors/RISC-V/rv6s_dual/rv6s_dual_memwb.h → ...essors/RISC-V/rv6s_dual/rv6s_dual_memwb.h
diff --git a/...RISC-V/rv6s_dual/rv6s_dual_registerfile.h → ...RISC-V/rv6s_dual/rv6s_dual_registerfile.h b/...RISC-V/rv6s_dual/rv6s_dual_registerfile.h → ...RISC-V/rv6s_dual/rv6s_dual_registerfile.h
diff --git a/...s/RISC-V/rv6s_dual/rv6s_dual_uncompress.h → ...s/RISC-V/rv6s_dual/rv6s_dual_uncompress.h b/...s/RISC-V/rv6s_dual/rv6s_dual_uncompress.h → ...s/RISC-V/rv6s_dual/rv6s_dual_uncompress.h
diff --git a/...s/RISC-V/rv6s_dual/rv6s_dual_waycontrol.h → ...s/RISC-V/rv6s_dual/rv6s_dual_waycontrol.h b/...s/RISC-V/rv6s_dual/rv6s_dual_waycontrol.h → ...s/RISC-V/rv6s_dual/rv6s_dual_waycontrol.h
diff --git a/src/processors/RISC-V/rv_alu.h → include/processors/RISC-V/rv_alu.h b/src/processors/RISC-V/rv_alu.h → include/processors/RISC-V/rv_alu.h
diff --git a/src/processors/RISC-V/rv_branch.h → include/processors/RISC-V/rv_branch.h b/src/processors/RISC-V/rv_branch.h → include/processors/RISC-V/rv_branch.h
diff --git a/src/processors/RISC-V/rv_control.h → include/processors/RISC-V/rv_control.h b/src/processors/RISC-V/rv_control.h → include/processors/RISC-V/rv_control.h
diff --git a/src/processors/RISC-V/rv_decode.h → include/processors/RISC-V/rv_decode.h b/src/processors/RISC-V/rv_decode.h → include/processors/RISC-V/rv_decode.h
diff --git a/src/processors/RISC-V/rv_ecallchecker.h → include/processors/RISC-V/rv_ecallchecker.h b/src/processors/RISC-V/rv_ecallchecker.h → include/processors/RISC-V/rv_ecallchecker.h
diff --git a/src/processors/RISC-V/rv_immediate.h → include/processors/RISC-V/rv_immediate.h b/src/processors/RISC-V/rv_immediate.h → include/processors/RISC-V/rv_immediate.h
diff --git a/src/processors/RISC-V/rv_instrparser.h → include/processors/RISC-V/rv_instrparser.h b/src/processors/RISC-V/rv_instrparser.h → include/processors/RISC-V/rv_instrparser.h
diff --git a/src/processors/RISC-V/rv_memory.h → include/processors/RISC-V/rv_memory.h b/src/processors/RISC-V/rv_memory.h → include/processors/RISC-V/rv_memory.h
diff --git a/src/processors/RISC-V/rv_registerfile.h → include/processors/RISC-V/rv_registerfile.h b/src/processors/RISC-V/rv_registerfile.h → include/processors/RISC-V/rv_registerfile.h
diff --git a/src/processors/RISC-V/rv_uncompress.h → include/processors/RISC-V/rv_uncompress.h b/src/processors/RISC-V/rv_uncompress.h → include/processors/RISC-V/rv_uncompress.h
diff --git a/src/processors/RISC-V/rvss/rv_decodeRVC.h → ...ude/processors/RISC-V/rvss/rv_decodeRVC.h b/src/processors/RISC-V/rvss/rv_decodeRVC.h → ...ude/processors/RISC-V/rvss/rv_decodeRVC.h
diff --git a/src/processors/RISC-V/rvss/rvss.h → include/processors/RISC-V/rvss/rvss.h b/src/processors/RISC-V/rvss/rvss.h → include/processors/RISC-V/rvss/rvss.h
diff --git a/src/processors/interface/ripesprocessor.h → ...ude/processors/interface/ripesprocessor.h b/src/processors/interface/ripesprocessor.h → ...ude/processors/interface/ripesprocessor.h
diff --git a/include/processors/layouts.qrc b/include/processors/layouts.qrc
@@ -0,0 +1,15 @@
+<RCC>
+    <qresource prefix="/layouts">
+        <file>RISC-V/rvss/rv_ss_extended_layout.json</file>
+        <file>RISC-V/rvss/rv_ss_standard_layout.json</file>
+        <file>RISC-V/rv5s/rv5s_standard_layout.json</file>
+        <file>RISC-V/rv5s/rv5s_extended_layout.json</file>
+        <file>RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_standard_layout.json</file>
+        <file>RISC-V/rv5s_no_fw_hz/rv5s_no_fw_hz_extended_layout.json</file>
+        <file>RISC-V/rv5s_no_hz/rv5s_no_hz_standard_layout.json</file>
+        <file>RISC-V/rv5s_no_hz/rv5s_no_hz_extended_layout.json</file>
+        <file>RISC-V/rv5s_no_fw/rv5s_no_fw_standard_layout.json</file>
+        <file>RISC-V/rv5s_no_fw/rv5s_no_fw_extended_layout.json</file>
+        <file>RISC-V/rv6s_dual/rv6s_dual_extended_layout.json</file>
+    </qresource>
+</RCC>
diff --git a/src/processors/ripesvsrtlprocessor.h → include/processors/ripesvsrtlprocessor.h b/src/processors/ripesvsrtlprocessor.h → include/processors/ripesvsrtlprocessor.h
diff --git a/src/processorselectiondialog.h → include/processorselectiondialog.h b/src/processorselectiondialog.h → include/processorselectiondialog.h
diff --git a/src/processortab.h → include/processortab.h b/src/processortab.h → include/processortab.h
diff --git a/src/programviewer.h → include/programviewer.h b/src/programviewer.h → include/programviewer.h
@@ -8,7 +8,7 @@
 
 #include "assembler/objdump.h"
 #include "assembler/program.h"
-#include "highlightabletextedit.h"
+#include "editor/highlightabletextedit.h"
 #include "processorhandler.h"
 
 namespace Ripes {

diff --git a/src/radix.h → include/radix.h b/src/radix.h → include/radix.h
diff --git a/src/radixselectorwidget.h → include/radixselectorwidget.h b/src/radixselectorwidget.h → include/radixselectorwidget.h
diff --git a/src/registercontainerwidget.h → include/registercontainerwidget.h b/src/registercontainerwidget.h → include/registercontainerwidget.h
diff --git a/src/registerinitializationwidget.h → include/registerinitializationwidget.h b/src/registerinitializationwidget.h → include/registerinitializationwidget.h
diff --git a/src/registermodel.h → include/registermodel.h b/src/registermodel.h → include/registermodel.h
diff --git a/src/registerwidget.h → include/registerwidget.h b/src/registerwidget.h → include/registerwidget.h
diff --git a/src/ripes_types.h → include/ripes_types.h b/src/ripes_types.h → include/ripes_types.h
diff --git a/src/ripessettings.h → include/ripessettings.h b/src/ripessettings.h → include/ripessettings.h
diff --git a/src/ripestab.h → include/ripestab.h b/src/ripestab.h → include/ripestab.h
diff --git a/src/savedialog.h → include/savedialog.h b/src/savedialog.h → include/savedialog.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "program.h"
+#include "assembler/program.h"
 #include "ripessettings.h"
 #include <QDialog>
 

diff --git a/src/serializers.h → include/serializers.h b/src/serializers.h → include/serializers.h
diff --git a/src/settingsdialog.h → include/settingsdialog.h b/src/settingsdialog.h → include/settingsdialog.h
diff --git a/src/statusmanager.h → include/statusmanager.h b/src/statusmanager.h → include/statusmanager.h
diff --git a/src/symbolnavigator.h → include/symbolnavigator.h b/src/symbolnavigator.h → include/symbolnavigator.h
diff --git a/src/syscall/control.h → include/syscall/control.h b/src/syscall/control.h → include/syscall/control.h
diff --git a/src/syscall/file.h → include/syscall/file.h b/src/syscall/file.h → include/syscall/file.h
diff --git a/src/syscall/print.h → include/syscall/print.h b/src/syscall/print.h → include/syscall/print.h
diff --git a/src/syscall/ripes_syscall.h → include/syscall/ripes_syscall.h b/src/syscall/ripes_syscall.h → include/syscall/ripes_syscall.h
diff --git a/src/syscall/riscv_syscall.h → include/syscall/riscv_syscall.h b/src/syscall/riscv_syscall.h → include/syscall/riscv_syscall.h
diff --git a/src/syscall/syscall_time.h → include/syscall/syscall_time.h b/src/syscall/syscall_time.h → include/syscall/syscall_time.h
diff --git a/src/syscall/syscallviewer.h → include/syscall/syscallviewer.h b/src/syscall/syscallviewer.h → include/syscall/syscallviewer.h
diff --git a/src/syscall/systemio.h → include/syscall/systemio.h b/src/syscall/systemio.h → include/syscall/systemio.h
diff --git a/src/utilities/hexspinbox.h → include/utilities/hexspinbox.h b/src/utilities/hexspinbox.h → include/utilities/hexspinbox.h
diff --git a/src/utilities/scrolleventfilter.h → include/utilities/scrolleventfilter.h b/src/utilities/scrolleventfilter.h → include/utilities/scrolleventfilter.h
diff --git a/src/utilities/systemutils.h → include/utilities/systemutils.h b/src/utilities/systemutils.h → include/utilities/systemutils.h
diff --git a/include/version/gen_versionnumber.h b/include/version/gen_versionnumber.h
@@ -0,0 +1 @@
+#define RIPES_GIT_VERSION "N/A"
diff --git a/src/version/version.h → include/version/version.h b/src/version/version.h → include/version/version.h
diff --git a/main.cpp b/main.cpp
@@ -6,9 +6,9 @@
 #include <QTimer>
 #include <iostream>
 
-#include "src/cli/clioptions.h"
-#include "src/cli/clirunner.h"
-#include "src/mainwindow.h"
+#include "cli/clioptions.h"
+#include "cli/clirunner.h"
+#include "mainwindow.h"
 
 using namespace std;
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,42 +4,17 @@ function(check_nonempty_string STR)
     endif()
 endfunction()
 
-# Function to create sub-libraries for the Ripes library. A library is
-# built based on the *.h,*.cpp and *.ui within the immediate directory of
-# the CMakeLists.txt file. If LINK_TO_RIPES_LIB is set, the ${RIPES_LIB}
-# will be linked to the newly defined library.
-function(create_ripes_lib NAME)
-    cmake_parse_arguments(OPTIONS
-        "LINK_TO_RIPES_LIB;FIXED_NAME;EXCLUDE_SRC_INC" # options
-        ""                             # 1-valued keywords
-        ""                             # multi-valued keywords
-        ${ARGN})
-
-    file(GLOB LIB_SOURCES *.cpp)
-    file(GLOB LIB_HEADERS *.h)
-    file(GLOB LIB_UI *.ui)
-    if(NOT OPTIONS_FIXED_NAME)
-        check_nonempty_string(NAME)
-        set(LIB_NAME ${NAME}_lib)
-    else()
-        check_nonempty_string(OPTIONS_FIXED_NAME)
-        set(LIB_NAME ${NAME})
-    endif()
-
-    add_library(${LIB_NAME} STATIC ${LIB_SOURCES} ${LIB_HEADERS} ${LIB_UI})
-    target_compile_features(${LIB_NAME} PRIVATE cxx_std_17)
-    target_include_directories (${LIB_NAME} PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        )
-
-    target_link_libraries(${LIB_NAME} PUBLIC Qt5::Gui)
-    if(NOT OPTIONS_EXCLUDE_SRC_INC)
-        target_include_directories(${LIB_NAME} PUBLIC ${CMAKE_SOURCE_DIR}/src)
-    endif()
-
-    if(OPTIONS_LINK_TO_RIPES_LIB)
-        target_link_libraries(${RIPES_LIB} PUBLIC ${LIB_NAME})
-    endif()
+# Appends the .cpp and .ui files to the ripes library.
+function(add_ripes_sources NAME)
+    file(GLOB DIR_SOURCES *.cpp)
+    file(GLOB DIR_UI *.ui)
+
+    # Also pull in the includes from the correspoding directory in
+    # ${CMAKE_SOURCE_DIR}/include. This is a bit antithetical to CMake
+    # but is needed for Qt AUTOMOC to run.
+    file(RELATIVE_PATH CURRENT_DIR_PATH_RELATIVE ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR})
+    file(GLOB DIR_INCLUDES ${CMAKE_SOURCE_DIR}/include/${CURRENT_DIR_PATH_RELATIVE}/*.h)
+    target_sources(${RIPES_LIB} PUBLIC ${DIR_SOURCES} ${DIR_UI} ${DIR_INCLUDES})
 endfunction()
 
 # Error flags on everything but MSVC
@@ -52,10 +27,27 @@ elseif(MINGW)
 endif()
 
 # Create the parent library. This will include everything in the current directory.
-create_ripes_lib(${RIPES_LIB} FIXED_NAME EXCLUDE_SRC_INC)
+add_library(${RIPES_LIB} STATIC)
+target_include_directories(${RIPES_LIB} PUBLIC ${CMAKE_SOURCE_DIR}/include)
+add_ripes_sources(${RIPES_LIB})
+
+target_link_libraries(${RIPES_LIB} PUBLIC
+    fancytabbar_lib
+    ${VSRTL_GRAPHICS_LIB}
+    Qt5::Charts
+    dwarf++
+    Qt5::Gui)
+
+# Header-only library includes
+target_include_directories(${RIPES_LIB} PUBLIC
+    ${CMAKE_SOURCE_DIR}/external/VSRTL/external/cereal/include
+    ${CMAKE_SOURCE_DIR}/external/VSRTL/external
+    ${CMAKE_SOURCE_DIR}/external/ELFIO
+    ${CMAKE_SOURCE_DIR}/external/VSRTL/external/Signals
+    ${CMAKE_SOURCE_DIR}/external/libelfin_cmake
+    ${CMAKE_SOURCE_DIR}/external
+)
 
-# All of the following subdirectories will create separate libraries and link them into
-# ripes_lib
 add_subdirectory(isa)
 add_subdirectory(cachesim)
 add_subdirectory(editor)
@@ -66,11 +58,3 @@ add_subdirectory(utilities)
 add_subdirectory(processors)
 add_subdirectory(version)
 add_subdirectory(cli)
-
-# Also link Qt and VSRTL libraries.
-target_link_libraries(${RIPES_LIB} PUBLIC
-    fancytabbar_lib
-    ${VSRTL_GRAPHICS_LIB}
-    Qt5::Charts
-    dwarf++)
-
diff --git a/src/assembler/CMakeLists.txt b/src/assembler/CMakeLists.txt
@@ -1 +1 @@
-create_ripes_lib(assembler LINK_TO_RIPES_LIB)
+add_ripes_sources(assembler)
diff --git a/src/assembler/assemblerbase.cpp b/src/assembler/assemblerbase.cpp
@@ -1,6 +1,5 @@
-#include "assemblerbase.h"
-
-#include "parserutilities.h"
+#include "assembler/assemblerbase.h"
+#include "assembler/parserutilities.h"
 
 namespace Ripes {
 namespace Assembler {

diff --git a/src/assembler/expreval.cpp b/src/assembler/expreval.cpp
@@ -1,11 +1,11 @@
-#include "expreval.h"
+#include "assembler/expreval.h"
 
 #include <iostream>
 #include <memory>
 
-#include "assembler_defines.h"
+#include "assembler/assembler_defines.h"
+#include "assembler/parserutilities.h"
 #include "binutils.h"
-#include "parserutilities.h"
 
 namespace Ripes {
 namespace Assembler {
@@ -22,7 +22,7 @@ const QString s_exprTokens QStringLiteral("()+-*/%@");
 struct Expr;
 
 struct Printable {
-  virtual ~Printable(){};
+  virtual ~Printable() {}
   virtual void print(std::ostream &str) const = 0;
 };
 

diff --git a/src/assembler/gnudirectives.cpp b/src/assembler/gnudirectives.cpp
@@ -1,5 +1,5 @@
-#include "gnudirectives.h"
-#include "assembler.h"
+#include "assembler/gnudirectives.h"
+#include "assembler/assembler.h"
 
 namespace Ripes {
 namespace Assembler {

diff --git a/src/assembler/objdump.cpp b/src/assembler/objdump.cpp
@@ -1,6 +1,6 @@
-#include "objdump.h"
+#include "assembler/objdump.h"
 
-#include "../processorhandler.h"
+#include "processorhandler.h"
 #include <QDataStream>
 
 namespace Ripes {

diff --git a/src/assembler/parserutilities.cpp b/src/assembler/parserutilities.cpp
@@ -1,5 +1,4 @@
-#include "parserutilities.h"
-
+#include "assembler/parserutilities.h"
 #include "binutils.h"
 
 namespace Ripes {

diff --git a/src/assembler/program.cpp b/src/assembler/program.cpp
@@ -1,4 +1,4 @@
-#include "program.h"
+#include "assembler/program.h"
 
 #include "processorhandler.h"
 

diff --git a/src/assembler/rv32i_assembler.cpp b/src/assembler/rv32i_assembler.cpp
@@ -1,14 +1,14 @@
-#include "rv32i_assembler.h"
-#include "gnudirectives.h"
+#include "assembler/rv32i_assembler.h"
+#include "assembler/gnudirectives.h"
+#include "assembler/rvrelocations.h"
 #include "ripessettings.h"
-#include "rvrelocations.h"
 
 #include <QByteArray>
 #include <algorithm>
 
-#include "rv_c_ext.h"
-#include "rv_i_ext.h"
-#include "rv_m_ext.h"
+#include "assembler/rv_c_ext.h"
+#include "assembler/rv_i_ext.h"
+#include "assembler/rv_m_ext.h"
 
 namespace Ripes {
 namespace Assembler {

diff --git a/src/assembler/rv64i_assembler.cpp b/src/assembler/rv64i_assembler.cpp
@@ -1,16 +1,16 @@
-#include "rv64i_assembler.h"
-#include "gnudirectives.h"
+#include "assembler/rv64i_assembler.h"
+#include "assembler/gnudirectives.h"
+#include "assembler/rv32i_assembler.h"
+#include "assembler/rvassembler_common.h"
+#include "assembler/rvrelocations.h"
 #include "ripessettings.h"
-#include "rv32i_assembler.h"
-#include "rvassembler_common.h"
-#include "rvrelocations.h"
 
 #include <QByteArray>
 #include <algorithm>
 
-#include "rv_c_ext.h"
-#include "rv_i_ext.h"
-#include "rv_m_ext.h"
+#include "assembler/rv_c_ext.h"
+#include "assembler/rv_i_ext.h"
+#include "assembler/rv_m_ext.h"
 
 namespace Ripes {
 namespace Assembler {

diff --git a/src/assembler/symbolmap.cpp b/src/assembler/symbolmap.cpp
@@ -1,4 +1,4 @@
-#include "symbolmap.h"
+#include "assembler/symbolmap.h"
 
 namespace Ripes {
 namespace Assembler {

diff --git a/src/cachesim/CMakeLists.txt b/src/cachesim/CMakeLists.txt
@@ -1 +1 @@
-create_ripes_lib(cachesim LINK_TO_RIPES_LIB)
+add_ripes_sources(cachesim)