moved hw and hle code to guest

CMakeLists.txt

@@ -158,8 +158,6 @@ endif()
 #--------------------------------------------------
 
 set(REDREAM_SOURCES
-  src/bios/bios.c
-  src/bios/flash.c
   src/core/assert.c
   src/core/exception_handler.c
   src/core/filesystem.c
@@ -174,29 +172,35 @@ set(REDREAM_SOURCES
   src/core/rb_tree.c
   src/core/sort.c
   src/core/string.c
+  src/guest/aica/aica.c
+  src/guest/arm7/arm7.c
+  src/guest/bios/bios.c
+  src/guest/bios/flash.c
+  src/guest/gdrom/cdi.c
+  src/guest/gdrom/disc.c
+  src/guest/gdrom/gdi.c
+  src/guest/gdrom/gdrom.c
+  src/guest/holly/holly.c
+  src/guest/maple/controller.c
+  src/guest/maple/maple.c
+  src/guest/maple/vmu.c
+  src/guest/pvr/pvr.c
+  src/guest/pvr/ta.c
+  src/guest/pvr/tr.c
+  src/guest/pvr/trace.c
+  src/guest/rom/boot.c
+  src/guest/rom/flash.c
+  src/guest/sh4/sh4.c
+  src/guest/sh4/sh4_ccn.c
+  src/guest/sh4/sh4_dbg.c
+  src/guest/sh4/sh4_dmac.c
+  src/guest/sh4/sh4_intc.c
+  src/guest/sh4/sh4_tmu.c
+  src/guest/debugger.c
+  src/guest/dreamcast.c
+  src/guest/memory.c
+  src/guest/scheduler.c
   src/host/keycode.c
-  src/hw/aica/aica.c
-  src/hw/arm7/arm7.c
-  src/hw/gdrom/cdi.c
-  src/hw/gdrom/disc.c
-  src/hw/gdrom/gdi.c
-  src/hw/gdrom/gdrom.c
-  src/hw/holly/holly.c
-  src/hw/maple/controller.c
-  src/hw/maple/maple.c
-  src/hw/maple/vmu.c
-  src/hw/pvr/pvr.c
-  src/hw/pvr/ta.c
-  src/hw/pvr/tr.c
-  src/hw/pvr/trace.c
-  src/hw/rom/boot.c
-  src/hw/rom/flash.c
-  src/hw/sh4/sh4.c
-  src/hw/sh4/sh4_ccn.c
-  src/hw/sh4/sh4_dbg.c
-  src/hw/sh4/sh4_dmac.c
-  src/hw/sh4/sh4_intc.c
-  src/hw/sh4/sh4_tmu.c
   src/jit/backend/interp/interp_backend.c
   src/jit/frontend/armv3/armv3_context.c
   src/jit/frontend/armv3/armv3_disasm.c
@@ -221,11 +225,7 @@ set(REDREAM_SOURCES
   src/render/gl_backend.c
   src/render/imgui.cc
   src/render/microprofile.cc
-  src/debugger.c
-  src/dreamcast.c
   src/emulator.c
-  src/memory.c
-  src/scheduler.c
   src/tracer.c
 )
 

src/emulator.c

@@ -12,28 +12,28 @@
  */
 
 #include "emulator.h"
-#include "bios/bios.h"
 #include "core/option.h"
 #include "core/profiler.h"
 #include "core/thread.h"
 #include "core/time.h"
-#include "dreamcast.h"
+#include "guest/aica/aica.h"
+#include "guest/arm7/arm7.h"
+#include "guest/bios/bios.h"
+#include "guest/dreamcast.h"
+#include "guest/gdrom/gdrom.h"
+#include "guest/holly/holly.h"
+#include "guest/maple/maple.h"
+#include "guest/memory.h"
+#include "guest/pvr/pvr.h"
+#include "guest/pvr/ta.h"
+#include "guest/pvr/tr.h"
+#include "guest/pvr/trace.h"
+#include "guest/scheduler.h"
+#include "guest/sh4/sh4.h"
 #include "host/host.h"
-#include "hw/aica/aica.h"
-#include "hw/arm7/arm7.h"
-#include "hw/gdrom/gdrom.h"
-#include "hw/holly/holly.h"
-#include "hw/maple/maple.h"
-#include "hw/pvr/pvr.h"
-#include "hw/pvr/ta.h"
-#include "hw/pvr/tr.h"
-#include "hw/pvr/trace.h"
-#include "hw/sh4/sh4.h"
-#include "memory.h"
 #include "render/imgui.h"
 #include "render/microprofile.h"
 #include "render/render_backend.h"
-#include "scheduler.h"
 
 DEFINE_AGGREGATE_COUNTER(frames);
 

src/guest/aica/aica.c

@@ -1,17 +1,17 @@
-#include "hw/aica/aica.h"
+#include "guest/aica/aica.h"
 #include "core/filesystem.h"
 #include "core/log.h"
 #include "core/math.h"
 #include "core/option.h"
 #include "core/profiler.h"
-#include "dreamcast.h"
-#include "hw/aica/aica_types.h"
-#include "hw/arm7/arm7.h"
-#include "hw/holly/holly.h"
-#include "hw/sh4/sh4.h"
-#include "memory.h"
+#include "guest/aica/aica_types.h"
+#include "guest/arm7/arm7.h"
+#include "guest/dreamcast.h"
+#include "guest/holly/holly.h"
+#include "guest/memory.h"
+#include "guest/scheduler.h"
+#include "guest/sh4/sh4.h"
 #include "render/imgui.h"
-#include "scheduler.h"
 
 DEFINE_AGGREGATE_COUNTER(aica_samples);
 

src/guest/aica/aica.h

@@ -1,7 +1,7 @@
 #ifndef AICA_H
 #define AICA_H
 
-#include "memory.h"
+#include "guest/memory.h"
 
 struct aica;
 struct dreamcast;

src/guest/arm7/arm7.c

@@ -1,14 +1,14 @@
-#include "hw/arm7/arm7.h"
+#include "guest/arm7/arm7.h"
 #include "core/log.h"
-#include "dreamcast.h"
-#include "hw/aica/aica.h"
+#include "guest/aica/aica.h"
+#include "guest/dreamcast.h"
+#include "guest/scheduler.h"
 #include "jit/frontend/armv3/armv3_context.h"
 #include "jit/frontend/armv3/armv3_fallback.h"
 #include "jit/frontend/armv3/armv3_frontend.h"
 #include "jit/frontend/armv3/armv3_guest.h"
 #include "jit/ir/ir.h"
 #include "jit/jit.h"
-#include "scheduler.h"
 
 #if ARCH_X64
 #include "jit/backend/x64/x64_backend.h"

src/guest/arm7/arm7.h

@@ -2,7 +2,7 @@
 #define ARM7_H
 
 #include "core/profiler.h"
-#include "memory.h"
+#include "guest/memory.h"
 
 struct arm7;
 struct dreamcast;

src/guest/bios/bios.c

@@ -1,11 +1,11 @@
 #include <time.h>
-#include "bios/bios.h"
-#include "bios/flash.h"
+#include "guest/bios/bios.h"
 #include "core/math.h"
 #include "core/option.h"
-#include "dreamcast.h"
-#include "hw/aica/aica.h"
-#include "hw/rom/flash.h"
+#include "guest/aica/aica.h"
+#include "guest/bios/flash.h"
+#include "guest/dreamcast.h"
+#include "guest/rom/flash.h"
 #include "render/imgui.h"
 
 DEFINE_OPTION_STRING(region, "america", "System region");

src/guest/bios/flash.c

@@ -2,9 +2,9 @@
  * high-level code for working with the system's flash memory
  */
 
-#include "bios/flash.h"
+#include "guest/bios/flash.h"
 #include "core/math.h"
-#include "hw/rom/flash.h"
+#include "guest/rom/flash.h"
 
 #define FLASH_BLOCK_SIZE 0x40
 

src/guest/bios/flash.h

@@ -1,7 +1,7 @@
 #ifndef FLASH_H
 #define FLASH_H
 
-#include "bios/flash_types.h"
+#include "guest/bios/flash_types.h"
 
 struct flash;
 

src/guest/debugger.c

@@ -3,8 +3,8 @@
 #include "gdb/gdb_server.h"
 
 #include "core/log.h"
-#include "debugger.h"
-#include "dreamcast.h"
+#include "guest/debugger.h"
+#include "guest/dreamcast.h"
 
 struct debugger {
   struct dreamcast *dc;

src/guest/dreamcast.c

@@ -1,20 +1,20 @@
-#include "dreamcast.h"
-#include "bios/bios.h"
+#include "guest/dreamcast.h"
 #include "core/option.h"
 #include "core/string.h"
-#include "debugger.h"
-#include "hw/aica/aica.h"
-#include "hw/arm7/arm7.h"
-#include "hw/gdrom/gdrom.h"
-#include "hw/holly/holly.h"
-#include "hw/maple/maple.h"
-#include "hw/pvr/pvr.h"
-#include "hw/pvr/ta.h"
-#include "hw/rom/boot.h"
-#include "hw/rom/flash.h"
-#include "hw/sh4/sh4.h"
-#include "memory.h"
-#include "scheduler.h"
+#include "guest/aica/aica.h"
+#include "guest/arm7/arm7.h"
+#include "guest/bios/bios.h"
+#include "guest/debugger.h"
+#include "guest/gdrom/gdrom.h"
+#include "guest/holly/holly.h"
+#include "guest/maple/maple.h"
+#include "guest/memory.h"
+#include "guest/pvr/pvr.h"
+#include "guest/pvr/ta.h"
+#include "guest/rom/boot.h"
+#include "guest/rom/flash.h"
+#include "guest/scheduler.h"
+#include "guest/sh4/sh4.h"
 
 void dc_poll_input(struct dreamcast *dc) {
   if (!dc->poll_input) {

src/guest/dreamcast.h

@@ -4,8 +4,8 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "core/list.h"
+#include "guest/memory.h"
 #include "host/keycode.h"
-#include "memory.h"
 
 struct aica;
 struct arm7;

src/guest/gdrom/cdi.c

@@ -1,6 +1,6 @@
 #include "core/assert.h"
-#include "hw/gdrom/disc.h"
-#include "hw/gdrom/gdrom_types.h"
+#include "guest/gdrom/disc.h"
+#include "guest/gdrom/gdrom_types.h"
 
 #define CDI_V2 0x80000004
 #define CDI_V3 0x80000005

src/guest/gdrom/disc.c

@@ -1,7 +1,7 @@
-#include "hw/gdrom/disc.h"
+#include "guest/gdrom/disc.h"
 #include "core/string.h"
-#include "hw/gdrom/cdi.h"
-#include "hw/gdrom/gdi.h"
+#include "guest/gdrom/cdi.h"
+#include "guest/gdrom/gdi.h"
 
 struct track *disc_lookup_track(struct disc *disc, int fad) {
   int num_tracks = disc_get_num_tracks(disc);

src/guest/gdrom/disc.h

@@ -2,7 +2,7 @@
 #define DISC_H
 
 #include "core/filesystem.h"
-#include "hw/gdrom/gdrom_types.h"
+#include "guest/gdrom/gdrom_types.h"
 
 #define DISC_MAX_SECTOR_SIZE 2352
 #define DISC_MAX_SESSIONS 2

src/guest/gdrom/gdi.c

@@ -1,6 +1,6 @@
-#include "hw/gdrom/gdi.h"
+#include "guest/gdrom/gdi.h"
 #include "core/assert.h"
-#include "hw/gdrom/disc.h"
+#include "guest/gdrom/disc.h"
 
 struct gdi {
   struct disc;

src/guest/gdrom/gdrom.c

@@ -1,10 +1,10 @@
-#include "hw/gdrom/gdrom.h"
+#include "guest/gdrom/gdrom.h"
 #include "core/math.h"
 #include "core/string.h"
-#include "dreamcast.h"
-#include "hw/gdrom/gdrom_replies.inc"
-#include "hw/gdrom/gdrom_types.h"
-#include "hw/holly/holly.h"
+#include "guest/dreamcast.h"
+#include "guest/gdrom/gdrom_replies.inc"
+#include "guest/gdrom/gdrom_types.h"
+#include "guest/holly/holly.h"
 
 #if 0
 #define LOG_GDROM LOG_INFO

src/guest/gdrom/gdrom.h

@@ -1,8 +1,8 @@
 #ifndef GDROM_H
 #define GDROM_H
 
-#include "hw/gdrom/disc.h"
-#include "hw/gdrom/gdrom_types.h"
+#include "guest/gdrom/disc.h"
+#include "guest/gdrom/gdrom_types.h"
 
 struct dreamcast;
 struct gdrom;

src/guest/holly/holly.c

@@ -1,10 +1,10 @@
-#include "hw/holly/holly.h"
-#include "dreamcast.h"
-#include "hw/gdrom/gdrom.h"
-#include "hw/maple/maple.h"
-#include "hw/sh4/sh4.h"
+#include "guest/holly/holly.h"
+#include "guest/dreamcast.h"
+#include "guest/gdrom/gdrom.h"
+#include "guest/maple/maple.h"
+#include "guest/scheduler.h"
+#include "guest/sh4/sh4.h"
 #include "render/imgui.h"
-#include "scheduler.h"
 
 struct reg_cb holly_cb[NUM_HOLLY_REGS];
 
@@ -363,7 +363,7 @@ struct holly *holly_create(struct dreamcast *dc) {
 #define HOLLY_REG(addr, name, default, type) \
   hl->reg[name] = default;                   \
   hl->name = (type *)&hl->reg[name];
-#include "hw/holly/holly_regs.inc"
+#include "guest/holly/holly_regs.inc"
 #undef HOLLY_REG
 
   return hl;

src/guest/holly/holly.h

@@ -1,9 +1,9 @@
 #ifndef HOLLY_H
 #define HOLLY_H
 
-#include "dreamcast.h"
-#include "hw/holly/holly_types.h"
-#include "memory.h"
+#include "guest/dreamcast.h"
+#include "guest/holly/holly_types.h"
+#include "guest/memory.h"
 
 struct gdrom;
 struct maple;
@@ -14,7 +14,7 @@ struct holly {
   uint32_t reg[NUM_HOLLY_REGS];
 
 #define HOLLY_REG(offset, name, default, type) type *name;
-#include "hw/holly/holly_regs.inc"
+#include "guest/holly/holly_regs.inc"
 #undef HOLLY_REG
 
   /* debug */

src/guest/holly/holly_types.h

@@ -6,7 +6,7 @@
 /* registers */
 enum {
 #define HOLLY_REG(addr, name, flags, default) name = (addr - 0x005f0000) >> 2,
-#include "hw/holly/holly_regs.inc"
+#include "guest/holly/holly_regs.inc"
 #undef HOLLY_REG
   NUM_HOLLY_REGS = 0x00008000 >> 2,
 };

src/guest/maple/controller.c

@@ -1,7 +1,7 @@
 #include "core/option.h"
 #include "core/string.h"
-#include "dreamcast.h"
-#include "hw/maple/maple.h"
+#include "guest/dreamcast.h"
+#include "guest/maple/maple.h"
 
 enum {
   CONT_C,

src/guest/maple/maple.c

@@ -1,7 +1,7 @@
-#include "hw/maple/maple.h"
-#include "dreamcast.h"
-#include "hw/holly/holly.h"
-#include "hw/sh4/sh4.h"
+#include "guest/maple/maple.h"
+#include "guest/dreamcast.h"
+#include "guest/holly/holly.h"
+#include "guest/sh4/sh4.h"
 
 struct maple {
   struct device;

src/guest/maple/maple.h

@@ -1,7 +1,7 @@
 #ifndef MAPLE_H
 #define MAPLE_H
 
-#include "hw/maple/maple_types.h"
+#include "guest/maple/maple_types.h"
 
 struct dreamcast;
 struct maple;

src/guest/maple/vmu.c

@@ -1,8 +1,8 @@
 #include "core/assert.h"
 #include "core/filesystem.h"
 #include "core/string.h"
-#include "hw/maple/maple.h"
-#include "hw/maple/vmu_default.inc"
+#include "guest/maple/maple.h"
+#include "guest/maple/vmu_default.inc"
 
 #define VMU_BLOCK_SIZE 512
 #define VMU_BLOCK_WORDS (512 >> 2)

src/guest/memory.c

@@ -1,8 +1,8 @@
-#include "memory.h"
+#include "guest/memory.h"
 #include "core/exception_handler.h"
 #include "core/math.h"
 #include "core/string.h"
-#include "dreamcast.h"
+#include "guest/dreamcast.h"
 
 /*
  * address maps

src/guest/pvr/pvr.c

@@ -1,10 +1,10 @@
-#include "hw/pvr/pvr.h"
+#include "guest/pvr/pvr.h"
 #include "core/time.h"
-#include "dreamcast.h"
-#include "hw/holly/holly.h"
-#include "hw/pvr/ta.h"
-#include "hw/sh4/sh4.h"
-#include "scheduler.h"
+#include "guest/dreamcast.h"
+#include "guest/holly/holly.h"
+#include "guest/pvr/ta.h"
+#include "guest/scheduler.h"
+#include "guest/sh4/sh4.h"
 
 DEFINE_AGGREGATE_COUNTER(pvr_vblanks);
 DEFINE_AGGREGATE_COUNTER(pvr_vram_data);
@@ -219,7 +219,7 @@ static int pvr_init(struct device *dev) {
 #define PVR_REG(offset, name, default, type) \
   pvr->reg[name] = default;                  \
   pvr->name = (type *)&pvr->reg[name];
-#include "hw/pvr/pvr_regs.inc"
+#include "guest/pvr/pvr_regs.inc"
 #undef PVR_REG
 
   pvr->palette_ram = (uint8_t *)pvr->PALETTE_RAM000;

src/guest/pvr/pvr.h

@@ -2,9 +2,9 @@
 #define PVR_H
 
 #include "core/profiler.h"
-#include "dreamcast.h"
-#include "hw/pvr/pvr_types.h"
-#include "memory.h"
+#include "guest/dreamcast.h"
+#include "guest/memory.h"
+#include "guest/pvr/pvr_types.h"
 
 struct dreamcast;
 struct holly;
@@ -22,7 +22,7 @@ struct pvr {
   uint32_t current_line;
 
 #define PVR_REG(offset, name, default, type) type *name;
-#include "hw/pvr/pvr_regs.inc"
+#include "guest/pvr/pvr_regs.inc"
 #undef PVR_REG
 };
 

src/guest/pvr/pvr_types.h

@@ -228,7 +228,7 @@ union ta_yuv_tex_cnt {
 enum {
 #define PVR_REG(addr, name, flags, default_value) \
   name = (addr - 0x005f8000) >> 2,
-#include "hw/pvr/pvr_regs.inc"
+#include "guest/pvr/pvr_regs.inc"
 #undef PVR_REG
   PVR_NUM_REGS = 0x00002000 >> 2,
 };

src/guest/pvr/ta.c

@@ -1,14 +1,14 @@
-#include "hw/pvr/ta.h"
+#include "guest/pvr/ta.h"
 #include "core/exception_handler.h"
 #include "core/filesystem.h"
 #include "core/list.h"
 #include "core/string.h"
-#include "hw/holly/holly.h"
-#include "hw/pvr/pixel_convert.h"
-#include "hw/pvr/pvr.h"
-#include "hw/pvr/tr.h"
-#include "hw/sh4/sh4.h"
-#include "scheduler.h"
+#include "guest/holly/holly.h"
+#include "guest/pvr/pixel_convert.h"
+#include "guest/pvr/pvr.h"
+#include "guest/pvr/tr.h"
+#include "guest/scheduler.h"
+#include "guest/sh4/sh4.h"
 
 DEFINE_AGGREGATE_COUNTER(ta_data);
 DEFINE_AGGREGATE_COUNTER(ta_renders);

src/guest/pvr/ta.h

@@ -2,8 +2,8 @@
 #define TA_H
 
 #include "core/profiler.h"
-#include "hw/pvr/ta_types.h"
-#include "memory.h"
+#include "guest/memory.h"
+#include "guest/pvr/ta_types.h"
 
 struct dreamcast;
 struct ta;

src/guest/pvr/tr.c

@@ -1,11 +1,11 @@
-#include "hw/pvr/tr.h"
+#include "guest/pvr/tr.h"
 #include "core/assert.h"
 #include "core/core.h"
 #include "core/math.h"
 #include "core/profiler.h"
 #include "core/sort.h"
-#include "hw/pvr/pixel_convert.h"
-#include "hw/pvr/ta.h"
+#include "guest/pvr/pixel_convert.h"
+#include "guest/pvr/ta.h"
 
 struct tr {
   struct render_backend *r;

src/guest/pvr/tr.h

@@ -5,7 +5,7 @@
    draw commands to be passed to the supplied render backend */
 
 #include "core/rb_tree.h"
-#include "hw/pvr/ta_types.h"
+#include "guest/pvr/ta_types.h"
 #include "render/render_backend.h"
 
 struct tr;

src/guest/pvr/trace.c

@@ -1,9 +1,9 @@
 #include <limits.h>
-#include "hw/pvr/trace.h"
+#include "guest/pvr/trace.h"
 #include "core/assert.h"
 #include "core/filesystem.h"
 #include "core/math.h"
-#include "hw/pvr/tr.h"
+#include "guest/pvr/tr.h"
 
 void get_next_trace_filename(char *filename, size_t size) {
   const char *appdir = fs_appdir();

src/guest/pvr/trace.h

@@ -2,7 +2,7 @@
 #define TRACE_H
 
 #include <stdio.h>
-#include "hw/pvr/ta_types.h"
+#include "guest/pvr/ta_types.h"
 
 enum trace_cmd_type {
   TRACE_CMD_NONE,

src/guest/rom/boot.c

@@ -1,8 +1,8 @@
-#include "hw/rom/boot.h"
+#include "guest/rom/boot.h"
 #include "core/filesystem.h"
 #include "core/md5.h"
 #include "core/option.h"
-#include "dreamcast.h"
+#include "guest/dreamcast.h"
 
 DEFINE_OPTION_STRING(bios, "dc_boot.bin", "Path to boot rom");
 
@@ -45,6 +45,7 @@ static int boot_load_rom(struct boot *boot) {
 
   FILE *fp = fopen(filename, "rb");
   if (!fp) {
+    LOG_WARNING("failed to open %s", filename);
     return 0;
   }
 
@@ -75,7 +76,6 @@ static int boot_init(struct device *dev) {
   struct boot *boot = (struct boot *)dev;
 
   if (!boot_load_rom(boot)) {
-    LOG_WARNING("failed to load boot rom");
     return 0;
   }
 

src/guest/rom/boot.h

@@ -1,7 +1,7 @@
 #ifndef BOOT_H
 #define BOOT_H
 
-#include "memory.h"
+#include "guest/memory.h"
 
 struct dreamcast;
 struct boot;

src/guest/rom/flash.c

@@ -1,8 +1,8 @@
 #include <stdio.h>
-#include "hw/rom/flash.h"
+#include "guest/rom/flash.h"
 #include "core/filesystem.h"
 #include "core/option.h"
-#include "dreamcast.h"
+#include "guest/dreamcast.h"
 
 #define FLASH_SIZE 0x00020000
 #define FLASH_SECTOR_SIZE 0x4000

src/guest/rom/flash.h

@@ -1,7 +1,7 @@
 #ifndef FLASHROM_H
 #define FLASHROM_H
 
-#include "memory.h"
+#include "guest/memory.h"
 
 struct dreamcast;
 struct flash;

src/guest/scheduler.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
-#include "scheduler.h"
+#include "guest/scheduler.h"
 #include "core/assert.h"
 #include "core/core.h"
 #include "core/list.h"
-#include "dreamcast.h"
+#include "guest/dreamcast.h"
 
 #define MAX_TIMERS 128
 

src/guest/sh4/sh4.c

@@ -1,21 +1,21 @@
-#include "hw/sh4/sh4.h"
+#include "guest/sh4/sh4.h"
 #include "core/math.h"
 #include "core/string.h"
 #include "core/time.h"
-#include "dreamcast.h"
-#include "hw/aica/aica.h"
-#include "hw/holly/holly.h"
-#include "hw/pvr/pvr.h"
-#include "hw/pvr/ta.h"
-#include "hw/rom/boot.h"
-#include "hw/rom/flash.h"
+#include "guest/aica/aica.h"
+#include "guest/dreamcast.h"
+#include "guest/holly/holly.h"
+#include "guest/memory.h"
+#include "guest/pvr/pvr.h"
+#include "guest/pvr/ta.h"
+#include "guest/rom/boot.h"
+#include "guest/rom/flash.h"
+#include "guest/scheduler.h"
 #include "jit/frontend/sh4/sh4_fallback.h"
 #include "jit/frontend/sh4/sh4_frontend.h"
 #include "jit/frontend/sh4/sh4_guest.h"
 #include "jit/jit.h"
-#include "memory.h"
 #include "render/imgui.h"
-#include "scheduler.h"
 
 #if ARCH_X64
 #include "jit/backend/x64/x64_backend.h"
@@ -195,7 +195,7 @@ void sh4_reset(struct sh4 *sh4, uint32_t pc) {
 #define SH4_REG(addr, name, default, type) \
   sh4->reg[name] = default;                \
   sh4->name = (type *)&sh4->reg[name];
-#include "hw/sh4/sh4_regs.inc"
+#include "guest/sh4/sh4_regs.inc"
 #undef SH4_REG
 
   /* reset interrupts */

src/guest/sh4/sh4.h

@@ -2,11 +2,11 @@
 #define SH4_H
 
 #include "core/profiler.h"
-#include "dreamcast.h"
-#include "hw/sh4/sh4_types.h"
+#include "guest/dreamcast.h"
+#include "guest/memory.h"
+#include "guest/sh4/sh4_types.h"
 #include "jit/frontend/sh4/sh4_context.h"
 #include "jit/jit.h"
-#include "memory.h"
 
 struct dreamcast;
 struct jit;
@@ -42,7 +42,7 @@ struct sh4 {
   struct sh4_context ctx;
   uint32_t reg[NUM_SH4_REGS];
 #define SH4_REG(addr, name, default, type) type *name;
-#include "hw/sh4/sh4_regs.inc"
+#include "guest/sh4/sh4_regs.inc"
 #undef SH4_REG
 
   /* jit */

src/guest/sh4/sh4_ccn.c

@@ -1,4 +1,4 @@
-#include "hw/sh4/sh4.h"
+#include "guest/sh4/sh4.h"
 #include "jit/jit.h"
 
 /* with OIX, bit 25, rather than bit 13, determines which 4kb bank to use */

src/guest/sh4/sh4_dbg.c

@@ -1,5 +1,5 @@
-#include "debugger.h"
-#include "hw/sh4/sh4.h"
+#include "guest/debugger.h"
+#include "guest/sh4/sh4.h"
 #include "jit/frontend/sh4/sh4_disasm.h"
 #include "jit/frontend/sh4/sh4_fallback.h"
 

src/guest/sh4/sh4_dmac.c

@@ -1,4 +1,4 @@
-#include "hw/sh4/sh4.h"
+#include "guest/sh4/sh4.h"
 
 static void sh4_dmac_check(struct sh4 *sh4, int channel) {
   union chcr *chcr = NULL;

src/guest/sh4/sh4_intc.c

@@ -1,4 +1,4 @@
-#include "hw/sh4/sh4.h"
+#include "guest/sh4/sh4.h"
 
 struct sh4_interrupt_info {
   int intevt, default_priority, ipr, ipr_shift;
@@ -7,7 +7,7 @@ struct sh4_interrupt_info {
 static struct sh4_interrupt_info sh4_interrupts[NUM_SH_INTERRUPTS] = {
 #define SH4_INT(name, intevt, pri, ipr, ipr_shift) \
   {intevt, pri, ipr, ipr_shift},
-#include "hw/sh4/sh4_int.inc"
+#include "guest/sh4/sh4_int.inc"
 #undef SH4_INT
 };
 

src/guest/sh4/sh4_tmu.c

@@ -1,5 +1,5 @@
-#include "hw/sh4/sh4.h"
-#include "scheduler.h"
+#include "guest/scheduler.h"
+#include "guest/sh4/sh4.h"
 
 static const int64_t PERIPHERAL_CLOCK_FREQ = SH4_CLOCK_FREQ >> 2;
 static const int PERIPHERAL_SCALE[] = {2, 4, 6, 8, 10, 0, 0, 0};

src/guest/sh4/sh4_types.h

@@ -72,14 +72,14 @@ union dmaor {
 
 enum {
 #define SH4_REG(addr, name, default, type) name = SH4_REG_OFFSET(addr),
-#include "hw/sh4/sh4_regs.inc"
+#include "guest/sh4/sh4_regs.inc"
 #undef SH4_REG
   NUM_SH4_REGS = SH4_REG_OFFSET(0xffffffff) + 1
 };
 
 enum sh4_interrupt {
 #define SH4_INT(name, intevt, pri, ipr, ipr_shift) SH4_INT_##name,
-#include "hw/sh4/sh4_int.inc"
+#include "guest/sh4/sh4_int.inc"
 #undef SH4_INT
   NUM_SH_INTERRUPTS
 };

src/tracer.c

@@ -1,9 +1,9 @@
 #include "tracer.h"
 #include "core/math.h"
+#include "guest/pvr/ta.h"
+#include "guest/pvr/tr.h"
+#include "guest/pvr/trace.h"
 #include "host/host.h"
-#include "hw/pvr/ta.h"
-#include "hw/pvr/tr.h"
-#include "hw/pvr/trace.h"
 #include "render/imgui.h"
 
 #define SCRUBBER_WINDOW_HEIGHT 20.0f

test/test_sh4.c

@@ -1,6 +1,6 @@
 #include "core/math.h"
-#include "dreamcast.h"
-#include "hw/sh4/sh4.h"
+#include "guest/dreamcast.h"
+#include "guest/sh4/sh4.h"
 #include "retest.h"
 
 static const uint32_t UNINITIALIZED_REG = 0xbaadf00d;

tools/retrace/depth.c

@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include "core/assert.h"
 #include "core/sort.h"
-#include "hw/pvr/tr.h"
-#include "hw/pvr/trace.h"
+#include "guest/pvr/tr.h"
+#include "guest/pvr/trace.h"
 
 struct depth_entry {
   /* vertex index */