Splat and ultralib fixes

Makefile

@@ -57,6 +57,8 @@ PYTHON ?= $(VENV)/$(VENV_BIN_DIR)/python3
 # Emulator w/ flags
 N64_EMULATOR ?=
 
+PROJECT_DIR   := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
 
 BASEROM_DIR := baseroms/$(VERSION)
 BASEROM     := $(BASEROM_DIR)/baserom.z64
@@ -106,6 +108,7 @@ endif
 
 CC              := tools/ido/$(DETECTED_OS)/7.1/cc
 CC_OLD          := tools/ido/$(DETECTED_OS)/5.3/cc
+CC_ULTRALIB 	:= $(PROJECT_DIR)/$(CC_OLD)
 
 AR              := ar
 AS              := $(CROSS)as
@@ -306,7 +309,7 @@ $(LIBULTRA_LIB): $(ULTRALIB_LIB)
 	$(LIBDUMP_CMD)
 
 $(ULTRALIB_LIB):
-	$(MAKE) -C lib/ultralib VERSION=$(ULTRALIB_VERSION) TARGET=$(ULTRALIB_TARGET) FIXUPS=1 CROSS=$(CROSS) CC=../../$(CC_OLD)
+	$(MAKE) -C lib/ultralib VERSION=$(ULTRALIB_VERSION) TARGET=$(ULTRALIB_TARGET) MODERN_LD=1 CROSS=$(CROSS) COMPILER_DIR=$(dir $(CC_ULTRALIB)) AR=$(AR)
 
 $(BUILD_DIR)/%.ld: %.ld
 	$(CPP) $(CPPFLAGS) $(BUILD_DEFINES) $(IINC) $< > $@

include/gfxprint.h

@@ -75,9 +75,9 @@ void gfxprint_locate8x8(gfxprint* this, s32 x, s32 y);
 void gfxprint_setoffset(gfxprint* this, s32 x, s32 y);
 void gfxprint_putc1(gfxprint* this, char c);
 void gfxprint_putc(gfxprint* this, char c);
-void gfxprint_write(gfxprint* this, const void* buffer, s32 size, s32 n);
+void gfxprint_write(gfxprint* this, const void* buffer, size_t size, size_t n);
 void gfxprint_puts(gfxprint* this, const char* buffer);
-void* gfxprint_prout(void* this, const char* buffer, s32 n);
+void* gfxprint_prout(void* this, const char* buffer, size_t n);
 void gfxprint_init(gfxprint* this);
 void gfxprint_cleanup(gfxprint* this);
 void gfxprint_open(gfxprint* this, Gfx* gListp);

requirements.txt

@@ -1,4 +1,4 @@
-splat64[mips]>=0.21.11,<1.0.0
+splat64[mips]>=0.32.1,<1.0.0
 mapfile-parser>=2.3.5,<3.0.0
 
 # asm-differ

src/main/O2/65430.c

@@ -1,6 +1,6 @@
 #include "global.h"
 
-#include "lib/ultralib/src/io/viint.h"
+#include "PRinternal/viint.h"
 
 #include "fault.h"
 #include "segment_symbols.h"

src/main/O2/aprintf.c

@@ -1,7 +1,7 @@
 #include "aprintf.h"
 
 s32 vaprintf(PrintCallback* func, const char* fmt, va_list ap) {
-    return _Printf((outfun*)*func, (char*)func, fmt, ap);
+    return _Printf(*func, func, fmt, ap);
 }
 
 s32 aprintf(PrintCallback* func, const char* fmt, ...) {

src/main/O2/gfxprint.c

@@ -173,7 +173,7 @@ void gfxprint_putc(gfxprint* this, char c) {
     }
 }
 
-void gfxprint_write(gfxprint* this, const void* buffer, s32 size, s32 n) {
+void gfxprint_write(gfxprint* this, const void* buffer, size_t size, size_t n) {
     const char* buf = (const char*)buffer;
     s32 i;
 
@@ -188,14 +188,14 @@ void gfxprint_puts(gfxprint* this, const char* buffer) {
     }
 }
 
-void* gfxprint_prout(void* this, const char* buffer, s32 n) {
+void* gfxprint_prout(void* this, const char* buffer, size_t n) {
     gfxprint_write(this, buffer, sizeof(char), n);
     return this;
 }
 
 void gfxprint_init(gfxprint* this) {
     gfxprint_clrOpened(this);
-    this->proutFunc = (PrintCallback)gfxprint_prout;
+    this->proutFunc = gfxprint_prout;
     this->gListp = NULL;
     this->posX = 0;
     this->posY = 0;

src/main/fault.c

@@ -115,7 +115,7 @@ typedef struct FaultDrawerPos {
     /* 0x4 */ s32 y;
 } FaultDrawerPos;
 
-void* Fault_PrintCallback(char* arg, const char* fmt, size_t count) {
+void* Fault_PrintCallback(void* arg, const char* fmt, size_t count) {
     FaultDrawerPos* pos = (FaultDrawerPos*)arg;
 
     for (; count > 0; count--) {
@@ -135,7 +135,7 @@ s32 Fault_Printf(s32 x, s32 y, const char* fmt, ...) {
 
     pos.x = x;
     pos.y = y;
-    ret = _Printf((outfun*)*Fault_PrintCallback, (char*)&pos, fmt, ap);
+    ret = _Printf(*Fault_PrintCallback, (char*)&pos, fmt, ap);
 
     va_end(ap);
 

src/main/vimode.c

@@ -1,7 +1,7 @@
 #include "vimode.h"
 
 #include "stdbool.h"
-#include "lib/ultralib/src/io/viint.h"
+#include "PRinternal/viint.h"
 
 #include "attributes.h"
 #include "macros.h"

tools/splat_ext/font.py

@@ -2,10 +2,10 @@
 from pathlib import Path
 
 from splat.util import options, log
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 
 
-class N64SegFont(N64Segment):
+class N64SegFont(Segment):
     def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml):
         super().__init__(
             rom_start, rom_end, type, name, vram_start, args=args, yaml=yaml

yamls/us/header.yaml

@@ -43,7 +43,6 @@ options:
   asm_function_macro: glabel
   asm_jtbl_label_macro: jlabel
   asm_data_macro: dlabel
-  include_macro_inc: False
   libultra_symbols: True
   hardware_regs: True
   asm_emit_size_directive: False