mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-12 19:04:38 +00:00
Code Issues Projects Releases Wiki Activity

Enable int-conversion warnings and fix all current instances (#1280)

Browse source 
* Enable int-conversion warnings for gcc/clang

* Fix all current int-conversion warnings

* Run format.sh

* Apply review suggestions
This commit is contained in:
Roman971 2022-06-16 02:15:44 +02:00 • committed by GitHub
parent 5299208291
commit 08c8126ba5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 225 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/code/main.c
View file

@ -39,8 +39,8 @@ void Main(void* arg) {
OSMesg irqMgrMsgBuf[60];
u32 systemHeapStart;
u32 fb;
s32 debugHeapStart;
s32 debugHeapSize;
u32 debugHeapStart;
u32 debugHeapSize;
s16* msg;
osSyncPrintf("mainproc 実行開始\n"); // "Start running"
@ -55,16 +55,16 @@ void Main(void* arg) {
gSystemHeapSize = fb - systemHeapStart;
// "System heap initalization"
osSyncPrintf("システムヒープ初期化 %08x-%08x %08x\n", systemHeapStart, fb, gSystemHeapSize);
SystemHeap_Init(systemHeapStart, gSystemHeapSize); // initializes the system heap
SystemHeap_Init((void*)systemHeapStart, gSystemHeapSize); // initializes the system heap
if (osMemSize >= 0x800000) {
debugHeapStart = SysCfb_GetFbEnd();
debugHeapSize = PHYS_TO_K0(0x600000) - debugHeapStart;
} else {
debugHeapSize = 0x400;
debugHeapStart = SystemArena_MallocDebug(debugHeapSize, "../main.c", 565);
debugHeapStart = (u32)SystemArena_MallocDebug(debugHeapSize, "../main.c", 565);
}
osSyncPrintf("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize);
DebugArena_Init(debugHeapStart, debugHeapSize);
DebugArena_Init((void*)debugHeapStart, debugHeapSize);
func_800636C0();
R_ENABLE_ARENA_DBG = 0;