summaryrefslogtreecommitdiff
path: root/src/m_Do/m_Do_machine.cpp
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2025-11-30 14:23:42 -0800
committerGitHub <noreply@github.com>2025-11-30 15:23:42 -0700
commita6e76c0841cae03cae0c0e6ac75c32f979043093 (patch)
tree76b5f590c59c6abdf2c80d0a3d5c0ccb31ebd0fe /src/m_Do/m_Do_machine.cpp
parent434415337d268e405b09f6b72935a7e918e4cfe7 (diff)
project cleanup (#2895)
* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
Diffstat (limited to 'src/m_Do/m_Do_machine.cpp')
-rw-r--r--src/m_Do/m_Do_machine.cpp28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index a3c53ef74b..54caefa88e 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -26,7 +26,6 @@
#include "m_Do/m_Do_main.h"
#include "DynamicLink.h"
-/* 80450BF0-80450BF4 0000F0 0004+00 1/1 0/0 0/0 .sbss None */
#if DEBUG
u8 mDoMch::mDebugFill = true;
u8 mDoMch::mDebugFillNotUse = 0xDD;
@@ -42,29 +41,21 @@ u8 mDoMch::GXWarningExecuteFrame;
u8 mDoMch::mDebugFill;
#endif
-/* 80450BF4-80450BF8 0000F4 0004+00 1/1 0/0 0/0 .sbss solidHeapErrors */
static int solidHeapErrors;
-/* 80450BF8-80450BFC 0000F8 0004+00 1/1 0/0 0/0 .sbss gameHeapErrors */
static int gameHeapErrors;
-/* 80450BFC-80450C00 0000FC 0004+00 1/1 0/0 0/0 .sbss zeldaHeapErrors */
static int zeldaHeapErrors;
-/* 80450C00-80450C04 000100 0004+00 1/1 0/0 0/0 .sbss commandHeapErrors */
static int commandHeapErrors;
-/* 80450C04-80450C08 000104 0004+00 1/1 0/0 0/0 .sbss archiveHeapErrors */
static int archiveHeapErrors;
-/* 80450C08-80450C0C 000108 0004+00 1/1 0/0 0/0 .sbss unknownHeapErrors */
static int unknownHeapErrors;
-/* 80450C0C-80450C10 00010C 0004+00 1/1 0/0 0/0 .sbss heapErrors */
static u32 heapErrors;
#if VERSION == VERSION_GCN_USA || VERSION == VERSION_GCN_JPN
-/* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data g_ntscZeldaIntDf */
GXRenderModeObj g_ntscZeldaIntDf = {
VI_TVMODE_NTSC_INT,
608,
@@ -92,7 +83,6 @@ GXRenderModeObj g_ntscZeldaIntDf = {
{8, 8, 10, 12, 10, 8, 8},
};
-/* 803A2F9C-803A2FD8 0000BC 003C+00 1/1 1/1 0/0 .data g_ntscZeldaProg */
GXRenderModeObj g_ntscZeldaProg = {
VI_TVMODE_NTSC_PROG,
608,
@@ -120,7 +110,6 @@ GXRenderModeObj g_ntscZeldaProg = {
{0, 0, 21, 22, 21, 0, 0},
};
#elif VERSION == VERSION_GCN_PAL
-/* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data g_ntscZeldaIntDf */
GXRenderModeObj g_ntscZeldaIntDf = {
VI_TVMODE_PAL_INT,
608,
@@ -148,7 +137,6 @@ GXRenderModeObj g_ntscZeldaIntDf = {
{8, 8, 10, 12, 10, 8, 8},
};
-/* 803A2F9C-803A2FD8 0000BC 003C+00 1/1 1/1 0/0 .data g_ntscZeldaProg */
GXRenderModeObj g_ntscZeldaProg = {
VI_TVMODE_EURGB60_INT,
608,
@@ -254,12 +242,8 @@ GXRenderModeObj g_palZeldaProg60 = {
};
#endif
-/* 804505A0-804505A8 -00001 0004+04 1/1 3/3 0/0 .sdata mRenderModeObj__15mDoMch_render_c
- */
GXRenderModeObj* mDoMch_render_c::mRenderModeObj = &g_ntscZeldaIntDf;
-/* 8000B1EC-8000B3EC 005B2C 0200+00 2/2 0/0 0/0 .text myGetHeapTypeByString__FP7JKRHeap
- */
static const char* myGetHeapTypeByString(JKRHeap* p_heap) {
static char tmpString[5];
@@ -318,7 +302,6 @@ static const char* myGetHeapTypeByString(JKRHeap* p_heap) {
}
}
-/* 8000B3EC-8000B5C8 005D2C 01DC+00 1/1 0/0 0/0 .text myMemoryErrorRoutine__FPvUli */
static void myMemoryErrorRoutine(void* p_heap, u32 size, int alignment) {
JKRHeap* heap = (JKRHeap*)p_heap;
@@ -363,7 +346,6 @@ static void myMemoryErrorRoutine(void* p_heap, u32 size, int alignment) {
}
}
-/* 8000B5C8-8000B668 005F08 00A0+00 1/1 0/0 0/0 .text myHeapCheckRecursive__FP7JKRHeap */
void myHeapCheckRecursive(JKRHeap* p_heap) {
if (!p_heap->check()) {
const char* type = myGetHeapTypeByString(p_heap);
@@ -376,12 +358,10 @@ void myHeapCheckRecursive(JKRHeap* p_heap) {
}
}
-/* 8000B668-8000B68C 005FA8 0024+00 0/0 2/2 0/0 .text mDoMch_HeapCheckAll__Fv */
void mDoMch_HeapCheckAll() {
myHeapCheckRecursive(JKRHeap::sRootHeap);
}
-/* 8000B68C-8000B73C 005FCC 00B0+00 1/1 0/0 0/0 .text developKeyCheck__FUlUl */
static int developKeyCheck(u32 btnTrig, u32 btnHold) {
static u8 key_link;
static u8 key_ganon;
@@ -413,17 +393,14 @@ static int developKeyCheck(u32 btnTrig, u32 btnHold) {
return mDoMain::developmentMode;
}
-/* 8000B73C-8000B768 00607C 002C+00 1/1 0/0 0/0 .text mDoMch_IsProgressiveMode__Fv */
BOOL mDoMch_IsProgressiveMode() {
return OSGetProgressiveMode() == true;
}
-/* 8000B768-8000B798 0060A8 0030+00 2/2 0/0 0/0 .text exceptionReadPad__FPUlPUl */
bool exceptionReadPad(u32* p_btnTrig, u32* p_btnHold) {
return JUTException::getManager()->readPad(p_btnTrig, p_btnHold);
}
-/* 8000B798-8000B7C8 0060D8 0030+00 1/1 0/0 0/0 .text exceptionRestart__Fv */
void exceptionRestart() {
mDoRst_reset(0, 0, 0);
OSResetSystem(0, 0, 0);
@@ -431,7 +408,6 @@ void exceptionRestart() {
} while (true);
}
-/* 8000B7C8-8000B95C 006108 0194+00 1/1 0/0 0/0 .text myExceptionCallback__FUsP9OSContextUlUl */
void myExceptionCallback(u16, OSContext*, u32, u32) {
u32 btnHold;
u32 btnTrig;
@@ -488,7 +464,6 @@ void myExceptionCallback(u16, OSContext*, u32, u32) {
VIFlush();
}
-/* 8000B95C-8000BCF4 00629C 0398+00 1/1 0/0 0/0 .text fault_callback_scroll__FUsP9OSContextUlUl */
static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) {
JUTException* manager = JUTException::getManager();
JUTConsole* exConsole = manager->getConsole();
@@ -610,19 +585,16 @@ static void dummy_string() {
DEAD_STRING("\x1B[32m%-24s = size=%d KB\n\x1B[m");
}
-/* 8000BCF4-8000BCF8 006634 0004+00 1/1 0/0 0/0 .text my_PrintHeap__FPCcUl */
static void my_PrintHeap(char const* heapName, u32 heapSize) {
OS_REPORT("\x1b[32m%-24s = size=%d KB\n\x1b[m", heapName, heapSize / 1024);
}
-/* 8000BCF8-8000BD44 006638 004C+00 1/1 0/0 0/0 .text my_SysPrintHeap__FPCcPvUl */
void my_SysPrintHeap(char const* message, void* start, u32 size) {
uintptr_t end = (uintptr_t)start + size;
OSReport_System("\x1b[32m%-24s = %08x-%08x size=%d KB\n\x1b[m", message, start,
end, size / 1024);
}
-/* 8000BD44-8000C0CC 006684 0388+00 0/0 2/1 0/0 .text mDoMch_Create__Fv */
int mDoMch_Create() {
if (mDoMain::developmentMode == 0 || !(OSGetConsoleType() & 0x10000000)) {
OSReportDisable();