work on jaudio

common.py

@@ -297,6 +297,10 @@ REL_SDATA2_SIZE = 0
 CFLAGS = [
     "-O4",
 ]
+CPLFLAGS =[
+    "-lang=c++",
+    "-O0"
+]
 BASE_DOL_CFLAGS = CFLAGS + [
     "-inline all",
     "-sdata 4",
@@ -332,6 +336,7 @@ ALIGN16_CFLAG = [
 DOL_CFLAGS = ' '.join(BASE_DOL_CFLAGS + LOCAL_CFLAGS)
 SDK_FLAGS = ' '.join(SDK_CFLAG + LOCAL_CFLAGS)
 ALIGN16 = ' '.join(BASE_DOL_CFLAGS + LOCAL_CFLAGS + ALIGN16_CFLAG)
+DOL_CPPFLAGS = ' '.join(CPLFLAGS + BASE_DOL_CFLAGS + LOCAL_CFLAGS)
 REL_CFLAGS = ' '.join(BASE_REL_CFLAGS + LOCAL_CFLAGS)
 EXTERNAL_DOL_CFLAGS = ' '.join(BASE_DOL_CFLAGS)
 EXTERNAL_REL_CFLAGS = ' '.join(BASE_REL_CFLAGS)

config/dol_slices.yml

@@ -22,7 +22,7 @@ dolphin/OS/OSRestoreInterrupts.c:
 MSL_C/rand.c:
     .text: [0x8009f46c, 0x8009f494]
     .sdata: [0x80218260, 0x80218268]
-#libultra/ultra.c:
+#libultra/ultra.c:                  won't link
 #    .text: [0x8005d01c, 0x8005d15c]
 #    .bss: [0x80206f60, 0x80206fa0]
 libultra/gu/sins.c:
@@ -33,4 +33,9 @@ dolphin/odenotstub/odenotstub.c:
 dolphin/amcstubs/AmcExi2Stubs.c:
     .text: [0x800a8cc0, 0x800a8cf0]
 dolphin/gx/GXStubs.c:
-    .text: [0x800998d4, 0x800998d8]
+    .text: [0x800998d4, 0x800998d8]
+jaudio_NES/dummyprobe.c:
+    .text: [0x800083f8, 0x80008400]
+#jaudio_NES/verysimple.c:
+#    .text: [0x80008400, 0x80008480]
+#    .sdata: [0x80217b80, 0x80217b88]

config/rel_slices.yml

@@ -1,11 +1,11 @@
 # ac_aprilfool_control/aPC_actor_dt.c: common_data is pure bs, 
     # .text: [0x805153f0, 0x8051542C]
-zurumode/zerucheck_init.c:
-    .text: [0x8040eb38, 0x8040EB50] 
-zurumode/zerucheck_key_check.c:
-    .text: [0x8040EB50, 0x8040EDA8]
-zurumode/zurumode_cleanup.c:
-    .text: [0x8040efc4, 0x8040f008]
+#zurumode/zerucheck_init.c:
+#    .text: [0x8040eb38, 0x8040EB50] 
+#zurumode/zerucheck_key_check.c:
+#    .text: [0x8040EB50, 0x8040EDA8]
+#zurumode/zurumode_cleanup.c:
+#    .text: [0x8040efc4, 0x8040f008]
 # zurumode/zurumode_init.c:
     # .text: [0x8040ef58, 0x8040efc4]
     # .bss: [0x812f9670, 0x812f9680]

configure.py

@@ -97,6 +97,7 @@ n.newline()
 n.variable("asflags", c.ASFLAGS)
 n.variable("ldflags", c.LDFLAGS)
 n.variable("cppflags", c.CPPFLAGS)
+n.variable("cplflags", c.CPLFLAGS)
 n.variable("ppcdis_analysis_flags", c.PPCDIS_ANALYSIS_FLAGS)
 n.newline()
 
@@ -576,9 +577,9 @@ class CSource(Source):
         if path.startswith("src/dolphin/"):
             self.cflags = c.SDK_FLAGS
             self.cc = c.OCC
-        elif path.startswith("src/odenotstub"):
+        elif path.startswith("src/jaudio_NES"):
             self.cc = c.CC
-            self.cflags = c.ALIGN16
+            self.cflags = c.DOL_CPPFLAGS
         else:
             self.cflags = ctx.cflags
             self.cc = c.CC

include/jaudio_NES/aramcall.h

@@ -0,0 +1,6 @@
+#ifndef ARAMCALL_H
+#define ARAMCALL_H
+#include "types.h"
+void Jac_WaveDirectorySet(char*);
+
+#endif

include/jaudio_NES/audiothread.h

@@ -0,0 +1,10 @@
+#ifndef AUDIOTHREAD_H
+#define AUDIOTHREAD_H
+
+ #include "types.h"
+
+ extern "C"{
+    void StartAudioThread(void*, u32, u32, u32);
+ }
+
+#endif

include/jaudio_NES/cmdstack.h

@@ -0,0 +1,8 @@
+#ifndef CMDSTACK_H
+#define CMDSTACK_H
+#include "types.h"
+extern "C"{
+    void Jac_Portcmd_Init(void);
+}
+
+#endif

include/jaudio_NES/connect.h

@@ -0,0 +1,8 @@
+#ifndef CONNECT_H
+#define CONNECT_H
+
+#include "types.h"
+
+void Jac_ConnectTableInit(void);
+
+#endif

include/jaudio_NES/dummyprobe.h

@@ -0,0 +1,11 @@
+#ifndef DUMMYPROBE_H
+#define DUMMYPROBE_H
+
+#include "types.h"
+
+extern "C"{
+    void Probe_Start(void);
+    void Probe_Finish(void);
+}
+
+#endif

include/jaudio_NES/jammain.h

@@ -0,0 +1,10 @@
+#ifndef JAMMAIN_H
+#define JAMMAIN_H
+
+#include "types.h"
+
+extern "C"{
+    void Jam_InitRegistTrack(void);
+}
+
+#endif

include/jaudio_NES/seqsetup.h

@@ -0,0 +1,8 @@
+#ifndef SEQSETUP_H
+#define SEQSETUP_H
+#include "types.h"
+extern "C"{
+    void Jaq_Reset(void);
+}
+
+#endif

include/jaudio_NES/verysimple.h

@@ -0,0 +1,9 @@
+#ifndef VERYSIMPLE_H
+#define VERYSIMPLE_H
+#include "types.h"
+
+void Jac_Start(void*, u32, u32);
+void Jac_PlayInit(void);
+
+
+#endif

include/libultra/libultra.h

@@ -1,5 +1,6 @@
 #ifndef LIBULTRA_H
 #define LIBULTRA_H
+
 #include "types.h"
 #include "dolphin/OS/OSTime.h"
 #include "dolphin/OS/OSCache.h"
@@ -12,6 +13,6 @@ void osWritebackDCache(void* vaddr, u32 nbytes);
 u32 osGetCount(void);
 OSTime osGetTime(void);
 
-extern s32 osAppNMIBuffer[15]; 
+s32 osAppNMIBuffer[15]; 
 
-#endif 
+#endif

include/zurumode.h

@@ -4,7 +4,6 @@
 #include "types.h"
 
 #include "dolphin/OS/os.h"
-#include "libultra/libultra.h"
 //#include "JSystem/JUT/JUTAssertion.h"
 //#include "JSystem/JUT/JUTDbPrint.h"
 

rel/zurumode/zerucheck_init.c

@@ -1,5 +1,5 @@
 #include "zurumode.h"
-
+#include "libultra/libultra.h"
 int zerucheck_init(zuru_keycheck* key_check) {
   key_check->zurumode_enabled = FALSE;
   key_check->state = ZURUMODE_STAGE_BEGIN_e;

rel/zurumode/zerucheck_key_check.c

@@ -1,4 +1,5 @@
 #include "zurumode.h"
+#include "libultra/libultra.h"
 
 /**
  * @brief Checks that the current controller state is correct

rel/zurumode/zurumode_cleanup.c

@@ -1,5 +1,5 @@
 #include "zurumode.h"
-
+#include "libultra/libultra.h"
 void zurumode_cleanup(void) { // Hm, this looks like PADMGR_UNSET_RETRACE_CALLBACK macro lol
     if ((padmgr_class.callback2 == &zurumode_callback) && (padmgr_class.callback2_param == &padmgr_class)) {
         padmgr_class.callback2 = NULL;

rel/zurumode/zurumode_init.c

@@ -1,5 +1,5 @@
 #include "zurumode.h"
-
+#include "libultra/libultra.h"
 void zurumode_init(void){
     zurumode_flag = 0;
     zerucheck_init(&zuruKeyCheck);

rel/zurumode/zurumode_update.c

@@ -1,5 +1,5 @@
 #include "zurumode.h"
-
+#include "libultra/libultra.h"
 s32 zurumode_update() {
     s32 flag_now;
     s32 zurumode_now;

src/jaudio_NES/dummyprobe.c

@@ -0,0 +1,9 @@
+#include "jaudio_NES/dummyprobe.h"
+
+void Probe_Start(void){ 
+    
+}
+
+void Probe_Finish(void){
+
+}

src/jaudio_NES/emusound.c

@@ -0,0 +1,2 @@
+#include "emusound.h"
+

src/jaudio_NES/melody.c

@@ -0,0 +1 @@
+#include "melody.h"

src/jaudio_NES/verysimple.c

@@ -0,0 +1,19 @@
+#include "jaudio_NES/verysimple.h"
+#include "jaudio_NES/audiothread.h"
+#include "jaudio_NES/aramcall.h"
+#include "jaudio_NES/cmdstack.h"
+#include "jaudio_NES/seqsetup.h"
+#include "jaudio_NES/connect.h"
+#include "jaudio_NES/jammain.h"
+
+void Jac_Start(void *heap, u32 heap_size, u32 aram_size) {
+    StartAudioThread(heap,heap_size, aram_size, 7);
+    Jac_WaveDirectorySet("/");
+    Jac_PlayInit();
+    Jac_Portcmd_Init();
+}
+void Jac_PlayInit(void) { // funcalign?
+    Jaq_Reset();
+    Jac_ConnectTableInit();
+    Jam_InitRegistTrack();
+}