build bink (hopefully) and almost link console_z.cpp

Author: SamuraiOndo

configure.py

@@ -143,11 +143,11 @@
 
 # Tool versions
 config.binutils_tag = "2.42-1"
-config.compilers_tag = "20240706"
+config.compilers_tag = "20251015"
 config.dtk_tag = "v1.4.1"
 config.objdiff_tag = "v2.7.1"
 config.sjiswrap_tag = "v1.2.0"
-config.wibo_tag = "0.6.11"
+config.wibo_tag = "1.0.0-alpha.4"
 
 # Project
 config.config_path = Path("config") / config.version / "config.yml"
@@ -211,38 +211,18 @@
     "-O4,p",
 ]
 cflags_bink_base = [
-    "-nodefaults",
-    "-proc gekko",
-    "-align powerpc",
-    "-enum int",
-    "-fp hardware",
-    "-Cpp_exceptions off",
-    # "-W all",
-    '-pragma "cats off"',
-    '-pragma "warn_notinlined off"',
-    "-maxerrors 1",
-    "-nosyspath",
-    "-fp_contract on",
-    "-str reuse",
-    "-multibyte",  # For Wii compilers, replace with `-enc SJIS`
-    f"-i build/{config.version}/include",
-    "-ir src/3rdParty/dolphin",
-    "-ir include",
-    "-i src/3rdParty/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include",
-    "-i src/3rdParty/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include",
-    "-i src/3rdParty/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include",
-    "-i src/3rdParty/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include",
-    "-i src/3rdParty/PowerPC_EABI_Support/Runtime/Inc",
-    "-i src/3rdParty/PowerPC_EABI_Support/MetroTRK",
-    "-i include/dolphin",
-    "-i include",
-    "-i src/3rdParty/bink/includes",
-    f"-DBUILD_VERSION={version_num}",
-    f"-DVERSION_{config.version}",
+    "-O3",
+    "-mcpu=750",
+    "-fno-exceptions",
+    "-Wno-inline",
+    "-nostdinc",
+    "-I src/3rdParty/dolphin",
+    "-I include",
+    "-I include/dolphin",
     "-D__GEKKO__",
-    "-O4,s",
-    "-sdata 0",
-    "-sdata2 0"
+    "-I src/3rdParty/bink/includes",
+    "-I src/3rdParty/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include",
+    "-G0",
 ]
 cflags_noopt = cflags_base[:]
 
