Move utility classes from common to own static lib

src/core/CMakeLists.txt

@@ -120,7 +120,7 @@ set(RECOMPILER_SRCS
 
 target_include_directories(core PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
 target_include_directories(core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
-target_link_libraries(core PUBLIC Threads::Threads common zlib)
+target_link_libraries(core PUBLIC Threads::Threads common util zlib)
 target_link_libraries(core PRIVATE glad stb xxhash imgui)
 
 if(WIN32)

src/core/analog_controller.cpp

@@ -1,10 +1,10 @@
 #include "analog_controller.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "common/string_util.h"
 #include "host_interface.h"
 #include "settings.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 #include <cmath>
 Log_SetChannel(AnalogController);
 

src/core/analog_joystick.cpp

@@ -1,9 +1,9 @@
 #include "analog_joystick.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "common/string_util.h"
 #include "host_interface.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 #include <cmath>
 Log_SetChannel(AnalogJoystick);
 

src/core/bus.cpp

@@ -4,7 +4,6 @@
 #include "common/assert.h"
 #include "common/log.h"
 #include "common/make_array.h"
-#include "common/state_wrapper.h"
 #include "cpu_code_cache.h"
 #include "cpu_core.h"
 #include "cpu_core_private.h"
@@ -18,6 +17,7 @@
 #include "sio.h"
 #include "spu.h"
 #include "timers.h"
+#include "util/state_wrapper.h"
 #include <cstdio>
 #include <tuple>
 #include <utility>

src/core/bus.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "common/bitfield.h"
-#include "common/memory_arena.h"
+#include "util/memory_arena.h"
 #include "types.h"
 #include <array>
 #include <bitset>

src/core/cdrom.cpp

@@ -1,15 +1,15 @@
 #include "cdrom.h"
 #include "common/align.h"
-#include "common/cd_image.h"
 #include "common/log.h"
 #include "common/platform.h"
-#include "common/state_wrapper.h"
 #include "dma.h"
 #include "imgui.h"
 #include "interrupt_controller.h"
 #include "settings.h"
 #include "spu.h"
 #include "system.h"
+#include "util/cd_image.h"
+#include "util/state_wrapper.h"
 #include <cmath>
 Log_SetChannel(CDROM);
 

src/core/cdrom.h

@@ -1,11 +1,11 @@
 #pragma once
 #include "cdrom_async_reader.h"
 #include "common/bitfield.h"
-#include "common/cd_image.h"
-#include "common/cd_xa.h"
 #include "common/fifo_queue.h"
 #include "common/heap_array.h"
 #include "types.h"
+#include "util/cd_image.h"
+#include "util/cd_xa.h"
 #include <array>
 #include <string>
 #include <string_view>

src/core/cdrom_async_reader.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "common/cd_image.h"
+#include "util/cd_image.h"
 #include "types.h"
 #include <array>
 #include <atomic>

src/core/cheevos.cpp

@@ -1,13 +1,11 @@
 #include "cheevos.h"
 #include "common/assert.h"
-#include "common/cd_image.h"
 #include "common/file_system.h"
 #include "common/http_downloader.h"
 #include "common/log.h"
 #include "common/md5_digest.h"
 #include "common/path.h"
 #include "common/platform.h"
-#include "common/state_wrapper.h"
 #include "common/string_util.h"
 #include "core/bios.h"
 #include "core/bus.h"
@@ -20,6 +18,8 @@
 #include "rc_url.h"
 #include "rcheevos.h"
 #include "scmversion/scmversion.h"
+#include "util/cd_image.h"
+#include "util/state_wrapper.h"
 #include <algorithm>
 #include <cstdarg>
 #include <cstdlib>

src/core/controller.cpp

@@ -1,11 +1,11 @@
 #include "controller.h"
 #include "analog_controller.h"
 #include "analog_joystick.h"
-#include "common/state_wrapper.h"
 #include "digital_controller.h"
 #include "namco_guncon.h"
 #include "negcon.h"
 #include "playstation_mouse.h"
+#include "util/state_wrapper.h"
 
 Controller::Controller() = default;
 

src/core/core.props

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\common\common.props" />
+  <Import Project="..\util\util.props" />
 
   <ItemDefinitionGroup>
     <ClCompile>
@@ -19,7 +19,7 @@
 
   <ItemDefinitionGroup>
     <Lib>
-      <AdditionalDependencies>$(RootBuildDir)rcheevos\rcheevos.lib;$(RootBuildDir)imgui\imgui.lib;$(RootBuildDir)stb\stb.lib;$(RootBuildDir)xxhash\xxhash.lib;$(RootBuildDir)zlib\zlib.lib;$(RootBuildDir)common\common.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(RootBuildDir)rcheevos\rcheevos.lib;$(RootBuildDir)imgui\imgui.lib;$(RootBuildDir)stb\stb.lib;$(RootBuildDir)xxhash\xxhash.lib;$(RootBuildDir)zlib\zlib.lib;$(RootBuildDir)util\util.lib;$(RootBuildDir)common\common.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies Condition="('$(BuildingForUWP)'!='true' And '$(Platform)'!='ARM64')">$(RootBuildDir)rainterface\rainterface.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies Condition="'$(Platform)'=='ARM64'">$(RootBuildDir)vixl\vixl.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>

src/core/cpu_code_cache.h

@@ -1,9 +1,9 @@
 #pragma once
 #include "bus.h"
 #include "common/bitfield.h"
-#include "common/jit_code_buffer.h"
-#include "common/page_fault_handler.h"
 #include "cpu_types.h"
+#include "util/jit_code_buffer.h"
+#include "util/page_fault_handler.h"
 #include <array>
 #include <map>
 #include <memory>
@@ -97,10 +97,7 @@ struct CodeBlock
   const u32 GetPC() const { return key.GetPC(); }
   const u32 GetSizeInBytes() const { return static_cast<u32>(instructions.size()) * sizeof(Instruction); }
   const u32 GetStartPageIndex() const { return (key.GetPCPhysicalAddress() / HOST_PAGE_SIZE); }
-  const u32 GetEndPageIndex() const
-  {
-    return ((key.GetPCPhysicalAddress() + GetSizeInBytes()) / HOST_PAGE_SIZE);
-  }
+  const u32 GetEndPageIndex() const { return ((key.GetPCPhysicalAddress() + GetSizeInBytes()) / HOST_PAGE_SIZE); }
   bool IsInRAM() const
   {
     // TODO: Constant
@@ -125,7 +122,7 @@ void Execute();
 
 #ifdef WITH_RECOMPILER
 using DispatcherFunction = void (*)();
-using SingleBlockDispatcherFunction = void(*)(const CodeBlock::HostCodePointer);
+using SingleBlockDispatcherFunction = void (*)(const CodeBlock::HostCodePointer);
 
 FastMapTable* GetFastMapPointer();
 void ExecuteRecompiler();

src/core/cpu_core.cpp

@@ -3,7 +3,6 @@
 #include "common/align.h"
 #include "common/file_system.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "cpu_core_private.h"
 #include "cpu_disasm.h"
 #include "cpu_recompiler_thunks.h"
@@ -13,6 +12,7 @@
 #include "settings.h"
 #include "system.h"
 #include "timing_event.h"
+#include "util/state_wrapper.h"
 #include <cstdio>
 
 Log_SetChannel(CPU::Core);

src/core/cpu_recompiler_code_generator.h

@@ -4,7 +4,7 @@
 #include <utility>
 #include <vector>
 
-#include "common/jit_code_buffer.h"
+#include "util/jit_code_buffer.h"
 
 #include "cpu_code_cache.h"
 #include "cpu_recompiler_register_cache.h"

src/core/digital_controller.cpp

@@ -1,8 +1,8 @@
 #include "digital_controller.h"
 #include "common/assert.h"
-#include "common/state_wrapper.h"
 #include "host_interface.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 
 DigitalController::DigitalController() = default;
 

src/core/dma.cpp

@@ -2,7 +2,6 @@
 #include "bus.h"
 #include "cdrom.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "common/string_util.h"
 #include "cpu_code_cache.h"
 #include "cpu_core.h"
@@ -13,6 +12,7 @@
 #include "pad.h"
 #include "spu.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(DMA);
 
 static u32 GetAddressMask()

src/core/gpu.cpp

@@ -2,7 +2,6 @@
 #include "common/file_system.h"
 #include "common/heap_array.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "common/string_util.h"
 #include "dma.h"
 #include "host_display.h"
@@ -13,6 +12,7 @@
 #include "stb_image_write.h"
 #include "system.h"
 #include "timers.h"
+#include "util/state_wrapper.h"
 #include <cmath>
 Log_SetChannel(GPU);
 

src/core/gpu_backend.cpp

@@ -1,9 +1,9 @@
 #include "gpu_backend.h"
 #include "common/align.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "common/timer.h"
 #include "settings.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(GPUBackend);
 
 std::unique_ptr<GPUBackend> g_gpu_backend;

src/core/gpu_hw.cpp

@@ -2,13 +2,13 @@
 #include "common/align.h"
 #include "common/assert.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "cpu_core.h"
 #include "gpu_sw_backend.h"
 #include "imgui.h"
 #include "pgxp.h"
 #include "settings.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 #include <cmath>
 #include <sstream>
 #include <tuple>

src/core/gpu_hw_d3d11.cpp

@@ -2,7 +2,6 @@
 #include "common/assert.h"
 #include "common/d3d11/shader_compiler.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "common/timer.h"
 #include "gpu_hw_shadergen.h"
 #include "gpu_sw_backend.h"
@@ -10,6 +9,7 @@
 #include "host_interface.h"
 #include "shader_cache_version.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(GPU_HW_D3D11);
 
 GPU_HW_D3D11::GPU_HW_D3D11() = default;

src/core/gpu_hw_opengl.cpp

@@ -1,13 +1,13 @@
 #include "gpu_hw_opengl.h"
 #include "common/assert.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "common/timer.h"
 #include "gpu_hw_shadergen.h"
 #include "host_display.h"
 #include "shader_cache_version.h"
 #include "system.h"
 #include "texture_replacements.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(GPU_HW_OpenGL);
 
 GPU_HW_OpenGL::GPU_HW_OpenGL() : GPU_HW() {}

src/core/gpu_hw_vulkan.cpp

@@ -2,7 +2,6 @@
 #include "common/assert.h"
 #include "common/log.h"
 #include "common/scope_guard.h"
-#include "common/state_wrapper.h"
 #include "common/timer.h"
 #include "common/vulkan/builders.h"
 #include "common/vulkan/context.h"
@@ -12,6 +11,7 @@
 #include "host_display.h"
 #include "host_interface.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(GPU_HW_Vulkan);
 
 GPU_HW_Vulkan::GPU_HW_Vulkan() = default;

src/core/gte.cpp

@@ -1,7 +1,7 @@
 #include "gte.h"
 #include "common/assert.h"
 #include "common/bitutils.h"
-#include "common/state_wrapper.h"
+#include "util/state_wrapper.h"
 #include "cpu_core.h"
 #include "cpu_core_private.h"
 #include "host_display.h"

src/core/host_interface.cpp

@@ -1,7 +1,6 @@
 #include "host_interface.h"
 #include "bios.h"
 #include "cdrom.h"
-#include "common/audio_stream.h"
 #include "common/byte_stream.h"
 #include "common/file_system.h"
 #include "common/image.h"
@@ -21,6 +20,7 @@
 #include "spu.h"
 #include "system.h"
 #include "texture_replacements.h"
+#include "util/audio_stream.h"
 #include <cmath>
 #include <cstring>
 #include <cwchar>

src/core/interrupt_controller.cpp

@@ -1,7 +1,7 @@
 #include "interrupt_controller.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "cpu_core.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(InterruptController);
 
 InterruptController g_interrupt_controller;

src/core/mdec.cpp

@@ -1,11 +1,11 @@
 #include "mdec.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "cpu_core.h"
 #include "dma.h"
 #include "imgui.h"
 #include "interrupt_controller.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(MDEC);
 
 MDEC g_mdec;

src/core/memory_card.cpp

@@ -2,10 +2,10 @@
 #include "common/byte_stream.h"
 #include "common/file_system.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "common/string_util.h"
 #include "host_interface.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 #include <cstdio>
 Log_SetChannel(MemoryCard);
 

src/core/memory_card_image.cpp

@@ -3,11 +3,11 @@
 #include "common/file_system.h"
 #include "common/log.h"
 #include "common/path.h"
-#include "common/shiftjis.h"
-#include "common/state_wrapper.h"
 #include "common/string_util.h"
 #include "host_interface.h"
 #include "system.h"
+#include "util/shiftjis.h"
+#include "util/state_wrapper.h"
 #include <algorithm>
 #include <cstdio>
 #include <optional>

src/core/multitap.cpp

@@ -1,10 +1,10 @@
 #include "multitap.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "common/types.h"
 #include "controller.h"
 #include "memory_card.h"
 #include "pad.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(Multitap);
 
 Multitap::Multitap()

src/core/multitap.h

@@ -1,8 +1,8 @@
 #pragma once
-#include "common/state_wrapper.h"
 #include "common/types.h"
 #include "controller.h"
 #include "memory_card.h"
+#include "util/state_wrapper.h"
 #include <array>
 
 class Multitap final

src/core/namco_guncon.cpp

@@ -1,12 +1,12 @@
 #include "namco_guncon.h"
 #include "common/assert.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "gpu.h"
 #include "host_display.h"
 #include "host_interface.h"
 #include "resources.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 #include <array>
 Log_SetChannel(NamcoGunCon);
 

src/core/negcon.cpp

@@ -1,8 +1,8 @@
 #include "negcon.h"
 #include "common/assert.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "host_interface.h"
+#include "util/state_wrapper.h"
 #include <array>
 #include <cmath>
 

src/core/pad.cpp

@@ -1,12 +1,12 @@
 #include "pad.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "controller.h"
 #include "host_interface.h"
 #include "interrupt_controller.h"
 #include "memory_card.h"
 #include "multitap.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(Pad);
 
 Pad g_pad;

src/core/playstation_mouse.cpp

@@ -1,11 +1,11 @@
 #include "playstation_mouse.h"
 #include "common/assert.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "gpu.h"
 #include "host_display.h"
 #include "host_interface.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 #include <array>
 Log_SetChannel(PlayStationMouse);
 

src/core/sio.cpp

@@ -1,10 +1,10 @@
 #include "sio.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "controller.h"
 #include "host_interface.h"
 #include "interrupt_controller.h"
 #include "memory_card.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(SIO);
 
 SIO g_sio;

src/core/spu.cpp

@@ -1,15 +1,15 @@
 #include "spu.h"
 #include "cdrom.h"
-#include "common/audio_stream.h"
 #include "common/file_system.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
-#include "common/wav_writer.h"
 #include "dma.h"
 #include "host_interface.h"
 #include "imgui.h"
 #include "interrupt_controller.h"
 #include "system.h"
+#include "util/audio_stream.h"
+#include "util/state_wrapper.h"
+#include "util/wav_writer.h"
 Log_SetChannel(SPU);
 
 SPU g_spu;

src/core/system.cpp

@@ -3,14 +3,11 @@
 #include "bus.h"
 #include "cdrom.h"
 #include "cheats.h"
-#include "common/audio_stream.h"
 #include "common/error.h"
 #include "common/file_system.h"
-#include "common/iso_reader.h"
 #include "common/log.h"
 #include "common/make_array.h"
 #include "common/path.h"
-#include "common/state_wrapper.h"
 #include "common/string_util.h"
 #include "controller.h"
 #include "cpu_code_cache.h"
@@ -34,6 +31,9 @@
 #include "spu.h"
 #include "texture_replacements.h"
 #include "timers.h"
+#include "util/audio_stream.h"
+#include "util/iso_reader.h"
+#include "util/state_wrapper.h"
 #include "xxhash.h"
 #include <cctype>
 #include <cinttypes>

src/core/timers.cpp

@@ -1,10 +1,10 @@
 #include "timers.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "gpu.h"
 #include "imgui.h"
 #include "interrupt_controller.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(Timers);
 
 Timers g_timers;

src/core/timing_event.cpp

@@ -1,10 +1,10 @@
 #include "timing_event.h"
 #include "common/assert.h"
 #include "common/log.h"
-#include "common/state_wrapper.h"
 #include "cpu_core.h"
 #include "cpu_core_private.h"
 #include "system.h"
+#include "util/state_wrapper.h"
 Log_SetChannel(TimingEvents);
 
 namespace TimingEvents {