From 9585dff4bc65dc19bd7bf4dda6ccdae545f78065 Mon Sep 17 00:00:00 2001
From: Anthony Pesch <inolen@gmail.com>
Date: Sat, 14 Oct 2017 13:48:03 -0400
Subject: [PATCH] split up sh4 header

---
 src/guest/sh4/sh4.h      | 73 +++-------------------------------------
 src/guest/sh4/sh4_ccn.h  | 20 +++++++++++
 src/guest/sh4/sh4_dbg.h  | 14 ++++++++
 src/guest/sh4/sh4_dmac.h | 26 ++++++++++++++
 src/guest/sh4/sh4_intc.h |  7 ++++
 src/guest/sh4/sh4_mmu.h  | 19 +++++++++++
 6 files changed, 91 insertions(+), 68 deletions(-)
 create mode 100644 src/guest/sh4/sh4_ccn.h
 create mode 100644 src/guest/sh4/sh4_dbg.h
 create mode 100644 src/guest/sh4/sh4_dmac.h
 create mode 100644 src/guest/sh4/sh4_intc.h
 create mode 100644 src/guest/sh4/sh4_mmu.h

diff --git a/src/guest/sh4/sh4.h b/src/guest/sh4/sh4.h
index 046da3e6..4001ae06 100644
--- a/src/guest/sh4/sh4.h
+++ b/src/guest/sh4/sh4.h
@@ -3,6 +3,11 @@
 
 #include "guest/dreamcast.h"
 #include "guest/memory.h"
+#include "guest/sh4/sh4_ccn.h"
+#include "guest/sh4/sh4_dbg.h"
+#include "guest/sh4/sh4_dmac.h"
+#include "guest/sh4/sh4_intc.h"
+#include "guest/sh4/sh4_mmu.h"
 #include "guest/sh4/sh4_types.h"
 #include "jit/frontend/sh4/sh4_guest.h"
 #include "jit/jit.h"
@@ -15,33 +20,8 @@ struct jit_guest;
 
 #define SH4_CLOCK_FREQ INT64_C(200000000)
 
-enum {
-  SH4_DMA_FROM_ADDR,
-  SH4_DMA_TO_ADDR,
-};
-
 typedef int (*sh4_exception_handler_cb)(void *, enum sh4_exception);
 
-struct sh4_dtr {
-  int channel;
-  int dir;
-  /* when data is non-null, a single address mode transfer is performed between
-     the external device memory at data, and the memory at addr
-
-     when data is null, a dual address mode transfer is performed between addr
-     and SARn / DARn */
-  uint8_t *data;
-  uint32_t addr;
-  /* size is only valid for single address mode transfers, dual address mode
-     transfers honor DMATCR */
-  int size;
-};
-
-struct sh4_tlb_entry {
-  union pteh hi;
-  union ptel lo;
-};
-
 struct sh4 {
   struct device;
 
@@ -86,49 +66,6 @@ extern struct sh4_interrupt_info sh4_interrupts[SH4_NUM_INTERRUPTS];
 
 AM_DECLARE(sh4_data_map);
 
-/* ccn */
-void sh4_ccn_pref(struct sh4 *sh4, uint32_t addr);
-uint32_t sh4_ccn_cache_read(struct sh4 *sh4, uint32_t addr, uint32_t data_mask);
-void sh4_ccn_cache_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
-                         uint32_t data_mask);
-uint32_t sh4_ccn_sq_read(struct sh4 *sh4, uint32_t addr, uint32_t data_mask);
-void sh4_ccn_sq_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
-                      uint32_t data_mask);
-uint32_t sh4_ccn_icache_read(struct sh4 *sh4, uint32_t addr,
-                             uint32_t data_mask);
-void sh4_ccn_icache_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
-                          uint32_t data_mask);
-uint32_t sh4_ccn_ocache_read(struct sh4 *sh4, uint32_t addr,
-                             uint32_t data_mask);
-void sh4_ccn_ocache_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
-                          uint32_t data_mask);
-
-/* dbg */
-int sh4_dbg_num_registers(struct device *dev);
-void sh4_dbg_step(struct device *dev);
-void sh4_dbg_add_breakpoint(struct device *dev, int type, uint32_t addr);
-void sh4_dbg_remove_breakpoint(struct device *dev, int type, uint32_t addr);
-void sh4_dbg_read_memory(struct device *dev, uint32_t addr, uint8_t *buffer,
-                         int size);
-void sh4_dbg_read_register(struct device *dev, int n, uint64_t *value,
-                           int *size);
-int sh4_dbg_invalid_instr(struct sh4 *sh4);
-
-void sh4_dmac_ddt(struct sh4 *sh, struct sh4_dtr *dtr);
-
-/* intc */
-void sh4_intc_update_pending(struct sh4 *sh4);
-void sh4_intc_reprioritize(struct sh4 *sh4);
-
-/* mmu */
-void sh4_mmu_ltlb(struct sh4 *sh4);
-uint32_t sh4_mmu_itlb_read(struct sh4 *sh4, uint32_t addr, uint32_t data_mask);
-uint32_t sh4_mmu_utlb_read(struct sh4 *sh4, uint32_t addr, uint32_t data_mask);
-void sh4_mmu_itlb_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
-                        uint32_t data_mask);
-void sh4_mmu_utlb_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
-                        uint32_t data_mask);
-
 struct sh4 *sh4_create(struct dreamcast *dc);
 void sh4_destroy(struct sh4 *sh4);
 void sh4_debug_menu(struct sh4 *sh4);
