Reorganize jaudio_NES src folder layout

config/dol_slices.yml

@@ -28,54 +28,54 @@ dvderr.c:
     .rodata: [0x800a97f8, 0x800a9838]
     .data: [0x800b0a60, 0x800b9140]
     .bss: [0x800e2790, 0x800e2b88]
-jaudio_NES/dummyprobe.c:
+jaudio_NES/game/dummyprobe.c:
     .text: [0x800083f8, 0x80008400]
-jaudio_NES/audioheaders.c:
+jaudio_NES/game/audioheaders.c:
     .data: [0x800cca40, 0x800ce880]
-jaudio_NES/verysimple.c:
+jaudio_NES/game/verysimple.c:
    .text: [0x80008400, 0x80008480]
    .sdata: [0x80217b80, 0x80217b88]
-# jaudio_NES/game64.c: # TODO: finish
+# jaudio_NES/game/game64.c: # TODO: finish
 #     .rodata: [0x800a9938, 0x800a9b98]
-jaudio_NES/melody.c:
+jaudio_NES/game/melody.c:
     .text: [0x8001561c, 0x80015a4c]
     .rodata: [0x800a9b98, 0x800aa500]
     .sbss: [0x80218390, 0x802183a0]
     .sdata2: [0x80218d58, 0x80218d60]
-jaudio_NES/rhythm.c:
+jaudio_NES/game/rhythm.c:
     .text: [0x80015a4c, 0x800165ec]
     .bss: [0x8017bdd8, 0x8017be80]
     .sdata: [0x80217bd0, 0x80217bd8]
     .sbss: [0x802183a0, 0x802183b0]
     .sdata2: [0x80218d60, 0x80218d78]
-jaudio_NES/radio.c:
+jaudio_NES/game/radio.c:
     .text: [0x800165ec, 0x8001676c]
     .sdata2: [0x80218d78, 0x80218d88]
-jaudio_NES/staff.c:
+jaudio_NES/game/staff.c:
     .text: [0x80016840, 0x80016d20]
     .data: [0x800cfe10, 0x800cff20]
     .sbss: [0x802183b8, 0x802183c8]
     .sdata2: [0x80218d98, 0x80218da0]
-jaudio_NES/aictrl.c:
+jaudio_NES/internal/aictrl.c:
     .text: [0x80017e80, 0x80018640]
     .rodata: [0x800aa500, 0x800aa518]
     .bss: [0x8017cfa0, 0x8017cfc0]
     .sbss: [0x802183f0, 0x80218420]
     .sdata2: [0x80218da8, 0x80218db8]
-jaudio_NES/sample.c:
+jaudio_NES/internal/sample.c:
     .text: [0x80018640, 0x80018920]
-jaudio_NES/dummyrom.c:
+jaudio_NES/internal/dummyrom.c:
     .text: [0x80018920, 0x80018bc0]
     .rodata: [0x800aa518, 0x800aa528]
 #    .bss: [0x8020d78c, 0x8020d7a0] # placed in common bss
     .sbss: [0x80218420, 0x80218440]
-jaudio_NES/audiothread.c:
+jaudio_NES/internal/audiothread.c:
     .text: [0x80018bc0, 0x800190e0]
     .rodata: [0x800aa528, 0x800aa538]
     .bss: [0x8017cfc0, 0x80180020]
     .sbss: [0x80218440, 0x80218460]
     .sdata2: [0x80218db8, 0x80218dc0]
-jaudio_NES/neosthread.c:
+jaudio_NES/internal/neosthread.c:
     .text: [0x800190e0, 0x80019380]
     .rodata: [0x800aa538, 0x800aa558]
     .bss: [0x80180020, 0x80186440]

configure.py

@@ -624,31 +624,15 @@ class AsmSource(Source):
             inputs = self.src_path
         )
 
-JAUDIO_FUNC_ALIGN_32_TUS = [
-    "sample.c",
-    "aictrl.c",
-    "dummyrom.c",
-    "audiothread.c",
-    "neosthread.c"
-]
-
-JAUDIO_USER_TUS = [
-    "verysimple.c",
-    "melody.c",
-    "radio.c",
-    "rhythm.c",
-    "staff.c"
-]
-
 class CSource(Source):
     def __init__(self, ctx: c.SourceContext, path: str):
         if path.startswith("src/static/dolphin/"):
             self.cflags = c.SDK_FLAGS
             self.cc = c.OCC
         elif path.startswith("src/static/jaudio_NES/"):
-            if os.path.basename(path) in JAUDIO_FUNC_ALIGN_32_TUS:
+            if path.startswith("src/static/jaudio_NES/internal/"):
                 self.cflags = c.JAUDIO_FUNC_ALIGN_32_CFLAGS
-            elif os.path.basename(path) in JAUDIO_USER_TUS:
+            elif path.startswith("src/static/jaudio_NES/game/"):
                 self.cflags = c.JAUDIO_USER_CFLAGS
             else:
                 self.cflags = c.JAUDIO_CFLAGS