Copy JKernel (#126)

* start JSystem

* JKRAram and JUTGamePad

* started heap and thread

* more JKernel

* mostly finished JKernel

* delete unused asm

* JKRFileFinder

* delete unused asm and match findNextFile

* format

* fix mtx_vec

libs/dolphin/ar/ar.cpp

@@ -14,9 +14,6 @@
 extern "C" void ARRegisterDMACallback();
 extern "C" void ARGetDMAStatus();
 extern "C" void ARStartDMA();
-extern "C" void ARAlloc();
-extern "C" void ARInit();
-extern "C" u32 ARGetSize();
 extern "C" void __ARHandler();
 extern "C" void __ARClearInterrupt();
 extern "C" void __ARGetInterruptStatus();
@@ -99,7 +96,7 @@ static u8 __AR_BlockLength[4];
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void ARAlloc() {
+asm u32 ARAlloc(u32) {
     nofralloc
 #include "asm/dolphin/ar/ar/ARAlloc.s"
 }
@@ -197,7 +194,7 @@ static u8 __AR_init_flag[4];
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void ARInit() {
+asm u32 ARInit(u32*, u32) {
     nofralloc
 #include "asm/dolphin/ar/ar/ARInit.s"
 }

libs/dolphin/ar/arq.cpp

@@ -15,7 +15,6 @@ extern "C" void __ARQServiceQueueLo();
 extern "C" void __ARQCallbackHack();
 extern "C" void __ARQInterruptServiceRoutine();
 extern "C" void ARQInit();
-extern "C" void ARQPostRequest();
 
 //
 // External References:
@@ -186,7 +185,8 @@ asm void ARQInit() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void ARQPostRequest() {
+asm void ARQPostRequest(ARQRequest* task, u32 owner, u32 type, u32 priority, u32 source,
+                        u32 destination, u32 length, ARQCallback callback) {
     nofralloc
 #include "asm/dolphin/ar/arq/ARQPostRequest.s"
 }

libs/dolphin/dvd/dvd.cpp

@@ -47,15 +47,11 @@ extern "C" void DVDReadDiskID();
 extern "C" void DVDCancelStreamAsync();
 extern "C" void DVDInquiryAsync();
 extern "C" void DVDReset();
-extern "C" void DVDGetCommandBlockStatus();
-extern "C" void DVDGetDriveStatus();
 extern "C" void DVDSetAutoInvalidation();
 extern "C" void DVDResume();
 extern "C" static void DVDCancelAsync();
 extern "C" void DVDCancel();
 extern "C" static void cbForCancelSync();
-extern "C" void DVDGetCurrentDiskID();
-extern "C" void DVDCheckDisk();
 extern "C" void __DVDPrepareResetAsync();
 extern "C" void __DVDTestAlarm();
 
@@ -689,7 +685,7 @@ asm void DVDReset() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void DVDGetCommandBlockStatus() {
+asm int DVDGetCommandBlockStatus(DVDCommandBlock*) {
     nofralloc
 #include "asm/dolphin/dvd/dvd/DVDGetCommandBlockStatus.s"
 }
@@ -699,7 +695,7 @@ asm void DVDGetCommandBlockStatus() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void DVDGetDriveStatus() {
+asm DVDState DVDGetDriveStatus() {
     nofralloc
 #include "asm/dolphin/dvd/dvd/DVDGetDriveStatus.s"
 }
@@ -847,7 +843,7 @@ static asm void cbForCancelSync() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void DVDGetCurrentDiskID() {
+asm DVDDiskID* DVDGetCurrentDiskID() {
     nofralloc
 #include "asm/dolphin/dvd/dvd/DVDGetCurrentDiskID.s"
 }
@@ -877,7 +873,7 @@ SECTION_DATA static void* lit_1060[13 + 1 /* padding */] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void DVDCheckDisk() {
+asm s32 DVDCheckDisk() {
     nofralloc
 #include "asm/dolphin/dvd/dvd/DVDCheckDisk.s"
 }

libs/dolphin/mtx/mtx.cpp

@@ -5,38 +5,9 @@
 
 #include "dolphin/mtx/mtx.h"
 #include "dol2asm.h"
+#include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
-
-//
-// Forward References:
-//
-
-extern "C" void PSMTXIdentity();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXConcat();
-extern "C" void PSMTXInverse();
-extern "C" void PSMTXRotRad();
-extern "C" static void PSMTXRotTrig();
-extern "C" void __PSMTXRotAxisRadInternal();
-extern "C" void PSMTXRotAxisRad();
-extern "C" void PSMTXTrans();
-extern "C" void PSMTXTransApply();
-extern "C" void PSMTXScale();
-extern "C" void PSMTXScaleApply();
-extern "C" void PSMTXQuat();
-extern "C" void C_MTXLookAt();
-extern "C" void C_MTXLightPerspective();
-extern "C" void C_MTXLightOrtho();
-
-//
-// External References:
-//
-
-extern "C" void PSVECNormalize();
-extern "C" void PSVECCrossProduct();
-extern "C" void tanf();
-extern "C" void sinf();
-extern "C" void cosf();
+#include "msl_c/math.h"
 
 //
 // Declarations:
@@ -58,7 +29,7 @@ SECTION_SDATA2 static u8 lit_97[4] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXIdentity() {
+asm void PSMTXIdentity(Mtx matrix) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXIdentity.s"
 }
@@ -68,7 +39,7 @@ asm void PSMTXIdentity() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXCopy() {
+asm void PSMTXCopy(const Mtx src, Mtx dst) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXCopy.s"
 }
@@ -84,7 +55,7 @@ SECTION_SDATA static u8 Unit01[8] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXConcat() {
+asm void PSMTXConcat(const Mtx src_a, const Mtx src_b, Mtx dst) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXConcat.s"
 }
@@ -94,7 +65,7 @@ asm void PSMTXConcat() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXInverse() {
+asm u32 PSMTXInverse(const Mtx src, Mtx dst) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXInverse.s"
 }
@@ -104,7 +75,7 @@ asm void PSMTXInverse() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXRotRad() {
+asm void PSMTXRotRad(Mtx matrix, u8 axis, float rad) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXRotRad.s"
 }
@@ -114,7 +85,7 @@ asm void PSMTXRotRad() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-static asm void PSMTXRotTrig() {
+asm void PSMTXRotTrig(Mtx matrix, u8 axis, float sin, float cos) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXRotTrig.s"
 }
@@ -131,7 +102,7 @@ SECTION_SDATA2 static f32 lit_191 = 3.0f;
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void __PSMTXRotAxisRadInternal() {
+asm double __PSMTXRotAxisRadInternal(double param_1, double param_2, int param_3, int param_4) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/__PSMTXRotAxisRadInternal.s"
 }
@@ -141,7 +112,7 @@ asm void __PSMTXRotAxisRadInternal() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXRotAxisRad() {
+asm void PSMTXRotAxisRad(Mtx matrix, const Vec* axis, float rad) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXRotAxisRad.s"
 }
@@ -151,7 +122,7 @@ asm void PSMTXRotAxisRad() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXTrans() {
+asm void PSMTXTrans(Mtx matrix, float x_trans, float y_trans, float z_trans) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXTrans.s"
 }
@@ -161,7 +132,7 @@ asm void PSMTXTrans() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXTransApply() {
+asm void PSMTXTransApply(const Mtx src, Mtx dst, float x, float y, float z) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXTransApply.s"
 }
@@ -171,7 +142,7 @@ asm void PSMTXTransApply() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXScale() {
+asm void PSMTXScale(Mtx matrix, float x_scale, float y_scale, float z_scale) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXScale.s"
 }
@@ -181,7 +152,7 @@ asm void PSMTXScale() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXScaleApply() {
+asm void PSMTXScaleApply(const Mtx src, Mtx dst, float x_scale, float y_scale, float z_scale) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXScaleApply.s"
 }
@@ -191,7 +162,7 @@ asm void PSMTXScaleApply() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXQuat() {
+asm void PSMTXQuat(Mtx matrix, const Quaternion* quat) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/PSMTXQuat.s"
 }
@@ -201,7 +172,7 @@ asm void PSMTXQuat() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void C_MTXLookAt() {
+asm void C_MTXLookAt(Mtx param_1, const Vec* param_2, const Vec* param_3, const Vec* param_4) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/C_MTXLookAt.s"
 }
@@ -225,7 +196,8 @@ SECTION_SDATA2 static f32 lit_230[1 + 1 /* padding */] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void C_MTXLightPerspective() {
+asm void C_MTXLightPerspective(Mtx matrix, float fov_y, float aspect, float scale_s, float scale_t,
+                               float trans_s, float trans_t) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/C_MTXLightPerspective.s"
 }
@@ -235,7 +207,8 @@ asm void C_MTXLightPerspective() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void C_MTXLightOrtho() {
+asm void C_MTXLightOrtho(Mtx matrix, float top, float bottom, float left, float right,
+                         float scale_s, float scale_t, float trans_s, float trans_t) {
     nofralloc
 #include "asm/dolphin/mtx/mtx/C_MTXLightOrtho.s"
 }

libs/dolphin/mtx/mtx44.cpp

@@ -6,19 +6,7 @@
 #include "dolphin/mtx/mtx44.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-
-//
-// Forward References:
-//
-
-extern "C" void C_MTXPerspective();
-extern "C" void C_MTXOrtho();
-
-//
-// External References:
-//
-
-extern "C" void tanf();
+#include "msl_c/math.h"
 
 //
 // Declarations:
@@ -52,7 +40,7 @@ SECTION_SDATA2 static f32 lit_106 = 0.01745329238474369f;
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void C_MTXPerspective() {
+asm void C_MTXPerspective(Mtx44 matrix, float fov_y, float aspect, float near, float far) {
     nofralloc
 #include "asm/dolphin/mtx/mtx44/C_MTXPerspective.s"
 }
@@ -62,7 +50,8 @@ asm void C_MTXPerspective() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void C_MTXOrtho() {
+asm void C_MTXOrtho(Mtx44 matrix, float top, float bottom, float left, float right, float near,
+                    float far) {
     nofralloc
 #include "asm/dolphin/mtx/mtx44/C_MTXOrtho.s"
 }

libs/dolphin/mtx/mtxvec.cpp

@@ -7,19 +7,6 @@
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
-//
-// Forward References:
-//
-
-extern "C" void PSMTXMultVec();
-extern "C" void PSMTXMultVecArray();
-extern "C" void PSMTXMultVecSR();
-extern "C" void PSMTXMultVecArraySR();
-
-//
-// External References:
-//
-
 //
 // Declarations:
 //
@@ -28,7 +15,7 @@ extern "C" void PSMTXMultVecArraySR();
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXMultVec() {
+asm void PSMTXMultVec(const Mtx matrix, const Vec* src, Vec* dst) {
     nofralloc
 #include "asm/dolphin/mtx/mtxvec/PSMTXMultVec.s"
 }
@@ -38,7 +25,7 @@ asm void PSMTXMultVec() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXMultVecArray() {
+asm void PSMTXMultVecArray(const Mtx matrix, const Vec* src, Vec* dst, u32 count) {
     nofralloc
 #include "asm/dolphin/mtx/mtxvec/PSMTXMultVecArray.s"
 }
@@ -48,7 +35,7 @@ asm void PSMTXMultVecArray() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXMultVecSR() {
+asm void PSMTXMultVecSR(const Mtx matrix, const Vec* src, Vec* dst) {
     nofralloc
 #include "asm/dolphin/mtx/mtxvec/PSMTXMultVecSR.s"
 }
@@ -58,7 +45,7 @@ asm void PSMTXMultVecSR() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSMTXMultVecArraySR() {
+asm void PSMTXMultVecArraySR(const Mtx matrix, const Vec* src, Vec* dst, u32 count) {
     nofralloc
 #include "asm/dolphin/mtx/mtxvec/PSMTXMultVecArraySR.s"
 }

libs/dolphin/mtx/quat.cpp

@@ -6,23 +6,7 @@
 #include "dolphin/mtx/quat.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-
-//
-// Forward References:
-//
-
-extern "C" void PSQUATMultiply();
-extern "C" void C_QUATRotAxisRad();
-extern "C" void C_QUATSlerp();
-
-//
-// External References:
-//
-
-extern "C" void PSVECNormalize();
-extern "C" void sinf();
-extern "C" void cosf();
-extern "C" void acosf();
+#include "msl_c/math.h"
 
 //
 // Declarations:
@@ -32,7 +16,7 @@ extern "C" void acosf();
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSQUATMultiply() {
+asm void PSQUATMultiply(const Quaternion* src_a, const Quaternion* src_b, Quaternion* dst) {
     nofralloc
 #include "asm/dolphin/mtx/quat/PSQUATMultiply.s"
 }
@@ -57,7 +41,7 @@ SECTION_SDATA2 static f32 lit_135 = 0.5f;
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void C_QUATRotAxisRad() {
+asm void C_QUATRotAxisRad(Quaternion* quat, const Vec* axis, float rad) {
     nofralloc
 #include "asm/dolphin/mtx/quat/C_QUATRotAxisRad.s"
 }
@@ -71,7 +55,7 @@ SECTION_SDATA2 static f32 lit_261 = 0.9999899864196777f;
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void C_QUATSlerp() {
+asm void C_QUATSlerp(const Quaternion* p, const Quaternion* q, Quaternion* r, float t) {
     nofralloc
 #include "asm/dolphin/mtx/quat/C_QUATSlerp.s"
 }

libs/dolphin/mtx/vec.cpp

@@ -7,27 +7,6 @@
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
-//
-// Forward References:
-//
-
-extern "C" void PSVECAdd();
-extern "C" void PSVECSubtract();
-extern "C" void PSVECScale();
-extern "C" void PSVECNormalize();
-extern "C" void PSVECSquareMag();
-extern "C" void PSVECMag();
-extern "C" void PSVECDotProduct();
-extern "C" void PSVECCrossProduct();
-extern "C" void C_VECHalfAngle();
-extern "C" void C_VECReflect();
-extern "C" void PSVECSquareDistance();
-extern "C" void PSVECDistance();
-
-//
-// External References:
-//
-
 //
 // Declarations:
 //
@@ -36,7 +15,7 @@ extern "C" void PSVECDistance();
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSVECAdd() {
+asm void PSVECAdd(const Vec* src_a, const Vec* src_b, Vec* dst) {
     nofralloc
 #include "asm/dolphin/mtx/vec/PSVECAdd.s"
 }
@@ -46,7 +25,7 @@ asm void PSVECAdd() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSVECSubtract() {
+asm void PSVECSubtract(const Vec* a, const Vec* b, Vec* dst) {
     nofralloc
 #include "asm/dolphin/mtx/vec/PSVECSubtract.s"
 }
@@ -56,7 +35,7 @@ asm void PSVECSubtract() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSVECScale() {
+asm void PSVECScale(const Vec* src, Vec* dst, float scale) {
     nofralloc
 #include "asm/dolphin/mtx/vec/PSVECScale.s"
 }
@@ -81,7 +60,7 @@ SECTION_SDATA2 static f32 lit_119 = 3.0f;
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSVECNormalize() {
+asm void PSVECNormalize(const Vec* src, Vec* dst) {
     nofralloc
 #include "asm/dolphin/mtx/vec/PSVECNormalize.s"
 }
@@ -91,7 +70,7 @@ asm void PSVECNormalize() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSVECSquareMag() {
+asm float PSVECSquareMag(const Vec* vec) {
     nofralloc
 #include "asm/dolphin/mtx/vec/PSVECSquareMag.s"
 }
@@ -101,7 +80,7 @@ asm void PSVECSquareMag() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSVECMag() {
+asm float PSVECMag(const Vec* data) {
     nofralloc
 #include "asm/dolphin/mtx/vec/PSVECMag.s"
 }
@@ -111,7 +90,7 @@ asm void PSVECMag() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSVECDotProduct() {
+asm float PSVECDotProduct(const Vec* a, const Vec* b) {
     nofralloc
 #include "asm/dolphin/mtx/vec/PSVECDotProduct.s"
 }
@@ -121,7 +100,7 @@ asm void PSVECDotProduct() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSVECCrossProduct() {
+asm void PSVECCrossProduct(const Vec* src_a, const Vec* src_b, Vec* dst) {
     nofralloc
 #include "asm/dolphin/mtx/vec/PSVECCrossProduct.s"
 }
@@ -131,7 +110,7 @@ asm void PSVECCrossProduct() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void C_VECHalfAngle() {
+asm void C_VECHalfAngle(const Vec* incident, const Vec* line_of_sight, Vec* out_half) {
     nofralloc
 #include "asm/dolphin/mtx/vec/C_VECHalfAngle.s"
 }
@@ -145,7 +124,7 @@ SECTION_SDATA2 static f32 lit_161 = 2.0f;
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void C_VECReflect() {
+asm void C_VECReflect(const Vec* src, const Vec* surface_normal, Vec* dst) {
     nofralloc
 #include "asm/dolphin/mtx/vec/C_VECReflect.s"
 }
@@ -155,7 +134,7 @@ asm void C_VECReflect() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSVECSquareDistance() {
+asm float PSVECSquareDistance(const Vec* a, const Vec* b) {
     nofralloc
 #include "asm/dolphin/mtx/vec/PSVECSquareDistance.s"
 }
@@ -165,7 +144,7 @@ asm void PSVECSquareDistance() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PSVECDistance() {
+asm float PSVECDistance(const Vec* a, const Vec* b) {
     nofralloc
 #include "asm/dolphin/mtx/vec/PSVECDistance.s"
 }

libs/dolphin/os/OS.cpp

@@ -22,7 +22,6 @@ struct daBgObj_c {
 //
 
 extern "C" void __OSFPRInit();
-extern "C" void OSGetConsoleType();
 extern "C" static void InquiryCallback();
 extern "C" void OSInit();
 extern "C" static void OSExceptionInit();
@@ -45,7 +44,6 @@ extern "C" void OSRegisterVersion();
 
 SECTION_INIT void memset();
 SECTION_INIT void memcpy();
-extern "C" void OSReport();
 extern "C" void PPCMtmmcr0();
 extern "C" void PPCMtmmcr1();
 extern "C" void PPCMtpmc1();
@@ -57,10 +55,6 @@ extern "C" void PPCMthid2();
 extern "C" void PPCDisableSpeculation();
 extern "C" void PPCSetFpNonIEEEMode();
 extern "C" void OSInitAlarm();
-extern "C" void OSGetArenaHi();
-extern "C" void OSGetArenaLo();
-extern "C" void OSSetArenaHi();
-extern "C" void OSSetArenaLo();
 extern "C" void __OSInitAudioSystem();
 extern "C" void DCInvalidateRange();
 extern "C" void DCFlushRangeNoSync();
@@ -70,13 +64,10 @@ extern "C" void __OSCacheInit();
 extern "C" void __OSContextInit();
 extern "C" void __OSUnhandledException();
 extern "C" void __OSGetExecParams();
-extern "C" void OSDisableInterrupts();
-extern "C" void OSEnableInterrupts();
 extern "C" void __OSSetInterruptHandler();
 extern "C" void __OSInterruptInit();
 extern "C" void __OSModuleInit();
 extern "C" void __OSInitMemoryProtection();
-extern "C" void OSGetResetCode();
 extern "C" void __OSResetSWInterruptHandler();
 extern "C" void __OSInitSram();
 extern "C" void __OSInitSystemCall();
@@ -132,7 +123,7 @@ asm void __OSFPRInit() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void OSGetConsoleType() {
+asm s32 OSGetConsoleType() {
     nofralloc
 #include "asm/dolphin/os/OS/OSGetConsoleType.s"
 }

libs/dolphin/os/OSCache.cpp

@@ -12,9 +12,7 @@
 //
 
 extern "C" static void DCEnable();
-extern "C" void DCInvalidateRange();
 extern "C" void DCFlushRange();
-extern "C" void DCStoreRange();
 extern "C" void DCFlushRangeNoSync();
 extern "C" void DCStoreRangeNoSync();
 extern "C" void DCZeroRange();
@@ -68,7 +66,7 @@ static asm void DCEnable() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void DCInvalidateRange() {
+asm void DCInvalidateRange(void*, u32) {
     nofralloc
 #include "asm/dolphin/os/OSCache/DCInvalidateRange.s"
 }
@@ -88,7 +86,7 @@ asm void DCFlushRange() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void DCStoreRange() {
+asm void DCStoreRange(void*, u32) {
     nofralloc
 #include "asm/dolphin/os/OSCache/DCStoreRange.s"
 }

libs/dolphin/pad/Pad.cpp

@@ -17,16 +17,9 @@ extern "C" static void PADOriginUpdateCallback();
 extern "C" static void PADProbeCallback();
 extern "C" static void PADTypeAndStatusCallback();
 extern "C" static void PADReceiveCheckCallback();
-extern "C" void PADReset();
-extern "C" void PADRecalibrate();
-extern "C" void PADInit();
-extern "C" void PADRead();
-extern "C" void PADControlMotor();
-extern "C" void PADSetSpec();
 extern "C" static void SPEC0_MakeStatus();
 extern "C" static void SPEC1_MakeStatus();
 extern "C" static void SPEC2_MakeStatus();
-extern "C" void PADSetAnalogMode();
 extern "C" static void OnReset();
 extern "C" static void SamplingHandler();
 extern "C" static void PADSetSamplingCallback();
@@ -265,7 +258,7 @@ static asm void PADReceiveCheckCallback() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PADReset() {
+asm s32 PADReset(PADMask mask) {
     nofralloc
 #include "asm/dolphin/pad/Pad/PADReset.s"
 }
@@ -275,7 +268,7 @@ asm void PADReset() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PADRecalibrate() {
+asm s32 PADRecalibrate(PADMask mask) {
     nofralloc
 #include "asm/dolphin/pad/Pad/PADRecalibrate.s"
 }
@@ -310,7 +303,7 @@ u8 __PADSpec[4 + 4 /* padding */];
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PADInit() {
+asm u32 PADInit() {
     nofralloc
 #include "asm/dolphin/pad/Pad/PADInit.s"
 }
@@ -320,7 +313,7 @@ asm void PADInit() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PADRead() {
+asm u32 PADRead(PADStatus*) {
     nofralloc
 #include "asm/dolphin/pad/Pad/PADRead.s"
 }
@@ -330,7 +323,7 @@ asm void PADRead() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PADControlMotor() {
+asm void PADControlMotor(s32 channel, u32 command) {
     nofralloc
 #include "asm/dolphin/pad/Pad/PADControlMotor.s"
 }
@@ -340,7 +333,7 @@ asm void PADControlMotor() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PADSetSpec() {
+asm void PADSetSpec(int spec) {
     nofralloc
 #include "asm/dolphin/pad/Pad/PADSetSpec.s"
 }
@@ -380,7 +373,7 @@ static asm void SPEC2_MakeStatus() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void PADSetAnalogMode() {
+asm void PADSetAnalogMode(u32 mode) {
     nofralloc
 #include "asm/dolphin/pad/Pad/PADSetAnalogMode.s"
 }