diff --git a/src/guest/sh4/sh4_ccn.h b/src/guest/sh4/sh4_ccn.h
new file mode 100644
index 00000000..87f6b1d7
--- /dev/null
+++ b/src/guest/sh4/sh4_ccn.h
@@ -0,0 +1,20 @@
+#ifndef SH4_CCN_H
+#define SH4_CCN_H
+
+void sh4_ccn_pref(struct sh4 *sh4, uint32_t addr);
+uint32_t sh4_ccn_cache_read(struct sh4 *sh4, uint32_t addr, uint32_t data_mask);
+void sh4_ccn_cache_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
+                         uint32_t data_mask);
+uint32_t sh4_ccn_sq_read(struct sh4 *sh4, uint32_t addr, uint32_t data_mask);
+void sh4_ccn_sq_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
+                      uint32_t data_mask);
+uint32_t sh4_ccn_icache_read(struct sh4 *sh4, uint32_t addr,
+                             uint32_t data_mask);
+void sh4_ccn_icache_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
+                          uint32_t data_mask);
+uint32_t sh4_ccn_ocache_read(struct sh4 *sh4, uint32_t addr,
+                             uint32_t data_mask);
+void sh4_ccn_ocache_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
+                          uint32_t data_mask);
+
+#endif
diff --git a/src/guest/sh4/sh4_dbg.h b/src/guest/sh4/sh4_dbg.h
new file mode 100644
index 00000000..d0313640
--- /dev/null
+++ b/src/guest/sh4/sh4_dbg.h
@@ -0,0 +1,14 @@
+#ifndef SH4_DBG_H
+#define SH4_DBG_H
+
+int sh4_dbg_num_registers(struct device *dev);
+void sh4_dbg_step(struct device *dev);
+void sh4_dbg_add_breakpoint(struct device *dev, int type, uint32_t addr);
+void sh4_dbg_remove_breakpoint(struct device *dev, int type, uint32_t addr);
+void sh4_dbg_read_memory(struct device *dev, uint32_t addr, uint8_t *buffer,
+                         int size);
+void sh4_dbg_read_register(struct device *dev, int n, uint64_t *value,
+                           int *size);
+int sh4_dbg_invalid_instr(struct sh4 *sh4);
+
+#endif
diff --git a/src/guest/sh4/sh4_dmac.h b/src/guest/sh4/sh4_dmac.h
new file mode 100644
index 00000000..e5ea196e
--- /dev/null
+++ b/src/guest/sh4/sh4_dmac.h
@@ -0,0 +1,26 @@
+#ifndef SH4_DMAC_H
+#define SH4_DMAC_H
+
+enum {
+  SH4_DMA_FROM_ADDR,
+  SH4_DMA_TO_ADDR,
+};
+
+struct sh4_dtr {
+  int channel;
+  int dir;
+  /* when data is non-null, a single address mode transfer is performed between
+     the external device memory at data, and the memory at addr
+
+     when data is null, a dual address mode transfer is performed between addr
+     and SARn / DARn */
+  uint8_t *data;
+  uint32_t addr;
+  /* size is only valid for single address mode transfers, dual address mode
+     transfers honor DMATCR */
+  int size;
+};
+
+void sh4_dmac_ddt(struct sh4 *sh, struct sh4_dtr *dtr);
+
+#endif
diff --git a/src/guest/sh4/sh4_intc.h b/src/guest/sh4/sh4_intc.h
new file mode 100644
index 00000000..e5ec3e49
--- /dev/null
+++ b/src/guest/sh4/sh4_intc.h
@@ -0,0 +1,7 @@
+#ifndef SH4_INTC_H
+#define SH4_INTC_H
+
+void sh4_intc_update_pending(struct sh4 *sh4);
+void sh4_intc_reprioritize(struct sh4 *sh4);
+
+#endif
diff --git a/src/guest/sh4/sh4_mmu.h b/src/guest/sh4/sh4_mmu.h
new file mode 100644
index 00000000..99545bc9
--- /dev/null
+++ b/src/guest/sh4/sh4_mmu.h
@@ -0,0 +1,19 @@
+#ifndef SH4_MMU_H
+#define SH4_MMU_H
+
+#include "guest/sh4/sh4_types.h"
+
+struct sh4_tlb_entry {
+  union pteh hi;
+  union ptel lo;
+};
+
+void sh4_mmu_ltlb(struct sh4 *sh4);
+uint32_t sh4_mmu_itlb_read(struct sh4 *sh4, uint32_t addr, uint32_t data_mask);
+uint32_t sh4_mmu_utlb_read(struct sh4 *sh4, uint32_t addr, uint32_t data_mask);
+void sh4_mmu_itlb_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
+                        uint32_t data_mask);
+void sh4_mmu_utlb_write(struct sh4 *sh4, uint32_t addr, uint32_t data,
+                        uint32_t data_mask);
+
+#endif