moved non-hw code out of hw dir

CMakeLists.txt

@@ -192,10 +192,6 @@ set(REDREAM_SOURCES
   src/hw/sh4/sh4_dmac.c
   src/hw/sh4/sh4_intc.c
   src/hw/sh4/sh4_tmu.c
-  src/hw/debugger.c
-  src/hw/dreamcast.c
-  src/hw/memory.c
-  src/hw/scheduler.c
   src/jit/backend/interp/interp_backend.c
   src/jit/frontend/armv3/armv3_context.c
   src/jit/frontend/armv3/armv3_disasm.c
@@ -223,9 +219,12 @@ set(REDREAM_SOURCES
   src/sys/exception_handler.c
   src/sys/filesystem.c
   src/sys/memory.c
+  src/debugger.c
+  src/dreamcast.c
   src/emulator.c
-  src/tracer.c
-)
+  src/memory.c
+  src/scheduler.c
+  src/tracer.c)
 
 if(PLATFORM_WINDOWS)
   list(APPEND REDREAM_DEFS PLATFORM_WINDOWS=1)

src/debugger.c

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

src/dreamcast.c

@@ -1,19 +1,19 @@
-#include "hw/dreamcast.h"
+#include "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/debugger.h"
 #include "hw/gdrom/gdrom.h"
 #include "hw/holly/holly.h"
 #include "hw/maple/maple.h"
-#include "hw/memory.h"
 #include "hw/pvr/pvr.h"
 #include "hw/pvr/ta.h"
 #include "hw/rom/bios.h"
 #include "hw/rom/flash.h"
-#include "hw/scheduler.h"
 #include "hw/sh4/sh4.h"