@@ -1349,7 +1329,7 @@ def MatchingFor(*versions):
     },
     {
         "lib": "bink",
-        "mw_version": config.linker_version,
+        "mw_version": "ProDG/3.5",
         "cflags": cflags_bink_base,
         "progress_category": "bink",  # str | List[str]
         "objects": [

src/3rdParty/bink/includes/bink_types.h

@@ -8,34 +8,6 @@ typedef signed long long S64;
 typedef unsigned char U8;
 typedef unsigned short U16;
 typedef unsigned long U32;
-#ifndef _SIZE_T_DEF
-#define _SIZE_T_DEF
-typedef unsigned long size_t;
-#endif
-typedef unsigned long long u64;
-typedef unsigned int uint;
-
-typedef float f32;
-typedef double f64;
-typedef volatile f32 vf32;
-typedef volatile f64 vf64;
-
-typedef int BOOL;
-
-// Pointer to unknown, to be determined at a later date.
-typedef void* unkptr;
-typedef U32 unknown;
 
-#define TRUE 1
-#define FALSE 0
-
-#ifndef NULL
-#ifndef __cplusplus
-#define NULL ((void*)0)
-#else
-#define NULL 0
-#endif
-#endif
-#define nullptr 0
 
 #endif

src/3rdParty/bink/includes/radmem.h

@@ -1,7 +1,7 @@
 #ifndef _RADMEM_H_
 #define _RADMEM_H_
 #include "bink_types.h"
-#include "OSAlloc.h"
+#include "OS/OSAlloc.h"
 
 typedef void *(*RADMEMALLOC)(U32 size);
 typedef void (*RADMEMFREE)(void* mem);
@@ -12,10 +12,7 @@ void radfree(void* ptr);
 
 extern volatile OSHeapHandle __OSCurrHeap;
 
-#pragma push
-#pragma section ".data" ".data"
-__declspec(section ".data") RADMEMALLOC usermalloc = NULL;
-__declspec(section ".data") RADMEMFREE userfree = NULL;
-#pragma pop
+RADMEMALLOC usermalloc = 0;
+RADMEMFREE userfree = 0;
 
 #endif

src/3rdParty/bink/src/sdk/decode/ngc/binkngc.c

@@ -5,24 +5,3 @@ U32 mult64anddiv(U32 m1, U32 m2, U32 d) {
 }
 
 //mult64andshiftgoeshere
-
-void radmemset16(register void* dest, register U16 value, register U32 size) {
-    asm {
-        srwi r9, size, 1
-        slwi r0, value, 16
-        cmpwi r9, 0
-        or r0, r0, value
-        subi r9, r9, 1
-        beq loop_exit
-    loop:
-        stw r0, 0(dest)
-        cmpwi r9, 0
-        addi dest, dest, 4
-        subi r9, r9, 1
-        bne loop
-    loop_exit:
-        andi. r0, size, 1
-        beqlr
-        sth value, 0(dest)
-    }
-}

src/3rdParty/shared/memory/ngc/radmem.c

@@ -1,97 +1,56 @@
 #include "radmem.h"
 #include "os/OSAlloc.h"
 
-#pragma optimizewithasm off
-asm void RADSetMemory(register RADMEMALLOC malloc_fn, register RADMEMFREE free_fn) {
-    lis r9, usermalloc@ha
-    lis r11, userfree@ha
-    stw r3, usermalloc@l(r9)
-    stw r4, userfree@l(r11)
+void RADSetMemory(RADMEMALLOC malloc_fn, RADMEMFREE free_fn) {
+    usermalloc = malloc_fn;
+    userfree = free_fn;
 }
 
-asm void* radmalloc(register U32 size)
+void* radmalloc(U32 size)
 {
-    nofralloc
-    stwu r1, -0x10(r1)
-    mflr r0
-    stw r31, 0xc(r1)
-    stw r0, 0x14(r1)
-    mr. r3, r3
-    beq ret0
-    cmpwi r3, -0x1
-    beq ret0
-    lis r9, usermalloc@ha
-    addi r31, r3, 0x40
-    lwz r0, usermalloc@l(r9)
-    cmpwi r0, 0x0
-    beq osHeapAlloc
-    mr r3, r31
-    mtlr r0
-    blrl
-    mr. r3, r3
-    beq osHeapAlloc
-    cmpwi r3, -0x1
-    beq ret0
-    li r9, 0x3
-    b setupPreMallocInfo
-osHeapAlloc:
-    lis r9, __OSCurrHeap@ha
-    mr r4, r31
-    lwz r3, __OSCurrHeap@l(r9)
-    bl OSAllocFromHeap
-    mr. r3, r3
-    bne setFlag
-ret0:
-    li r3, 0
-    b ret
-setFlag:
-    li r9, 0
-setupPreMallocInfo:
-    clrlwi r0, r3, 27
-    cmpwi r9,3 
-    subfic r0, r0, 0x40
-    clrlwi r0, r0, 24
-    add r3, r3, r0
-    stb r0, -1(r3)
-    stb r9, -2(r3)
-    bne ret
-    lis r9, userfree@ha
-    lwz r0, userfree@l(r9)
-    stw r0, -8(r3)
-ret:
-    lwz r0, 0x14(r1)
-    mtlr r0
-    lwz r31, 0xc(r1)
-    addi r1, r1, 0x10
-    blr
+    U32 request;
+    void *rawBlock;
+    U8 fromUser;
+    U32 addr;
+    U32 offset;
+    U8 *aligned;
+    if (size == 0 || size == 0xFFFFFFFF)
+        return 0;
+    request   = size + 0x40;
+    if (usermalloc != 0 && (rawBlock = usermalloc(request))) {
+        if (rawBlock != 0 && rawBlock != (void *)-1) {
+            fromUser = 3;
+        } else {
+            return 0;
+        }
+    } else {
+        rawBlock = OSAllocFromHeap(__OSCurrHeap, request);
+        if (rawBlock == 0) {
+            return 0;
+        }
+        fromUser= 0;
+    }
+    addr    = (U32)rawBlock;
+    offset  = (U32)(0x40 - (addr & 0x1F)) & 0xFF;
+    aligned  = (U8 *)rawBlock + offset;
+    aligned[-1] = (U8)offset;   
+    aligned[-2] = fromUser;        
+    if (fromUser == 3)      
+        *(void **)(aligned - 8) = (void *)userfree;
+    return aligned;
 }
 
-asm void radfree(register void* ptr) {
-    // this should autogenerate??
-    nofralloc
-    stwu r1,-8(r1)
-    mflr r0
-    stw r0,0xc(r1)
-    mr. r11, ptr
-    beq exit
-    lbz r0,-2(r11)
-    cmpwi r0,3
-    bne free
-    lbz r3,-1(r11)
-    lwz r9,-8(r11)
-    subf r3,r3,r11
-    mtlr r9
-    blrl
-    b exit
-free:
-    lis r9,__OSCurrHeap@ha
-    lbz r4,-1(r11)
-    lwz r3,__OSCurrHeap@l(r9)
-    subf r4,r4,r11
-    bl OSFreeToHeap
-exit:
-    lwz r0,0xc(r1)
-    mtlr r0
-    addi r1,r1,8
-    blr
+void radfree(void* ptr) {
+    U8* ptrU8 = (U8*) ptr;
+    U32* ptrU32 = (U32*) ptr;
+    void (*customFree)(void*);
+    if (ptr) {
+        if ((ptrU8[-2]) == 3) {
+            customFree = (RADMEMFREE)(ptrU32[-2]);
+            customFree(ptrU8 - ptrU8[-1]);
+        }
+        else {
+            OSFreeToHeap(__OSCurrHeap, ptrU8 - ptrU8[-1]);
+        }
+    }
 }

src/Engine/Bitmap_Z.cpp

@@ -311,4 +311,22 @@ void Bitmap_Z::SetPoint(S32 i_X, S32 i_Y, const Color& i_Color) {
     }
 }
 
+void Bitmap_Z::SetPoint(U8* i_Datas, U8 i_Format, S32 i_X, S32 i_Y, const Color& i_Color) {
+    U8 l_Red = i_Color.r * 255.0f;
+    U8 l_Green = i_Color.g * 255.0f;
+    U8 l_Blue = i_Color.b * 255.0f;
+    U8 l_Alpha = i_Color.a * 255.0f;
+    switch (i_Format) {
+        case BM_8888:
+            i_Datas[0] = l_Blue;
+            i_Datas[1] = l_Green;
+            i_Datas[2] = l_Red;
+            i_Datas[3] = l_Alpha;
+            break;
+        case BM_888:
+            i_Datas[0] = l_Blue;
+            i_Datas[1] = l_Green;
+            i_Datas[2] = l_Red;
+    }
+}
 #pragma dont_inline off

src/Engine/Console_Z.cpp

@@ -8,6 +8,7 @@
 #include "ConsoleInterp_Z.h"
 #include "Renderer_Z.h"
 #include "File_Z.h"
+#include "ConsoleInterp_ZHdl.h"
 Extern_Z GCGlobals gData;
 
 Console_Z::Console_Z()
@@ -133,7 +134,7 @@ U32 Console_Z::GetCurrentInterpSize() {
     return 0;
 }
 
-Bool DisplayHelp() {
+Bool Help() {
     gData.Cons->DisplayHelp();
     return TRUE;
 }
@@ -146,11 +147,7 @@ Bool Pause() {
 
 void Console_Z::InterpFile() {
     if (gData.Cons->GetInterp() == NULL) {
-        BaseObject_ZHdl& l_InterpHdl = gData.ClassMgr->NewObject(Name_Z::GetID("ConsoleInterp_Z", 0), Name_Z::GetID("ConsoleInterp", 0));
-        BaseObject_ZHdl l_BObj;
-        l_BObj = l_InterpHdl;
-        BaseObject_Z* l_Interp = l_BObj;
-        m_Interp = (ConsoleInterp_Z*)l_Interp;
+        m_Interp = (ConsoleInterp_ZHdl)gData.ClassMgr->NewObject(Name_Z::GetID("ConsoleInterp_Z", 0), Name_Z::GetID("ConsoleInterp", 0));
         m_Interp->Deactivate();
     }
     GetInterp()->Start(m_StrParam[1], &m_StrParam[0], GetNbParam());

src/Engine/includes/ConsoleInterp_ZHdl.h

@@ -0,0 +1,10 @@
+#ifndef _CONSOLEINTERP_ZHDL_H_
+#define _CONSOLEINTERP_ZHDL_H_
+#include "ConsoleInterp_Z.h"
+#include "Handle_Z.h"
+#include "Manipulator_ZHdl.h"
+
+class ConsoleInterp_Z;
+HANDLE_Z(ConsoleInterp_Z, Manipulator_Z);
+
+#endif

src/Engine/includes/Console_Z.h

@@ -31,8 +31,7 @@ struct ConsoleUnkBuffer_Z {
     U8 m_UnkBuf0x0[4976];
 
     ConsoleUnkBuffer_Z() {
-        memset(&m_UnkBuf0x0, 0, (int)this + (sizeof(m_UnkBuf0x0) - (int)m_UnkBuf0x0));
-    }
+        memset(&m_UnkBuf0x0, 0, (long) ((long)m_UnkBuf0x0 + sizeof(m_UnkBuf0x0)) - ( long)&m_UnkBuf0x0);    }
 };
 
 enum ConsoleId {