[CMake] Added build-presets.

[Sim] Removed extra function call.

[CMake] Fixed install. Fixed bundle install gems.

[CMake] Fixed new line.

Author: egorshamshura

CMakeLists.txt

@@ -2,6 +2,12 @@ cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
 
 project(protea)
 
+
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set_property(CACHE CMAKE_INSTALL_PREFIX
+               PROPERTY VALUE "${CMAKE_BINARY_DIR}/install")
+endif()
+
 find_package(Ruby 3.4.8 EXACT REQUIRED)
 
 include(cmake/Bundler.cmake)

CMakePresets.json

@@ -28,5 +28,17 @@
         "CMAKE_BUILD_TYPE": "Debug"
       }
     }
+  ],
+  "buildPresets": [
+    {
+      "name": "Default-Release",
+      "description": "Build Release configuration",
+      "configurePreset": "Default-Release"
+    },
+    {
+      "name": "Default-Debug",
+      "description": "Build Debug configuration",
+      "configurePreset": "Default-Debug"
+    }
   ]
 }

ci-extra/build.sh

@@ -5,4 +5,4 @@ cmake -S . \
   --preset "${PRESET_NAME}" -G Ninja
 
 # Build
-cmake --build "build/${PRESET_NAME}" -j
+cmake --build --preset ${PRESET_NAME} --target install --parallel 12

cmake/Bundler.cmake

@@ -2,6 +2,11 @@ if (NOT DEFINED BUNDLE_PATH)
   set(BUNDLE_PATH "bundle")
 endif()
 
+execute_process(
+  COMMAND ${BUNDLE_PATH} config set --local path ${CMAKE_BINARY_DIR}/bundle
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 execute_process(
   COMMAND ${BUNDLE_PATH} install
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

lib/CMakeLists.txt

@@ -6,3 +6,4 @@ add_custom_command(
   COMMENT "Running ${PROJECT_NAME}"
 )
 add_custom_target(${PROJECT_NAME} DEPENDS IR.yaml)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/IR.yaml DESTINATION share/)

sim_lib/base_jit.cc

@@ -37,7 +37,7 @@ void JitEngine::step(CPU &cpu) {
         if (isa::isTerminator(inst->m_opc)) {
           break;
         }
-        curAddr += getILen(inst->m_opc);
+        curAddr += sizeof(isa::Word);
       }
     } else if (bbIt->second.num_exec >= kExecThreshold) [[likely]] {
       auto code = translate(bbIt->second);