+#include "memory.h"
+#include "scheduler.h"
 
 void dc_poll_input(struct dreamcast *dc) {
   if (!dc->poll_input) {

src/dreamcast.h

@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include "core/list.h"
 #include "host/keycode.h"
-#include "hw/memory.h"
+#include "memory.h"
 
 struct aica;
 struct arm7;

src/emulator.c

@@ -14,23 +14,23 @@
 #include "emulator.h"
 #include "core/option.h"
 #include "core/profiler.h"
+#include "dreamcast.h"
 #include "host/host.h"
 #include "hw/aica/aica.h"
 #include "hw/arm7/arm7.h"
-#include "hw/dreamcast.h"
 #include "hw/gdrom/gdrom.h"
 #include "hw/holly/holly.h"
 #include "hw/maple/maple.h"
-#include "hw/memory.h"
 #include "hw/pvr/pvr.h"
 #include "hw/pvr/ta.h"
 #include "hw/pvr/tr.h"
 #include "hw/pvr/trace.h"
-#include "hw/scheduler.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"
 #include "sys/thread.h"
 #include "sys/time.h"
 

src/hw/aica/aica.c

@@ -3,14 +3,14 @@
 #include "core/log.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/dreamcast.h"
 #include "hw/holly/holly.h"
-#include "hw/memory.h"
-#include "hw/scheduler.h"
 #include "hw/sh4/sh4.h"
+#include "memory.h"
 #include "render/imgui.h"
+#include "scheduler.h"
 #include "sys/filesystem.h"
 
 DEFINE_OPTION_INT(rtc, 0, OPTION_HIDDEN);

src/hw/aica/aica.h

@@ -1,8 +1,7 @@
 #ifndef AICA_H
 #define AICA_H
 
-#include <stdint.h>
-#include "hw/memory.h"
+#include "memory.h"
 
 struct aica;
 struct dreamcast;

src/hw/arm7/arm7.c

@@ -1,14 +1,14 @@
 #include "hw/arm7/arm7.h"
 #include "core/log.h"
+#include "dreamcast.h"
 #include "hw/aica/aica.h"
-#include "hw/dreamcast.h"
-#include "hw/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/hw/arm7/arm7.h

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

src/hw/gdrom/gdrom.c

@@ -1,7 +1,7 @@
 #include "hw/gdrom/gdrom.h"
 #include "core/math.h"
 #include "core/string.h"
-#include "hw/dreamcast.h"
+#include "dreamcast.h"
 #include "hw/gdrom/gdrom_replies.inc"
 #include "hw/gdrom/gdrom_types.h"
 #include "hw/holly/holly.h"

src/hw/gdrom/gdrom.h

@@ -1,7 +1,6 @@
 #ifndef GDROM_H
 #define GDROM_H
 
-#include <stdint.h>
 #include "hw/gdrom/disc.h"
 #include "hw/gdrom/gdrom_types.h"
 

src/hw/holly/holly.c

@@ -1,10 +1,10 @@
 #include "hw/holly/holly.h"
-#include "hw/dreamcast.h"
+#include "dreamcast.h"
 #include "hw/gdrom/gdrom.h"
 #include "hw/maple/maple.h"
-#include "hw/scheduler.h"
 #include "hw/sh4/sh4.h"
 #include "render/imgui.h"
+#include "scheduler.h"
 
 struct reg_cb holly_cb[NUM_HOLLY_REGS];
 

src/hw/holly/holly.h

@@ -1,12 +1,10 @@
 #ifndef HOLLY_H
 #define HOLLY_H
 
-#include <stdint.h>
-#include "hw/dreamcast.h"
+#include "dreamcast.h"
 #include "hw/holly/holly_types.h"
-#include "hw/memory.h"
+#include "memory.h"
 
-struct dreamcast;
 struct gdrom;
 struct maple;
 struct sh4;

src/hw/maple/controller.c

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

src/hw/maple/maple.c

@@ -1,5 +1,5 @@
 #include "hw/maple/maple.h"
-#include "hw/dreamcast.h"
+#include "dreamcast.h"
 #include "hw/holly/holly.h"
 #include "hw/sh4/sh4.h"
 

src/hw/pvr/pvr.c

@@ -1,9 +1,9 @@
 #include "hw/pvr/pvr.h"
-#include "hw/dreamcast.h"
+#include "dreamcast.h"
 #include "hw/holly/holly.h"
 #include "hw/pvr/ta.h"
-#include "hw/scheduler.h"
 #include "hw/sh4/sh4.h"
+#include "scheduler.h"
 #include "sys/time.h"
 
 DEFINE_AGGREGATE_COUNTER(pvr_vblanks);

src/hw/pvr/pvr.h

@@ -1,11 +1,10 @@
 #ifndef PVR_H
 #define PVR_H
 
-#include <stdint.h>
 #include "core/profiler.h"
-#include "hw/dreamcast.h"
-#include "hw/memory.h"
+#include "dreamcast.h"
 #include "hw/pvr/pvr_types.h"
+#include "memory.h"
 
 struct dreamcast;
 struct holly;

src/hw/pvr/ta.c

@@ -5,8 +5,8 @@
 #include "hw/pvr/pixel_convert.h"
 #include "hw/pvr/pvr.h"
 #include "hw/pvr/tr.h"
-#include "hw/scheduler.h"
 #include "hw/sh4/sh4.h"
+#include "scheduler.h"
 #include "sys/exception_handler.h"
 #include "sys/filesystem.h"
 

src/hw/pvr/ta.h

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

src/hw/pvr/ta_types.h

@@ -1,6 +1,7 @@
 #ifndef TA_TYPES_H
 #define TA_TYPES_H
 
+#include <stdint.h>
 #include "core/list.h"
 #include "core/rb_tree.h"
 

src/hw/rom/bios.c

@@ -2,7 +2,7 @@
 #include "hw/rom/bios.h"
 #include "core/md5.h"
 #include "core/option.h"
-#include "hw/dreamcast.h"
+#include "dreamcast.h"
 
 DEFINE_OPTION_STRING(bios, "dc_boot.bin", "Path to boot rom");
 

src/hw/rom/bios.h

@@ -1,7 +1,7 @@
 #ifndef BIOS_H
 #define BIOS_H
 
-#include "hw/memory.h"
+#include "memory.h"
 
 struct dreamcast;
 struct bios;

src/hw/rom/flash.c

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include "hw/rom/flash.h"
 #include "core/option.h"
-#include "hw/dreamcast.h"
+#include "dreamcast.h"
 #include "sys/filesystem.h"
 
 DEFINE_OPTION_STRING(flash, "dc_flash.bin", "Path to flash rom");

src/hw/rom/flash.h

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

src/hw/sh4/sh4.c

@@ -1,21 +1,21 @@
 #include "hw/sh4/sh4.h"
 #include "core/math.h"
 #include "core/string.h"
+#include "dreamcast.h"
 #include "hw/aica/aica.h"
-#include "hw/dreamcast.h"
 #include "hw/holly/holly.h"
-#include "hw/memory.h"
 #include "hw/pvr/pvr.h"
 #include "hw/pvr/ta.h"
 #include "hw/rom/bios.h"
 #include "hw/rom/flash.h"
-#include "hw/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/ir/ir.h"
 #include "jit/jit.h"
+#include "memory.h"
 #include "render/imgui.h"
+#include "scheduler.h"
 #include "sys/time.h"
 
 #if ARCH_X64

src/hw/sh4/sh4.h

@@ -2,11 +2,11 @@
 #define SH4_H
 
 #include "core/profiler.h"
-#include "hw/dreamcast.h"
-#include "hw/memory.h"
+#include "dreamcast.h"
 #include "hw/sh4/sh4_types.h"
 #include "jit/frontend/sh4/sh4_context.h"
 #include "jit/jit.h"
+#include "memory.h"
 
 struct dreamcast;
 struct jit;

src/hw/sh4/sh4_dbg.c

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

src/hw/sh4/sh4_tmu.c

@@ -1,5 +1,5 @@
-#include "hw/scheduler.h"
 #include "hw/sh4/sh4.h"
+#include "scheduler.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/memory.c

@@ -1,7 +1,7 @@
-#include "hw/memory.h"
+#include "memory.h"
 #include "core/math.h"
 #include "core/string.h"
-#include "hw/dreamcast.h"
+#include "dreamcast.h"
 #include "sys/exception_handler.h"
 
 /*

src/scheduler.c

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

test/test_sh4.c

@@ -1,5 +1,5 @@
 #include "core/math.h"
-#include "hw/dreamcast.h"
+#include "dreamcast.h"
 #include "hw/sh4/sh4.h"
 #include "retest.h"