mirror of
https://github.com/HackerN64/HackerOoT.git
synced 2026-01-21 10:37:37 -08:00
Use IDO for assembling handwritten asm files in src (#2390)
* as0 * Fix ASOPTFLAGS for src/libc, remove unnecessary noreorder region in kanread * Suggested changes * Use %half to load the boot bss size for matching Co-authored-by: cadmic <cadmic24@gmail.com> * Wrap all of __osProbeTLB in noreorder --------- Co-authored-by: cadmic <cadmic24@gmail.com>
This commit is contained in:
Tharo
GitHub
89
Makefile
89
Makefile
@@ -41,6 +41,8 @@ VERSION ?= gc-eu-mq-dbg
|
||||
N_THREADS ?= $(shell nproc)
|
||||
# Check code syntax with host compiler.
|
||||
RUN_CC_CHECK ?= 1
|
||||
# If DEBUG_OBJECTS is 1, produce additional debugging files such as objdump output or raw binaries for assets
|
||||
DEBUG_OBJECTS ?= 0
|
||||
# Set prefix to mips binutils binaries (mips-linux-gnu-ld => 'mips-linux-gnu-') - Change at your own risk!
|
||||
# In nearly all cases, not having 'mips-linux-gnu-*' binaries on the PATH indicates missing dependencies.
|
||||
MIPS_BINUTILS_PREFIX ?= mips-linux-gnu-
|
||||
@@ -56,6 +58,7 @@ N64_EMULATOR ?=
|
||||
# DEBUG_FEATURES ?= 1
|
||||
|
||||
CFLAGS ?=
|
||||
CCASFLAGS ?=
|
||||
CPPFLAGS ?=
|
||||
CPP_DEFINES ?=
|
||||
|
||||
@@ -239,6 +242,7 @@ else
|
||||
CPP_DEFINES += -DDEBUG_FEATURES=0 -DNDEBUG
|
||||
OPTFLAGS := -O2 -g3
|
||||
endif
|
||||
ASOPTFLAGS := -O1
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
DETECTED_OS=windows
|
||||
@@ -261,9 +265,11 @@ endif
|
||||
# Detect compiler and set variables appropriately.
|
||||
ifeq ($(COMPILER),gcc)
|
||||
CC := $(MIPS_BINUTILS_PREFIX)gcc
|
||||
CCAS := $(CC) -x assembler-with-cpp
|
||||
else ifeq ($(COMPILER),ido)
|
||||
CC := tools/ido_recomp/$(DETECTED_OS)/7.1/cc
|
||||
CC_OLD := tools/ido_recomp/$(DETECTED_OS)/5.3/cc
|
||||
CCAS := $(CC_OLD)
|
||||
else
|
||||
$(error Unsupported compiler. Please use either ido or gcc as the COMPILER variable.)
|
||||
endif
|
||||
@@ -276,8 +282,9 @@ ifeq ($(ORIG_COMPILER),1)
|
||||
$(error Please install qemu-irix package or set QEMU_IRIX env var to the full qemu-irix binary path)
|
||||
endif
|
||||
endif
|
||||
CC = $(QEMU_IRIX) -L tools/ido7.1_compiler tools/ido7.1_compiler/usr/bin/cc
|
||||
CC_OLD = $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc
|
||||
CC := $(QEMU_IRIX) -L tools/ido7.1_compiler tools/ido7.1_compiler/usr/bin/cc
|
||||
CC_OLD := $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc
|
||||
CCAS := $(CC)
|
||||
endif
|
||||
|
||||
AS := $(MIPS_BINUTILS_PREFIX)as
|
||||
@@ -285,6 +292,7 @@ LD := $(MIPS_BINUTILS_PREFIX)ld
|
||||
OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy
|
||||
OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump
|
||||
NM := $(MIPS_BINUTILS_PREFIX)nm
|
||||
STRIP := $(MIPS_BINUTILS_PREFIX)strip
|
||||
|
||||
# The default iconv on macOS has some differences from GNU iconv, so we use the Homebrew version instead
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
@@ -328,8 +336,18 @@ SBCFLAGS := --matching
|
||||
SFCFLAGS := --matching
|
||||
|
||||
CFLAGS += $(CPP_DEFINES)
|
||||
CCASFLAGS := $(CPP_DEFINES)
|
||||
CPPFLAGS += $(CPP_DEFINES)
|
||||
|
||||
# Extra debugging steps
|
||||
ifeq ($(DEBUG_OBJECTS),1)
|
||||
OBJDUMP_CMD = @$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s)
|
||||
OBJCOPY_CMD = @$(OBJCOPY) -O binary $@ $(@:.o=.bin)
|
||||
else
|
||||
OBJDUMP_CMD = @:
|
||||
OBJCOPY_CMD = @:
|
||||
endif
|
||||
|
||||
ifeq ($(COMPILER),gcc)
|
||||
OPTFLAGS := -Os -ffast-math -fno-unsafe-math-optimizations
|
||||
endif
|
||||
@@ -348,12 +366,14 @@ ASFLAGS := -march=vr4300 -32 -no-pad-sections -Iinclude -I$(EXTRACTED_DIR)
|
||||
|
||||
ifeq ($(COMPILER),gcc)
|
||||
CFLAGS += -G 0 -nostdinc $(INC) -march=vr4300 -mfix4300 -mabi=32 -mno-abicalls -mdivide-breaks -fno-PIC -fno-common -ffreestanding -fbuiltin -fno-builtin-sinf -fno-builtin-cosf $(CHECK_WARNINGS) -funsigned-char
|
||||
CCASFLAGS += -G 0 -nostdinc $(INC) -march=vr4300 -mfix4300 -mabi=32 -mno-abicalls -fno-PIC -fno-common -Wa,-no-pad-sections
|
||||
MIPS_VERSION := -mips3
|
||||
else
|
||||
# Suppress warnings for wrong number of macro arguments (to fake variadic
|
||||
# macros) and Microsoft extensions such as anonymous structs (which the
|
||||
# compiler does support but warns for their usage).
|
||||
CFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(INC) -Wab,-r4300_mul -woff 516,609,649,838,712,807
|
||||
CCASFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(INC) -Wab,-r4300_mul -woff 516,609,649,838,712,807 -o32
|
||||
MIPS_VERSION := -mips2
|
||||
endif
|
||||
|
||||
@@ -482,7 +502,8 @@ O_FILES := $(foreach f,$(S_FILES:.s=.o),$(BUILD_DIR)/$f) \
|
||||
$(foreach f,$(ASSET_C_FILES_EXTRACTED:.c=.o),$(f:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%)) \
|
||||
$(foreach f,$(ASSET_C_FILES_COMMITTED:.c=.o),$(BUILD_DIR)/$f) \
|
||||
$(foreach f,$(BASEROM_BIN_FILES),$(BUILD_DIR)/baserom/$(notdir $f).o) \
|
||||
$(BUILD_DIR)/src/code/z_message_z_game_over.o
|
||||
$(BUILD_DIR)/src/code/z_message_z_game_over.o \
|
||||
$(BUILD_DIR)/src/makerom/ipl3.o
|
||||
|
||||
OVL_RELOC_FILES := $(shell $(CPP) $(CPPFLAGS) $(SPEC) | $(BUILD_DIR_REPLACE) | grep -o '[^"]*_reloc.o' )
|
||||
|
||||
@@ -545,8 +566,10 @@ $(BUILD_DIR)/src/code/jpegdecoder.o: CC := $(CC_OLD)
|
||||
|
||||
ifeq ($(DEBUG_FEATURES),1)
|
||||
$(BUILD_DIR)/src/libc/%.o: OPTFLAGS := -g
|
||||
$(BUILD_DIR)/src/libc/%.o: ASOPTFLAGS := -g
|
||||
else
|
||||
$(BUILD_DIR)/src/libc/%.o: OPTFLAGS := -O2
|
||||
$(BUILD_DIR)/src/libc/%.o: ASOPTFLAGS := -O2
|
||||
endif
|
||||
|
||||
$(BUILD_DIR)/src/libc64/%.o: OPTFLAGS := -O2
|
||||
@@ -573,6 +596,13 @@ $(BUILD_DIR)/src/libultra/libc/ll.o: MIPS_VERSION := -mips3 -32
|
||||
$(BUILD_DIR)/src/libultra/libc/llcvt.o: OPTFLAGS := -O1
|
||||
$(BUILD_DIR)/src/libultra/libc/llcvt.o: MIPS_VERSION := -mips3 -32
|
||||
|
||||
$(BUILD_DIR)/src/libultra/os/exceptasm.o: MIPS_VERSION := -mips3 -32
|
||||
|
||||
$(BUILD_DIR)/src/code/%.o: ASOPTFLAGS := -O2
|
||||
$(BUILD_DIR)/src/libleo/%.o: ASOPTFLAGS := -O2
|
||||
$(BUILD_DIR)/src/libultra/libc/%.o: ASOPTFLAGS := -O2
|
||||
$(BUILD_DIR)/src/libultra/mgu/%.o: ASOPTFLAGS := -O2
|
||||
|
||||
ifeq ($(LIBULTRA_VERSION),I)
|
||||
$(BUILD_DIR)/src/libultra/gu/%.o: OPTFLAGS := -O3
|
||||
$(BUILD_DIR)/src/libultra/io/%.o: OPTFLAGS := -O1
|
||||
@@ -636,6 +666,11 @@ $(BUILD_DIR)/src/libultra/libc/ll.o: OPTFLAGS := -Ofast
|
||||
$(BUILD_DIR)/src/overlays/%.o: CFLAGS += -fno-merge-constants -mno-explicit-relocs -mno-split-addresses
|
||||
endif
|
||||
|
||||
SET_ABI_BIT = @:
|
||||
$(BUILD_DIR)/src/libultra/os/exceptasm.o: SET_ABI_BIT = $(PYTHON) tools/set_o32abi_bit.py $@
|
||||
$(BUILD_DIR)/src/libultra/libc/ll.o: SET_ABI_BIT = $(PYTHON) tools/set_o32abi_bit.py $@
|
||||
$(BUILD_DIR)/src/libultra/libc/llcvt.o: SET_ABI_BIT = $(PYTHON) tools/set_o32abi_bit.py $@
|
||||
|
||||
#### Main Targets ###
|
||||
|
||||
all: rom compress
|
||||
@@ -783,14 +818,37 @@ endif
|
||||
|
||||
$(BUILD_DIR)/assets/%.o: assets/%.c
|
||||
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
|
||||
$(OBJCOPY) -O binary $@ $@.bin
|
||||
$(OBJCOPY_CMD)
|
||||
|
||||
$(BUILD_DIR)/assets/%.o: $(EXTRACTED_DIR)/assets/%.c
|
||||
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
|
||||
$(OBJCOPY) -O binary $@ $@.bin
|
||||
$(OBJCOPY_CMD)
|
||||
|
||||
# Assemble the ROM header with GNU AS always
|
||||
$(BUILD_DIR)/src/makerom/rom_header.o: src/makerom/rom_header.s
|
||||
ifeq ($(COMPILER),ido)
|
||||
$(CPP) $(CPPFLAGS) $(MIPS_BUILTIN_DEFS) $(INC) $< | $(AS) $(ASFLAGS) -o $@
|
||||
else
|
||||
$(CCAS) -c $(CCASFLAGS) $(MIPS_VERSION) $(ASOPTFLAGS) -o $@ $<
|
||||
endif
|
||||
$(OBJDUMP_CMD)
|
||||
|
||||
$(BUILD_DIR)/src/makerom/ipl3.o: $(EXTRACTED_DIR)/incbin/ipl3
|
||||
$(OBJCOPY) -I binary -O elf32-big --rename-section .data=.text $< $@
|
||||
|
||||
$(BUILD_DIR)/src/%.o: src/%.s
|
||||
$(CPP) $(CPPFLAGS) -Iinclude $< | $(AS) $(ASFLAGS) -o $@
|
||||
ifeq ($(COMPILER),ido)
|
||||
$(CCAS) -c $(CCASFLAGS) $(MIPS_VERSION) $(ASOPTFLAGS) -o $(@:.o=.tmp.o) $<
|
||||
# IDO generates bad symbol tables, fix the symbol table with strip..
|
||||
$(STRIP) $(@:.o=.tmp.o) -N dummy-symbol-name
|
||||
# but strip doesn't know about file-relative offsets in .mdebug and doesn't relocate them, ld will
|
||||
# segfault unless .mdebug is removed
|
||||
$(OBJCOPY) --remove-section .mdebug $(@:.o=.tmp.o) $@
|
||||
$(SET_ABI_BIT)
|
||||
else
|
||||
$(CCAS) -c $(CCASFLAGS) $(MIPS_VERSION) $(ASOPTFLAGS) -o $@ $<
|
||||
endif
|
||||
$(OBJDUMP_CMD)
|
||||
|
||||
# Incremental link to move z_message and z_game_over data into rodata
|
||||
$(BUILD_DIR)/src/code/z_message_z_game_over.o: $(BUILD_DIR)/src/code/z_message.o $(BUILD_DIR)/src/code/z_game_over.o
|
||||
@@ -820,7 +878,8 @@ ifneq ($(RUN_CC_CHECK),0)
|
||||
$(CC_CHECK) $<
|
||||
endif
|
||||
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
|
||||
@$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s)
|
||||
$(SET_ABI_BIT)
|
||||
$(OBJDUMP_CMD)
|
||||
|
||||
$(BUILD_DIR)/src/audio/session_init.o: src/audio/session_init.c $(BUILD_DIR)/assets/audio/soundfont_sizes.h $(BUILD_DIR)/assets/audio/sequence_sizes.h
|
||||
ifneq ($(RUN_CC_CHECK),0)
|
||||
@@ -830,22 +889,6 @@ endif
|
||||
$(LD) -r -T linker_scripts/data_with_rodata.ld -o $@ $(@:.o=.tmp)
|
||||
@$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s)
|
||||
|
||||
$(BUILD_DIR)/src/libultra/libc/ll.o: src/libultra/libc/ll.c
|
||||
ifneq ($(RUN_CC_CHECK),0)
|
||||
$(CC_CHECK) $<
|
||||
endif
|
||||
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
|
||||
$(PYTHON) tools/set_o32abi_bit.py $@
|
||||
@$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s)
|
||||
|
||||
$(BUILD_DIR)/src/libultra/libc/llcvt.o: src/libultra/libc/llcvt.c
|
||||
ifneq ($(RUN_CC_CHECK),0)
|
||||
$(CC_CHECK) $<
|
||||
endif
|
||||
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
|
||||
$(PYTHON) tools/set_o32abi_bit.py $@
|
||||
@$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s)
|
||||
|
||||
$(BUILD_DIR)/src/overlays/%_reloc.o: $(BUILD_DIR)/$(SPEC)
|
||||
$(FADO) $$(tools/reloc_prereq $< $(notdir $*)) -n $(notdir $*) -o $(@:.o=.s) -M $(@:.o=.d)
|
||||
$(AS) $(ASFLAGS) $(@:.o=.s) -o $@
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,55 +6,104 @@
|
||||
#define _MIPS_ISA_MIPS2 2
|
||||
#define _MIPS_ISA_MIPS3 3
|
||||
#define _MIPS_ISA_MIPS4 4
|
||||
|
||||
#define _MIPS_SIM_ABI32 1 /* MIPS MSIG calling convention */
|
||||
#define _MIPS_SIM_NABI32 2 /* MIPS new 32-bit abi */
|
||||
/* NABI32 is 64bit calling convention but 32bit type sizes) */
|
||||
#define _MIPS_SIM_ABI64 3 /* MIPS 64 calling convention */
|
||||
#endif
|
||||
|
||||
#ifndef _LANGUAGE_C
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define TYPE(x, t) .type x, @t
|
||||
#define SIZE(x) .size x, . - x
|
||||
#else
|
||||
#define TYPE(x, t)
|
||||
#define SIZE(x)
|
||||
#endif
|
||||
|
||||
#define LEAF(x) \
|
||||
.balign 4 ;\
|
||||
.align 2 ;\
|
||||
.globl x ;\
|
||||
.type x, @function ;\
|
||||
TYPE(x, function) ;\
|
||||
.ent x, 0 ;\
|
||||
x: ;\
|
||||
.ent x, 0 ;\
|
||||
.frame $sp, 0, $ra
|
||||
.frame sp, 0, ra
|
||||
|
||||
#define XLEAF(x) \
|
||||
.balign 4 ;\
|
||||
.align 2 ;\
|
||||
.globl x ;\
|
||||
.type x, @function ;\
|
||||
x: ;\
|
||||
.aent x, 0
|
||||
TYPE(x, function) ;\
|
||||
.aent x, 0 ;\
|
||||
x:
|
||||
|
||||
#define NESTED(x, fsize, ra) \
|
||||
.globl x ;\
|
||||
.ent x, 0 ;\
|
||||
x: ;\
|
||||
.ent x, 0 ;\
|
||||
.frame $sp, fsize, ra
|
||||
.frame sp, fsize, ra
|
||||
|
||||
#define XNESTED(x) \
|
||||
.globl x ;\
|
||||
x: ;\
|
||||
.aent x, 0
|
||||
.aent x, 0 ;\
|
||||
x:
|
||||
|
||||
#define END(x) \
|
||||
.size x, . - x ;\
|
||||
SIZE(x) ;\
|
||||
.end x
|
||||
|
||||
#define IMPORT(x, size) \
|
||||
.extern x, size
|
||||
|
||||
#define EXPORT(x) \
|
||||
.globl x ;\
|
||||
x:
|
||||
|
||||
#ifdef __sgi
|
||||
#define IMPORT(sym, size) \
|
||||
.extern sym, size
|
||||
#else
|
||||
#define IMPORT(sym, size)
|
||||
#endif
|
||||
|
||||
#define DATA(x) \
|
||||
.balign 4 ;\
|
||||
.align 2 ;\
|
||||
.globl x ;\
|
||||
.type x, @object ;\
|
||||
TYPE(x, object) ;\
|
||||
x:
|
||||
|
||||
#define ENDDATA(x) \
|
||||
.size x, . - x
|
||||
SIZE(x)
|
||||
|
||||
#define MFC0(dst, src) \
|
||||
.set noreorder; mfc0 dst, src; .set reorder
|
||||
#define MTC0(dst, src) \
|
||||
.set noreorder; mtc0 dst, src; .set reorder
|
||||
|
||||
#define CFC1(dst, src) \
|
||||
.set noreorder; cfc1 dst, src; .set reorder
|
||||
#define CTC1(src, dst) \
|
||||
.set noreorder; ctc1 src, dst; .set reorder
|
||||
|
||||
#define NOP \
|
||||
.set noreorder; nop; .set reorder
|
||||
|
||||
#define TLBWI \
|
||||
.set noreorder; tlbwi; .set reorder
|
||||
|
||||
#define TLBR \
|
||||
.set noreorder; tlbr; .set reorder
|
||||
|
||||
#define TLBP \
|
||||
.set noreorder; tlbp; .set reorder
|
||||
|
||||
#ifdef __sgi
|
||||
#define ABS(x, y) \
|
||||
.globl x; \
|
||||
x = y
|
||||
#else
|
||||
#define ABS(x, y) \
|
||||
.globl x; \
|
||||
.set x, y
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -62,11 +111,11 @@
|
||||
* Stack Alignment
|
||||
*/
|
||||
#if (_MIPS_SIM == _ABIO32)
|
||||
#define NARGSAVE 4 // space for 4 args must be allocated
|
||||
#define NARGSAVE 4 /* space for 4 args must be allocated */
|
||||
#define ALSZ (8-1)
|
||||
#define ALMASK ~(8-1)
|
||||
#elif (_MIPS_SIM == _ABIN32 || _MIPS_SIM == _ABI64)
|
||||
#define NARGSAVE 0 // no caller responsibilities
|
||||
#define NARGSAVE 0 /* no caller responsibilities */
|
||||
#define ALSZ (16-1)
|
||||
#define ALMASK ~(16-1)
|
||||
#endif
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef ULTRA64_EXCEPTION_H
|
||||
#define ULTRA64_EXCEPTION_H
|
||||
|
||||
// Interrupt masks
|
||||
/* Interrupt masks */
|
||||
#define OS_IM_NONE 0x00000001
|
||||
#define OS_IM_RCP 0x00000401
|
||||
#define OS_IM_SW1 0x00000501
|
||||
@@ -23,7 +23,7 @@
|
||||
#define RCP_IMASK 0x003F0000
|
||||
#define RCP_IMASKSHIFT 16
|
||||
|
||||
// OSHWIntr values
|
||||
/* OSHWIntr values */
|
||||
#define OS_INTR_CART 1
|
||||
|
||||
#ifdef _LANGUAGE_C
|
||||
@@ -51,11 +51,11 @@ extern __osHwInt __osHwIntTable[];
|
||||
|
||||
#else
|
||||
|
||||
// __osHwInt struct member offsets
|
||||
/* __osHwInt struct member offsets */
|
||||
#define HWINT_CALLBACK 0x00
|
||||
#define HWINT_SP 0x04
|
||||
|
||||
// __osHwInt struct size
|
||||
/* __osHwInt struct size */
|
||||
#define HWINT_SIZE 0x8
|
||||
|
||||
#endif
|
||||
|
||||
@@ -47,7 +47,7 @@ typedef struct OSMesgQueue {
|
||||
|
||||
#else
|
||||
|
||||
// OSMesgQueue struct member offsets
|
||||
/* OSMesgQueue struct member offsets */
|
||||
|
||||
#define MQ_MTQUEUE 0x00
|
||||
#define MQ_FULLQUEUE 0x04
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
164
include/ultra64/regdef.h
Normal file
164
include/ultra64/regdef.h
Normal file
@@ -0,0 +1,164 @@
|
||||
#ifndef REGDEF_H
|
||||
#define REGDEF_H
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define _MIPS_SIM_ABI32 _ABIO32
|
||||
#define _MIPS_SIM_NABI32 _ABIN32
|
||||
#define _MIPS_SIM_ABI64 _ABI64
|
||||
#endif
|
||||
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI32)
|
||||
#define zero $0
|
||||
#define AT $at
|
||||
#define v0 $2
|
||||
#define v1 $3
|
||||
#define a0 $4
|
||||
#define a1 $5
|
||||
#define a2 $6
|
||||
#define a3 $7
|
||||
#define t0 $8
|
||||
#define t1 $9
|
||||
#define t2 $10
|
||||
#define t3 $11
|
||||
#define t4 $12
|
||||
#define ta0 $12
|
||||
#define t5 $13
|
||||
#define ta1 $13
|
||||
#define t6 $14
|
||||
#define ta2 $14
|
||||
#define t7 $15
|
||||
#define ta3 $15
|
||||
#define s0 $16
|
||||
#define s1 $17
|
||||
#define s2 $18
|
||||
#define s3 $19
|
||||
#define s4 $20
|
||||
#define s5 $21
|
||||
#define s6 $22
|
||||
#define s7 $23
|
||||
#define t8 $24
|
||||
#define t9 $25
|
||||
#define jp $25
|
||||
#define k0 $26
|
||||
#define k1 $27
|
||||
#define gp $28
|
||||
#define sp $29
|
||||
#define fp $30
|
||||
#define s8 $30
|
||||
#define ra $31
|
||||
#endif
|
||||
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI64)
|
||||
#define zero $0
|
||||
#define AT $at
|
||||
#define v0 $2
|
||||
#define v1 $3
|
||||
#define a0 $4
|
||||
#define a1 $5
|
||||
#define a2 $6
|
||||
#define a3 $7
|
||||
#define a4 $8
|
||||
#define ta0 $8
|
||||
#define a5 $9
|
||||
#define ta1 $9
|
||||
#define a6 $10
|
||||
#define ta2 $10
|
||||
#define a7 $11
|
||||
#define ta3 $11
|
||||
#define t0 $12
|
||||
#define t1 $13
|
||||
#define t2 $14
|
||||
#define t3 $15
|
||||
#define s0 $16
|
||||
#define s1 $17
|
||||
#define s2 $18
|
||||
#define s3 $19
|
||||
#define s4 $20
|
||||
#define s5 $21
|
||||
#define s6 $22
|
||||
#define s7 $23
|
||||
#define t8 $24
|
||||
#define t9 $25
|
||||
#define jp $25
|
||||
#define k0 $26
|
||||
#define k1 $27
|
||||
#define gp $28
|
||||
#define sp $29
|
||||
#define fp $30
|
||||
#define s8 $30
|
||||
#define ra $31
|
||||
#endif
|
||||
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI32)
|
||||
#define fv0 $f0
|
||||
#define fv0f $f1
|
||||
#define fv1 $f2
|
||||
#define fv1f $f3
|
||||
#define fa0 $f12
|
||||
#define fa0f $f13
|
||||
#define fa1 $f14
|
||||
#define fa1f $f15
|
||||
#define ft0 $f4
|
||||
#define ft0f $f5
|
||||
#define ft1 $f6
|
||||
#define ft1f $f7
|
||||
#define ft2 $f8
|
||||
#define ft2f $f9
|
||||
#define ft3 $f10
|
||||
#define ft3f $f11
|
||||
#define ft4 $f16
|
||||
#define ft4f $f17
|
||||
#define ft5 $f18
|
||||
#define ft5f $f19
|
||||
#define fs0 $f20
|
||||
#define fs0f $f21
|
||||
#define fs1 $f22
|
||||
#define fs1f $f23
|
||||
#define fs2 $f24
|
||||
#define fs2f $f25
|
||||
#define fs3 $f26
|
||||
#define fs3f $f27
|
||||
#define fs4 $f28
|
||||
#define fs4f $f29
|
||||
#define fs5 $f30
|
||||
#define fs5f $f31
|
||||
#endif
|
||||
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI64)
|
||||
#define fv0 $f0
|
||||
#define fv1 $f2
|
||||
#define fa0 $f12
|
||||
#define fa1 $f13
|
||||
#define fa2 $f14
|
||||
#define fa3 $f15
|
||||
#define fa4 $f16
|
||||
#define fa5 $f17
|
||||
#define fa6 $f18
|
||||
#define fa7 $f19
|
||||
#define ft0 $f4
|
||||
#define ft1 $f5
|
||||
#define ft2 $f6
|
||||
#define ft3 $f7
|
||||
#define ft4 $f8
|
||||
#define ft5 $f9
|
||||
#define ft6 $f10
|
||||
#define ft7 $f11
|
||||
#define ft8 $f20
|
||||
#define ft9 $f21
|
||||
#define ft10 $f22
|
||||
#define ft11 $f23
|
||||
#define ft12 $f1
|
||||
#define ft13 $f3
|
||||
#define fs0 $f24
|
||||
#define fs1 $f25
|
||||
#define fs2 $f26
|
||||
#define fs3 $f27
|
||||
#define fs4 $f28
|
||||
#define fs5 $f29
|
||||
#define fs6 $f30
|
||||
#define fs7 $f31
|
||||
#endif
|
||||
|
||||
#define fcr31 $31
|
||||
|
||||
#endif
|
||||
@@ -73,7 +73,7 @@ typedef struct __OSThreadTail {
|
||||
|
||||
#else
|
||||
|
||||
// OSThread struct member offsets
|
||||
/* OSThread struct member offsets */
|
||||
|
||||
#define THREAD_NEXT 0x00
|
||||
#define THREAD_PRI 0x04
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
#include "ultra64/asm.h"
|
||||
#include "ultra64/regdef.h"
|
||||
|
||||
.set noreorder
|
||||
|
||||
.section .text
|
||||
|
||||
.balign 16
|
||||
.text
|
||||
|
||||
/**
|
||||
* void Mio0_Decompress(void* src, void* dst);
|
||||
@@ -12,53 +9,56 @@
|
||||
* Decompress Mio0 chunk
|
||||
*/
|
||||
LEAF(Mio0_Decompress)
|
||||
lw $a3, 8($a0) // compressed offset
|
||||
lw $t9, 0xC($a0) // uncompressed offset
|
||||
lw $t8, 4($a0) // decompressed length
|
||||
add $a3, $a3, $a0 // compressed start
|
||||
add $t9, $t9, $a0 // uncompressed start
|
||||
move $a2, $zero // 0
|
||||
addi $a0, $a0, 0x10 // move past header
|
||||
add $t8, $t8, $a1 // dst + decompressed length = end
|
||||
lw a3, 0x08(a0) /* compressed offset */
|
||||
lw t9, 0x0C(a0) /* uncompressed offset */
|
||||
lw t8, 0x04(a0) /* decompressed length */
|
||||
add a3, a3, a0 /* compressed start */
|
||||
add t9, t9, a0 /* uncompressed start */
|
||||
move a2, zero /* 0 */
|
||||
addi a0, a0, 0x10 /* move past header */
|
||||
add t8, t8, a1 /* dst + decompressed length = end */
|
||||
mainloop:
|
||||
bnez $a2, 1f
|
||||
nop
|
||||
lw $t0, ($a0)
|
||||
li $a2, 32
|
||||
addi $a0, $a0, 4
|
||||
bnez a2, 1f
|
||||
|
||||
lw t0, (a0)
|
||||
li a2, 32
|
||||
addi a0, a0, 4
|
||||
1:
|
||||
slt $t1, $t0, $zero
|
||||
beqz $t1, read_comp
|
||||
nop
|
||||
lb $t2, ($t9) // read 1 byte from uncompressed data
|
||||
addi $t9, $t9, 1 // advance uncompressed start
|
||||
addi $a1, $a1, 1
|
||||
slt t1, t0, zero
|
||||
beqz t1, read_comp
|
||||
|
||||
lb t2, (t9) /* read 1 byte from uncompressed data */
|
||||
sb t2, (a1) /* store uncompressed byte */
|
||||
addi t9, t9, 1 /* advance uncompressed start */
|
||||
addi a1, a1, 1
|
||||
b next_iter
|
||||
sb $t2, -1($a1) // store uncompressed byte
|
||||
|
||||
read_comp:
|
||||
lhu $t2, ($a3) // read 2 bytes from compressed data
|
||||
addi $a3, $a3, 2 // advance compressed start
|
||||
srl $t3, $t2, 0xC
|
||||
andi $t2, $t2, 0xFFF
|
||||
beqz $t3, 3f
|
||||
sub $t1, $a1, $t2
|
||||
addi $t3, $t3, 2
|
||||
lhu t2, (a3) /* read 2 bytes from compressed data */
|
||||
addi a3, a3, 2 /* advance compressed start */
|
||||
srl t3, t2, 0xC
|
||||
andi t2, t2, 0xFFF
|
||||
sub t1, a1, t2
|
||||
beqz t3, 3f
|
||||
|
||||
addi t3, t3, 2
|
||||
2:
|
||||
lb $t2, -1($t1)
|
||||
addi $t3, $t3, -1
|
||||
addi $t1, $t1, 1
|
||||
addi $a1, $a1, 1
|
||||
bnez $t3, 2b
|
||||
sb $t2, -1($a1)
|
||||
lb t2, -1(t1)
|
||||
addi t3, t3, -1
|
||||
addi t1, t1, 1
|
||||
sb t2, (a1)
|
||||
addi a1, a1, 1
|
||||
bnez t3, 2b
|
||||
|
||||
next_iter:
|
||||
sll $t0, $t0, 1
|
||||
bne $a1, $t8, mainloop // continue until decompressed length is reached
|
||||
addi $a2, $a2, -1
|
||||
jr $ra
|
||||
nop
|
||||
sll t0, t0, 1
|
||||
addi a2, a2, -1
|
||||
bne a1, t8, mainloop /* continue until decompressed length is reached */
|
||||
|
||||
jr ra
|
||||
3:
|
||||
lbu $t3, ($t9)
|
||||
addi $t9, $t9, 1
|
||||
lbu t3, (t9)
|
||||
addi t9, t9, 1
|
||||
addi t3, t3, 0x12
|
||||
b 2b
|
||||
addi $t3, $t3, 0x12
|
||||
END(Mio0_Decompress)
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
#include "ultra64/asm.h"
|
||||
#include "ultra64/regdef.h"
|
||||
|
||||
.set noat
|
||||
.set noreorder
|
||||
|
||||
.section .text
|
||||
|
||||
.balign 16
|
||||
.text
|
||||
|
||||
/**
|
||||
* s32 Kanji_OffsetFromShiftJIS(s32 sjis);
|
||||
@@ -26,64 +22,57 @@
|
||||
* @remark Almost identical to "LeoGetKadr" from libleo.
|
||||
*/
|
||||
LEAF(Kanji_OffsetFromShiftJIS)
|
||||
// Characters with codepoints >= 0x8800 are kanji. Arrangement is regular,
|
||||
// so convert index directly.
|
||||
li $at, 0x8800
|
||||
slt $at, $a0, $at
|
||||
bnez $at, .nonkanji
|
||||
// 0xBC is number of glyphs in one block in the `kanji` file:
|
||||
// 0x100 possible codepoints with the same byte1
|
||||
// - 0x40 unused at beginning
|
||||
// - 1 unused at 0x7F
|
||||
// - 3 unused at 0xFD, 0xFE, 0xFF
|
||||
li $a2, 0xBC
|
||||
// Get byte1 and adjust so starts at 0
|
||||
srl $a1, $a0, 8
|
||||
addi $a1, $a1, -0x88
|
||||
multu $a2, $a1
|
||||
// Get byte2 and adjust so starts at 0
|
||||
andi $a3, $a0, 0xFF
|
||||
addi $a3, $a3, -0x40
|
||||
slti $at, $a3, (0x80 - 0x40)
|
||||
mflo $a2
|
||||
// 0x__7F is always empty and elided in the file, so decrement if larger
|
||||
bnezl $at, .kanji_lower_halfblock
|
||||
mflo $a2
|
||||
addi $a3, $a3, -1
|
||||
mflo $a2
|
||||
.kanji_lower_halfblock:
|
||||
addi $a3, $a3, 0x30A
|
||||
add $a3, $a3, $a2
|
||||
jr $ra
|
||||
sll $v0, $a3, 7
|
||||
// returns (0x30A + (adjusted byte2) + (adjusted byte1) * 0xBC) * FONT_CHAR_TEX_SIZE
|
||||
/* Characters with codepoints >= 0x8800 are kanji. Arrangement is regular, */
|
||||
/* so convert index directly. */
|
||||
li a2, 0xBC
|
||||
blt a0, 0x8800, .nonkanji
|
||||
/* 0xBC is number of glyphs in one block in the `kanji` file: */
|
||||
/* 0x100 possible codepoints with the same byte1 */
|
||||
/* - 0x40 unused at beginning */
|
||||
/* - 1 unused at 0x7F */
|
||||
/* - 3 unused at 0xFD, 0xFE, 0xFF */
|
||||
/* Get byte1 and adjust so starts at 0 */
|
||||
srl a1, a0, 8
|
||||
addi a1, a1, -0x88
|
||||
/* Get byte2 and adjust so starts at 0 */
|
||||
andi a3, a0, 0xFF
|
||||
addi a3, a3, -0x40
|
||||
mul a2, a2, a1
|
||||
blt a3, 0x40, .kanji_lower_halfblock
|
||||
|
||||
// Non-kanji are arranged with irregular gaps, use the lookup table.
|
||||
/* 0x__7F is always empty and elided in the file, so decrement if larger */
|
||||
addi a3, a3, -1
|
||||
.kanji_lower_halfblock:
|
||||
mflo a2 /* Unncessary mflo: the pseudo-op `mul` already performs mflo */
|
||||
addi a3, a3, 0x30A
|
||||
add a3, a3, a2
|
||||
/* returns (0x30A + (adjusted byte2) + (adjusted byte1) * 0xBC) * FONT_CHAR_TEX_SIZE */
|
||||
sll v0, a3, 7
|
||||
jr ra
|
||||
|
||||
/* Non-kanji are arranged with irregular gaps, use the lookup table. */
|
||||
.nonkanji:
|
||||
// Get byte1 and adjust so starts at 0
|
||||
srl $a1, $a0, 8
|
||||
addi $a1, $a1, -0x81
|
||||
multu $a2, $a1
|
||||
// Get byte2 and adjust so starts at 0
|
||||
andi $a3, $a0, 0xFF
|
||||
addi $a3, $a3, -0x40
|
||||
slti $at, $a3, (0x80 - 0x40)
|
||||
mflo $a2
|
||||
// 0x__7F is always empty and elided in the file, so decrement if larger
|
||||
bnezl $at, .nonkanji_lower_halfblock
|
||||
mflo $a2
|
||||
addi $a3, $a3, -1
|
||||
mflo $a2
|
||||
/* Get byte1 and adjust so starts at 0 */
|
||||
srl a1, a0, 8
|
||||
addi a1, a1, -0x81
|
||||
/* Get byte2 and adjust so starts at 0 */
|
||||
andi a3, a0, 0xFF
|
||||
addi a3, a3, -0x40
|
||||
mul a2, a2, a1
|
||||
blt a3, 0x40, .nonkanji_lower_halfblock
|
||||
|
||||
/* 0x__7F is always empty and elided in the file, so decrement if larger */
|
||||
addi a3, a3, -1
|
||||
.nonkanji_lower_halfblock:
|
||||
add $a3, $a3, $a2
|
||||
lui $a2, %hi(sNonKanjiIndices)
|
||||
sll $a3, $a3, 1
|
||||
addiu $a2, %lo(sNonKanjiIndices)
|
||||
add $a3, $a3, $a2
|
||||
lh $a2, ($a3)
|
||||
jr $ra
|
||||
sll $v0, $a2, 7
|
||||
// returns sNonKanjiIndices[(adjusted byte2) + (adjusted byte1) * 0xBC] * FONT_CHAR_TEX_SIZE
|
||||
mflo a2 /* Unncessary mflo: the pseudo-op `mul` already performs mflo */
|
||||
add a3, a3, a2
|
||||
sll a3, a3, 1
|
||||
la a2, sNonKanjiIndices
|
||||
add a3, a3, a2
|
||||
lh a2, (a3)
|
||||
/* returns sNonKanjiIndices[(adjusted byte2) + (adjusted byte1) * 0xBC] * FONT_CHAR_TEX_SIZE */
|
||||
sll v0, a2, 7
|
||||
jr ra
|
||||
END(Kanji_OffsetFromShiftJIS)
|
||||
|
||||
/**
|
||||
@@ -116,7 +105,7 @@ END(Kanji_OffsetFromShiftJIS)
|
||||
* into blocks by high byte.
|
||||
*/
|
||||
DATA(sNonKanjiIndices)
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x814_ */ .half 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F
|
||||
/* 0x815_ */ .half 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F
|
||||
/* 0x816_ */ .half 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F
|
||||
@@ -130,7 +119,7 @@ DATA(sNonKanjiIndices)
|
||||
/* 0x81E_ */ .half 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x81F_ */ .half 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 0x0090, 0x0000, 0x0000, 0x0000, 0x0000, 0x0091
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x824_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0092
|
||||
/* 0x825_ */ .half 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x826_ */ .half 0x009C, 0x009D, 0x009E, 0x009F, 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB
|
||||
@@ -144,7 +133,7 @@ DATA(sNonKanjiIndices)
|
||||
/* 0x82E_ */ .half 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118, 0x0119, 0x011A, 0x011B, 0x011C, 0x011D, 0x011E, 0x011F, 0x0120
|
||||
/* 0x82F_ */ .half 0x0121, 0x0122, 0x0123, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x834_ */ .half 0x0124, 0x0125, 0x0126, 0x0127, 0x0128, 0x0129, 0x012A, 0x012B, 0x012C, 0x012D, 0x012E, 0x012F, 0x0130, 0x0131, 0x0132, 0x0133
|
||||
/* 0x835_ */ .half 0x0134, 0x0135, 0x0136, 0x0137, 0x0138, 0x0139, 0x013A, 0x013B, 0x013C, 0x013D, 0x013E, 0x013F, 0x0140, 0x0141, 0x0142, 0x0143
|
||||
/* 0x836_ */ .half 0x0144, 0x0145, 0x0146, 0x0147, 0x0148, 0x0149, 0x014A, 0x014B, 0x014C, 0x014D, 0x014E, 0x014F, 0x0150, 0x0151, 0x0152, 0x0153
|
||||
@@ -158,7 +147,7 @@ DATA(sNonKanjiIndices)
|
||||
/* 0x83E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x83F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x844_ */ .half 0x01AB, 0x01AC, 0x01AD, 0x01AE, 0x01AF, 0x01B0, 0x01B1, 0x01B2, 0x01B3, 0x01B4, 0x01B5, 0x01B6, 0x01B7, 0x01B8, 0x01B9, 0x01BA
|
||||
/* 0x845_ */ .half 0x01BB, 0x01BC, 0x01BD, 0x01BE, 0x01BF, 0x01C0, 0x01C1, 0x01C2, 0x01C3, 0x01C4, 0x01C5, 0x01C6, 0x01C7, 0x01C8, 0x01C9, 0x01CA
|
||||
/* 0x846_ */ .half 0x01CB, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
@@ -172,7 +161,7 @@ DATA(sNonKanjiIndices)
|
||||
/* 0x84E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x84F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x854_ */ .half 0x020E, 0x020F, 0x0210, 0x0211, 0x0212, 0x0213, 0x0214, 0x0215, 0x0216, 0x0217, 0x0218, 0x0219, 0x021A, 0x021B, 0x021C, 0x021D
|
||||
/* 0x855_ */ .half 0x021E, 0x021F, 0x0220, 0x0221, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0222, 0x0223
|
||||
/* 0x856_ */ .half 0x0224, 0x0225, 0x0226, 0x0227, 0x0228, 0x0229, 0x022A, 0x022B, 0x022C, 0x022D, 0x022E, 0x022F, 0x0230, 0x0231, 0x0232, 0x0233
|
||||
@@ -186,7 +175,7 @@ DATA(sNonKanjiIndices)
|
||||
/* 0x85E_ */ .half 0x026C, 0x026D, 0x026E, 0x026F, 0x0270, 0x0271, 0x0272, 0x0273, 0x0274, 0x0275, 0x0276, 0x0277, 0x0278, 0x0279, 0x027A, 0x027B
|
||||
/* 0x85F_ */ .half 0x027C, 0x027D, 0x027E, 0x027F, 0x0280, 0x0281, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x864_ */ .half 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0287, 0x0288, 0x0289, 0x028A, 0x028B, 0x028C, 0x028D, 0x028E, 0x028F, 0x0290, 0x0291
|
||||
/* 0x865_ */ .half 0x0292, 0x0293, 0x0294, 0x0295, 0x0296, 0x0297, 0x0298, 0x0299, 0x029A, 0x029B, 0x029C, 0x029D, 0x029E, 0x029F, 0x0000, 0x0000
|
||||
/* 0x866_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
@@ -200,7 +189,7 @@ DATA(sNonKanjiIndices)
|
||||
/* 0x86E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x86F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x874_ */ .half 0x02C0, 0x02C1, 0x02C2, 0x02C3, 0x02C4, 0x02C5, 0x02C6, 0x02C7, 0x02C8, 0x02C9, 0x02CA, 0x02CB, 0x02CC, 0x02CD, 0x02CE, 0x02CF
|
||||
/* 0x875_ */ .half 0x02D0, 0x02D1, 0x02D2, 0x02D3, 0x02D4, 0x02D5, 0x02D6, 0x02D7, 0x02D8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x876_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
@@ -86,7 +86,7 @@ void ViMode_Configure(ViMode* viMode, s32 type, s32 tvType, s32 loRes, s32 antia
|
||||
yScaleHiOddField = modeF ? (loResInterlaced ? (F210(0.75) << 16) : (F210(0.5) << 16)) : 0;
|
||||
|
||||
viMode->customViMode.type = type;
|
||||
viMode->customViMode.comRegs.ctrl = VI_CTRL_PIXEL_ADV_3 | VI_CTRL_GAMMA_ON | VI_CTRL_GAMMA_DITHER_ON |
|
||||
viMode->customViMode.comRegs.ctrl = VI_CTRL_PIXEL_ADV(3) | VI_CTRL_GAMMA_ON | VI_CTRL_GAMMA_DITHER_ON |
|
||||
(!loResDeinterlaced ? VI_CTRL_SERRATE_ON : 0) |
|
||||
(antialiasOn ? VI_CTRL_DIVOT_ON : 0) |
|
||||
(fb32Bit ? VI_CTRL_TYPE_32 : VI_CTRL_TYPE_16);
|
||||
|
||||
@@ -1,15 +1,9 @@
|
||||
#include "ultra64/asm.h"
|
||||
#include "ultra64/regdef.h"
|
||||
|
||||
#if DEBUG_FEATURES
|
||||
.set noreorder
|
||||
#endif
|
||||
|
||||
.section .text
|
||||
|
||||
.balign 16
|
||||
.text
|
||||
|
||||
LEAF(absf)
|
||||
abs.s $f0, $f12
|
||||
jr $ra
|
||||
nop
|
||||
abs.s fv0, fa0
|
||||
jr ra
|
||||
END(absf)
|
||||
|
||||
@@ -1,15 +1,9 @@
|
||||
#include "ultra64/asm.h"
|
||||
#include "ultra64/regdef.h"
|
||||
|
||||
#if DEBUG_FEATURES
|
||||
.set noreorder
|
||||
#endif
|
||||
|
||||
.section .text
|
||||
|
||||
.balign 16
|
||||
.text
|
||||
|
||||
LEAF(sqrt)
|
||||
sqrt.d $f0, $f12
|
||||
jr $ra
|
||||
nop
|
||||
sqrt.d fv0, fa0
|
||||
jr ra
|
||||
END(sqrt)
|
||||
|
||||
163
src/libc64/fp.s
163
src/libc64/fp.s
@@ -1,12 +1,10 @@
|
||||
#include "ultra64/asm.h"
|
||||
#include "ultra64/regdef.h"
|
||||
|
||||
.set noreorder
|
||||
|
||||
.section .data
|
||||
|
||||
.balign 16
|
||||
.data
|
||||
|
||||
#if !PLATFORM_N64
|
||||
|
||||
DATA(gPositiveInfinity)
|
||||
.word 0x7F800000
|
||||
ENDDATA(gPositiveInfinity)
|
||||
@@ -34,150 +32,135 @@ ENDDATA(qNaN0x10000)
|
||||
DATA(sNaN0x3FFFFF)
|
||||
.word 0x7FFFFFFF
|
||||
ENDDATA(sNaN0x3FFFFF)
|
||||
|
||||
#endif
|
||||
|
||||
.section .text
|
||||
|
||||
.balign 16
|
||||
.text
|
||||
|
||||
LEAF(floorf)
|
||||
floor.w.s $f12, $f12
|
||||
jr $ra
|
||||
cvt.s.w $f0, $f12
|
||||
floor.w.s fa0, fa0
|
||||
cvt.s.w fv0, fa0
|
||||
jr ra
|
||||
END(floorf)
|
||||
|
||||
LEAF(floor)
|
||||
floor.w.d $f12, $f12
|
||||
jr $ra
|
||||
cvt.d.w $f0, $f12
|
||||
floor.w.d fa0, fa0
|
||||
cvt.d.w fv0, fa0
|
||||
jr ra
|
||||
END(floor)
|
||||
|
||||
LEAF(lfloorf)
|
||||
floor.w.s $f4, $f12
|
||||
mfc1 $v0, $f4
|
||||
jr $ra
|
||||
nop
|
||||
floor.w.s ft0, fa0
|
||||
mfc1 v0, ft0
|
||||
jr ra
|
||||
END(lfloorf)
|
||||
|
||||
LEAF(lfloor)
|
||||
floor.w.d $f4, $f12
|
||||
mfc1 $v0, $f4
|
||||
jr $ra
|
||||
nop
|
||||
floor.w.d ft0, fa0
|
||||
mfc1 v0, ft0
|
||||
jr ra
|
||||
END(lfloor)
|
||||
|
||||
LEAF(ceilf)
|
||||
ceil.w.s $f12, $f12
|
||||
jr $ra
|
||||
cvt.s.w $f0, $f12
|
||||
ceil.w.s fa0, fa0
|
||||
cvt.s.w fv0, fa0
|
||||
jr ra
|
||||
END(ceilf)
|
||||
|
||||
LEAF(ceil)
|
||||
ceil.w.d $f12, $f12
|
||||
jr $ra
|
||||
cvt.d.w $f0, $f12
|
||||
ceil.w.d fa0, fa0
|
||||
cvt.d.w fv0, fa0
|
||||
jr ra
|
||||
END(ceil)
|
||||
|
||||
LEAF(lceilf)
|
||||
ceil.w.s $f4, $f12
|
||||
mfc1 $v0, $f4
|
||||
jr $ra
|
||||
nop
|
||||
ceil.w.s ft0, fa0
|
||||
mfc1 v0, ft0
|
||||
jr ra
|
||||
END(lceilf)
|
||||
|
||||
LEAF(lceil)
|
||||
ceil.w.d $f4, $f12
|
||||
mfc1 $v0, $f4
|
||||
jr $ra
|
||||
nop
|
||||
ceil.w.d ft0, fa0
|
||||
mfc1 v0, ft0
|
||||
jr ra
|
||||
END(lceil)
|
||||
|
||||
LEAF(truncf)
|
||||
trunc.w.s $f12, $f12
|
||||
jr $ra
|
||||
cvt.s.w $f0, $f12
|
||||
trunc.w.s fa0, fa0
|
||||
cvt.s.w fv0, fa0
|
||||
jr ra
|
||||
END(truncf)
|
||||
|
||||
LEAF(trunc)
|
||||
trunc.w.d $f12, $f12
|
||||
jr $ra
|
||||
cvt.d.w $f0, $f12
|
||||
trunc.w.d fa0, fa0
|
||||
cvt.d.w fv0, fa0
|
||||
jr ra
|
||||
END(trunc)
|
||||
|
||||
LEAF(ltruncf)
|
||||
trunc.w.s $f4, $f12
|
||||
mfc1 $v0, $f4
|
||||
jr $ra
|
||||
nop
|
||||
trunc.w.s ft0, fa0
|
||||
mfc1 v0, ft0
|
||||
jr ra
|
||||
END(ltruncf)
|
||||
|
||||
LEAF(ltrunc)
|
||||
trunc.w.d $f4, $f12
|
||||
mfc1 $v0, $f4
|
||||
jr $ra
|
||||
nop
|
||||
trunc.w.d ft0, fa0
|
||||
mfc1 v0, ft0
|
||||
jr ra
|
||||
END(ltrunc)
|
||||
|
||||
LEAF(nearbyintf)
|
||||
round.w.s $f12, $f12
|
||||
jr $ra
|
||||
cvt.s.w $f0, $f12
|
||||
round.w.s fa0, fa0
|
||||
cvt.s.w fv0, fa0
|
||||
jr ra
|
||||
END(nearbyintf)
|
||||
|
||||
LEAF(nearbyint)
|
||||
round.w.d $f12, $f12
|
||||
jr $ra
|
||||
cvt.d.w $f0, $f12
|
||||
round.w.d fa0, fa0
|
||||
cvt.d.w fv0, fa0
|
||||
jr ra
|
||||
END(nearbyint)
|
||||
|
||||
LEAF(lnearbyintf)
|
||||
round.w.s $f4, $f12
|
||||
mfc1 $v0, $f4
|
||||
jr $ra
|
||||
nop
|
||||
round.w.s ft0, fa0
|
||||
mfc1 v0, ft0
|
||||
jr ra
|
||||
END(lnearbyintf)
|
||||
|
||||
LEAF(lnearbyint)
|
||||
round.w.d $f4, $f12
|
||||
mfc1 $v0, $f4
|
||||
jr $ra
|
||||
nop
|
||||
round.w.d ft0, fa0
|
||||
mfc1 v0, ft0
|
||||
jr ra
|
||||
END(lnearbyint)
|
||||
|
||||
LEAF(roundf)
|
||||
li.s $f4, 0.5
|
||||
nop
|
||||
add.s $f0, $f12, $f4
|
||||
floor.w.s $f0, $f0
|
||||
jr $ra
|
||||
cvt.s.w $f0, $f0
|
||||
li.s ft0, 0.5
|
||||
add.s fv0, fa0, ft0
|
||||
floor.w.s fv0, fv0
|
||||
cvt.s.w fv0, fv0
|
||||
jr ra
|
||||
END(roundf)
|
||||
|
||||
LEAF(round)
|
||||
li.d $f4, 0.5
|
||||
nop
|
||||
add.d $f0, $f12, $f4
|
||||
floor.w.d $f0, $f0
|
||||
jr $ra
|
||||
cvt.d.w $f0, $f0
|
||||
li.d ft0, 0.5
|
||||
add.d fv0, fa0, ft0
|
||||
floor.w.d fv0, fv0
|
||||
cvt.d.w fv0, fv0
|
||||
jr ra
|
||||
END(round)
|
||||
|
||||
LEAF(lroundf)
|
||||
li.s $f4, 0.5
|
||||
nop
|
||||
add.s $f0, $f12, $f4
|
||||
floor.w.s $f0, $f0
|
||||
mfc1 $v0, $f0
|
||||
jr $ra
|
||||
nop
|
||||
li.s ft0, 0.5
|
||||
add.s fv0, fa0, ft0
|
||||
floor.w.s fv0, fv0
|
||||
mfc1 v0, fv0
|
||||
jr ra
|
||||
END(lroundf)
|
||||
|
||||
LEAF(lround)
|
||||
li.d $f4, 0.5
|
||||
nop
|
||||
add.d $f0, $f12, $f4
|
||||
floor.w.d $f0, $f0
|
||||
mfc1 $v0, $f0
|
||||
jr $ra
|
||||
nop
|
||||
li.d ft0, 0.5
|
||||
add.d fv0, fa0, ft0
|
||||
floor.w.d fv0, fv0
|
||||
mfc1 v0, fv0
|
||||
jr ra
|
||||
END(lround)
|
||||
|
||||
@@ -1,42 +1,33 @@
|
||||
#include "ultra64/asm.h"
|
||||
#include "ultra64/regdef.h"
|
||||
|
||||
.set noat
|
||||
.set noreorder
|
||||
|
||||
.section .text
|
||||
|
||||
.balign 16
|
||||
.text
|
||||
|
||||
LEAF(LeoGetAAdr)
|
||||
bltz $a0, .out_of_range
|
||||
slti $at, $a0, 0x908
|
||||
beqz $at, .out_of_range
|
||||
nop
|
||||
lui $v1, %hi(asc2tbl)
|
||||
sll $t0, $a0, 2
|
||||
addiu $v1, %lo(asc2tbl)
|
||||
add $t1, $t0, $v1
|
||||
lbu $t8, 2($t1)
|
||||
lhu $t9, 0($t1)
|
||||
li $at, 0x70000
|
||||
andi $t2, $t8, 0xF
|
||||
addi $t3, $t2, 1
|
||||
sw $t3, ($a2)
|
||||
lb $t0, 3($t1)
|
||||
srl $t4, $t8, 4
|
||||
ori $at, $at, 0xEE80
|
||||
andi $t5, $t0, 1
|
||||
sll $t6, $t5, 4
|
||||
or $t7, $t6, $t4
|
||||
sw $t7, ($a1)
|
||||
sll $v0, $t9, 1
|
||||
sra $v1, $t0, 1
|
||||
sw $v1, ($a3)
|
||||
jr $ra
|
||||
add $v0, $v0, $at
|
||||
bltz a0, .out_of_range
|
||||
bge a0, 0x908, .out_of_range
|
||||
sll t0, a0, 2
|
||||
la v1, asc2tbl
|
||||
add t1, t0, v1
|
||||
lbu t8, 2(t1)
|
||||
lhu t9, 0(t1)
|
||||
andi t2, t8, 0xF
|
||||
addi t3, t2, 1
|
||||
sw t3, (a2)
|
||||
lb t0, 3(t1)
|
||||
srl t4, t8, 4
|
||||
andi t5, t0, 1
|
||||
sll t6, t5, 4
|
||||
or t7, t6, t4
|
||||
sw t7, (a1)
|
||||
sll v0, t9, 1
|
||||
sra v1, t0, 1
|
||||
sw v1, (a3)
|
||||
add v0, v0, 0x7EE80
|
||||
jr ra
|
||||
.out_of_range:
|
||||
jr $ra
|
||||
li $v0, -1
|
||||
li v0, -1
|
||||
jr ra
|
||||
END(LeoGetAAdr)
|
||||
|
||||
DATA(asc2tbl)
|
||||
|
||||
@@ -1,33 +1,25 @@
|
||||
#include "ultra64/asm.h"
|
||||
#include "ultra64/regdef.h"
|
||||
|
||||
.set noat
|
||||
.set noreorder
|
||||
|
||||
.section .text
|
||||
|
||||
.balign 16
|
||||
.text
|
||||
|
||||
LEAF(LeoGetAAdr2)
|
||||
li $at, 0x10000
|
||||
srl $t8, $a0, 0xF
|
||||
ori $at, $at, 0xFFFE
|
||||
and $v1, $t8, $at
|
||||
li $at, 0x70000
|
||||
ori $at, $at, 0xEE80
|
||||
srl $t2, $a0, 0x8
|
||||
add $v0, $v1, $at
|
||||
andi $t3, $t2, 0xF
|
||||
andi $t5, $a0, 0xFE
|
||||
addi $t4, $t3, 1
|
||||
sll $t6, $t5, 0x18
|
||||
andi $t9, $a0, 0x1
|
||||
srl $v1, $a0, 0xC
|
||||
sw $t4, ($a2)
|
||||
sra $t7, $t6, 0x19
|
||||
sll $t8, $t9, 0x4
|
||||
andi $t1, $v1, 0xF
|
||||
sw $t7, ($a3)
|
||||
or $t2, $t1, $t8
|
||||
jr $ra
|
||||
sw $t2, ($a1)
|
||||
srl t8, a0, 15
|
||||
and v1, t8, 0x1FFFE
|
||||
add v0, v1, 0x7EE80
|
||||
srl t2, a0, 8
|
||||
andi t3, t2, 0xF
|
||||
andi t5, a0, 0xFE
|
||||
addi t4, t3, 1
|
||||
sll t6, t5, 24
|
||||
andi t9, a0, 1
|
||||
srl v1, a0, 12
|
||||
sw t4, (a2)
|
||||
sra t7, t6, 25
|
||||
sll t8, t9, 4
|
||||
andi t1, v1, 0xF
|
||||
sw t7, (a3)
|
||||
or t2, t1, t8
|
||||
sw t2, (a1)
|
||||
jr ra
|
||||
END(LeoGetAAdr2)
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
#include "ultra64/asm.h"
|
||||
#include "ultra64/regdef.h"
|
||||
|
||||
.set noat
|
||||
.set noreorder
|
||||
|
||||
.section .text
|
||||
|
||||
.balign 16
|
||||
.text
|
||||
|
||||
/**
|
||||
* int LeoGetKAdr(int sjis);
|
||||
@@ -22,74 +18,61 @@
|
||||
* @return int Storage offset address into the N64 Disk Drive mask ROM.
|
||||
*/
|
||||
LEAF(LeoGetKAdr)
|
||||
// Check if the codepoint is in the range 0x8140 to 0x9872.
|
||||
li $at, 0x8140
|
||||
slt $at, $a0, $at
|
||||
bnez $at, .out_of_range
|
||||
li $at, 0x9873
|
||||
slt $at, $a0, $at
|
||||
beqz $at, .out_of_range
|
||||
// Characters with codepoints >= 0x8800 are kanji. Arrangement is regular,
|
||||
// so convert index directly.
|
||||
li $at, 0x8800
|
||||
slt $at, $a0, $at
|
||||
bnez $at, .nonkanji
|
||||
// 0xBC is number of glyphs in one block in the `kanji` file:
|
||||
// 0x100 possible codepoints with the same byte1
|
||||
// - 0x40 unused at beginning
|
||||
// - 1 unused at 0x7F
|
||||
// - 3 unused at 0xFD, 0xFE, 0xFF
|
||||
li $a2, 0xBC
|
||||
// Get byte1 and adjust so starts at 0
|
||||
srl $a1, $a0, 8
|
||||
addi $a1, $a1, -0x88
|
||||
multu $a2, $a1
|
||||
// Get byte2 and adjust so starts at 0
|
||||
andi $a3, $a0, 0xFF
|
||||
addi $a3, $a3, -0x40
|
||||
slti $at, $a3, (0x80 - 0x40)
|
||||
mflo $a2
|
||||
// 0x__7F is always empty and elided in the file, so decrement if larger
|
||||
bnezl $at, .kanji_lower_halfblock
|
||||
mflo $a2
|
||||
addi $a3, $a3, -1
|
||||
mflo $a2
|
||||
/* Check if the codepoint is in the range 0x8140 to 0x9872. */
|
||||
blt a0, 0x8140, .out_of_range
|
||||
bge a0, 0x9873, .out_of_range
|
||||
/* Characters with codepoints >= 0x8800 are kanji. Arrangement is regular,
|
||||
* so convert index directly. */
|
||||
li a2, 0xBC
|
||||
blt a0, 0x8800, .nonkanji
|
||||
/* 0xBC is number of glyphs in one block in the `kanji` file:
|
||||
* 0x100 possible codepoints with the same byte1
|
||||
* - 0x40 unused at beginning
|
||||
* - 1 unused at 0x7F
|
||||
* - 3 unused at 0xFD, 0xFE, 0xFF */
|
||||
/* Get byte1 and adjust so starts at 0 */
|
||||
srl a1, a0, 8
|
||||
addi a1, a1, -0x88
|
||||
mul a2, a2, a1
|
||||
/* Get byte2 and adjust so starts at 0 */
|
||||
andi a3, a0, 0xFF
|
||||
addi a3, a3, -0x40
|
||||
/* 0x__7F is always empty and elided in the file, so decrement if larger */
|
||||
blt a3, 0x40, .kanji_lower_halfblock
|
||||
addi a3, a3, -1
|
||||
.kanji_lower_halfblock:
|
||||
addi $a3, $a3, 0x30A
|
||||
add $a3, $a3, $a2
|
||||
jr $ra
|
||||
sll $v0, $a3, 7
|
||||
// returns (0x30A + (adjusted byte2) + (adjusted byte1) * 0xBC) * FONT_CHAR_TEX_SIZE
|
||||
mflo a2
|
||||
addi a3, a3, 0x30A
|
||||
add a3, a3, a2
|
||||
sll v0, a3, 7
|
||||
jr ra
|
||||
/* returns (0x30A + (adjusted byte2) + (adjusted byte1) * 0xBC) * FONT_CHAR_TEX_SIZE */
|
||||
|
||||
// Non-kanji are arranged with irregular gaps, use the lookup table.
|
||||
/* Non-kanji are arranged with irregular gaps, use the lookup table. */
|
||||
.nonkanji:
|
||||
// Get byte1 and adjust so starts at 0
|
||||
srl $a1, $a0, 8
|
||||
addi $a1, $a1, -0x81
|
||||
multu $a2, $a1
|
||||
// Get byte2 and adjust so starts at 0
|
||||
andi $a3, $a0, 0xFF
|
||||
addi $a3, $a3, -0x40
|
||||
slti $at, $a3, (0x80 - 0x40)
|
||||
mflo $a2
|
||||
// 0x__7F is always empty and elided in the file, so decrement if larger
|
||||
bnezl $at, .nonkanji_lower_halfblock
|
||||
mflo $a2
|
||||
addi $a3, $a3, -1
|
||||
mflo $a2
|
||||
/* Get byte1 and adjust so starts at 0 */
|
||||
srl a1, a0, 8
|
||||
addi a1, a1, -0x81
|
||||
mul a2, a2, a1
|
||||
/* Get byte2 and adjust so starts at 0 */
|
||||
andi a3, a0, 0xFF
|
||||
addi a3, a3, -0x40
|
||||
/* 0x__7F is always empty and elided in the file, so decrement if larger */
|
||||
blt a3, 0x40, .nonkanji_lower_halfblock
|
||||
addi a3, a3, -1
|
||||
.nonkanji_lower_halfblock:
|
||||
add $a3, $a3, $a2
|
||||
lui $a2, %hi(kantbl)
|
||||
sll $a3, $a3, 1
|
||||
addiu $a2, %lo(kantbl)
|
||||
add $a3, $a3, $a2
|
||||
lh $a2, ($a3)
|
||||
jr $ra
|
||||
sll $v0, $a2, 7
|
||||
// returns kantbl[(adjusted byte2) + (adjusted byte1) * 0xBC] * FONT_CHAR_TEX_SIZE
|
||||
mflo a2
|
||||
add a3, a3, a2
|
||||
sll a3, a3, 1
|
||||
la a2, kantbl
|
||||
add a3, a3, a2
|
||||
lh a2, (a3)
|
||||
sll v0, a2, 7
|
||||
jr ra
|
||||
/* returns kantbl[(adjusted byte2) + (adjusted byte1) * 0xBC] * FONT_CHAR_TEX_SIZE */
|
||||
.out_of_range:
|
||||
jr $ra
|
||||
li $v0, -1
|
||||
li v0, -1
|
||||
jr ra
|
||||
END(LeoGetKAdr)
|
||||
|
||||
/**
|
||||
@@ -129,7 +112,7 @@ END(LeoGetKAdr)
|
||||
* into blocks by high byte.
|
||||
*/
|
||||
DATA(kantbl)
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x814_ */ .half 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F
|
||||
/* 0x815_ */ .half 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F
|
||||
/* 0x816_ */ .half 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F
|
||||
@@ -143,7 +126,7 @@ DATA(kantbl)
|
||||
/* 0x81E_ */ .half 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x81F_ */ .half 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 0x0090, 0x0000, 0x0000, 0x0000, 0x0000, 0x0091
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x824_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0092
|
||||
/* 0x825_ */ .half 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x826_ */ .half 0x009C, 0x009D, 0x009E, 0x009F, 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB
|
||||
@@ -157,7 +140,7 @@ DATA(kantbl)
|
||||
/* 0x82E_ */ .half 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118, 0x0119, 0x011A, 0x011B, 0x011C, 0x011D, 0x011E, 0x011F, 0x0120
|
||||
/* 0x82F_ */ .half 0x0121, 0x0122, 0x0123, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x834_ */ .half 0x0124, 0x0125, 0x0126, 0x0127, 0x0128, 0x0129, 0x012A, 0x012B, 0x012C, 0x012D, 0x012E, 0x012F, 0x0130, 0x0131, 0x0132, 0x0133
|
||||
/* 0x835_ */ .half 0x0134, 0x0135, 0x0136, 0x0137, 0x0138, 0x0139, 0x013A, 0x013B, 0x013C, 0x013D, 0x013E, 0x013F, 0x0140, 0x0141, 0x0142, 0x0143
|
||||
/* 0x836_ */ .half 0x0144, 0x0145, 0x0146, 0x0147, 0x0148, 0x0149, 0x014A, 0x014B, 0x014C, 0x014D, 0x014E, 0x014F, 0x0150, 0x0151, 0x0152, 0x0153
|
||||
@@ -171,7 +154,7 @@ DATA(kantbl)
|
||||
/* 0x83E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x83F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x844_ */ .half 0x01AB, 0x01AC, 0x01AD, 0x01AE, 0x01AF, 0x01B0, 0x01B1, 0x01B2, 0x01B3, 0x01B4, 0x01B5, 0x01B6, 0x01B7, 0x01B8, 0x01B9, 0x01BA
|
||||
/* 0x845_ */ .half 0x01BB, 0x01BC, 0x01BD, 0x01BE, 0x01BF, 0x01C0, 0x01C1, 0x01C2, 0x01C3, 0x01C4, 0x01C5, 0x01C6, 0x01C7, 0x01C8, 0x01C9, 0x01CA
|
||||
/* 0x846_ */ .half 0x01CB, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
@@ -185,7 +168,7 @@ DATA(kantbl)
|
||||
/* 0x84E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x84F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x854_ */ .half 0x020E, 0x020F, 0x0210, 0x0211, 0x0212, 0x0213, 0x0214, 0x0215, 0x0216, 0x0217, 0x0218, 0x0219, 0x021A, 0x021B, 0x021C, 0x021D
|
||||
/* 0x855_ */ .half 0x021E, 0x021F, 0x0220, 0x0221, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0222, 0x0223
|
||||
/* 0x856_ */ .half 0x0224, 0x0225, 0x0226, 0x0227, 0x0228, 0x0229, 0x022A, 0x022B, 0x022C, 0x022D, 0x022E, 0x022F, 0x0230, 0x0231, 0x0232, 0x0233
|
||||
@@ -199,7 +182,7 @@ DATA(kantbl)
|
||||
/* 0x85E_ */ .half 0x026C, 0x026D, 0x026E, 0x026F, 0x0270, 0x0271, 0x0272, 0x0273, 0x0274, 0x0275, 0x0276, 0x0277, 0x0278, 0x0279, 0x027A, 0x027B
|
||||
/* 0x85F_ */ .half 0x027C, 0x027D, 0x027E, 0x027F, 0x0280, 0x0281, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x864_ */ .half 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0287, 0x0288, 0x0289, 0x028A, 0x028B, 0x028C, 0x028D, 0x028E, 0x028F, 0x0290, 0x0291
|
||||
/* 0x865_ */ .half 0x0292, 0x0293, 0x0294, 0x0295, 0x0296, 0x0297, 0x0298, 0x0299, 0x029A, 0x029B, 0x029C, 0x029D, 0x029E, 0x029F, 0x0000, 0x0000
|
||||
/* 0x866_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
@@ -213,7 +196,7 @@ DATA(kantbl)
|
||||
/* 0x86E_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x86F_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
// 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F
|
||||
/* 0x___0 0x___1 0x___2 0x___3 0x___4 0x___5 0x___6 0x___7 0x___8 0x___9 0x___A 0x___B 0x___C 0x___D 0x___E 0x___F */
|
||||
/* 0x874_ */ .half 0x02C0, 0x02C1, 0x02C2, 0x02C3, 0x02C4, 0x02C5, 0x02C6, 0x02C7, 0x02C8, 0x02C9, 0x02CA, 0x02CB, 0x02CC, 0x02CD, 0x02CE, 0x02CF
|
||||
/* 0x875_ */ .half 0x02D0, 0x02D1, 0x02D2, 0x02D3, 0x02D4, 0x02D5, 0x02D6, 0x02D7, 0x02D8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
/* 0x876_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#include "ultra64/asm.h"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.balign 16
|
||||
.rdata
|
||||
|
||||
DATA(__libm_qnan_f)
|
||||
.word 0x7F810000
|
||||
|
||||
@@ -16,15 +16,15 @@ OSViMode osViModeFpalLan1 = {
|
||||
{
|
||||
// comRegs
|
||||
VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 |
|
||||
VI_CTRL_PIXEL_ADV_3, // ctrl
|
||||
WIDTH(320), // width
|
||||
BURST(58, 30, 4, 69), // burst
|
||||
VSYNC(625), // vSync
|
||||
HSYNC(3177, 23), // hSync
|
||||
LEAP(3183, 3181), // leap
|
||||
HSTART(128, 768), // hStart
|
||||
SCALE(2, 0), // xScale
|
||||
VCURRENT(0), // vCurrent
|
||||
VI_CTRL_PIXEL_ADV(3), // ctrl
|
||||
WIDTH(320), // width
|
||||
BURST(58, 30, 4, 69), // burst
|
||||
VSYNC(625), // vSync
|
||||
HSYNC(3177, 23), // hSync
|
||||
LEAP(3183, 3181), // leap
|
||||
HSTART(128, 768), // hStart
|
||||
SCALE(2, 0), // xScale
|
||||
VCURRENT(0), // vCurrent
|
||||
},
|
||||
{ // fldRegs
|
||||
{
|
||||
|
||||
@@ -16,15 +16,15 @@ OSViMode osViModeMpalLan1 = {
|
||||
{
|
||||
// comRegs
|
||||
VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 |
|
||||
VI_CTRL_PIXEL_ADV_3, // ctrl
|
||||
WIDTH(320), // width
|
||||
BURST(57, 30, 5, 70), // burst
|
||||
VSYNC(525), // vSync
|
||||
HSYNC(3089, 4), // hSync
|
||||
LEAP(3097, 3098), // leap
|
||||
HSTART(108, 748), // hStart
|
||||
SCALE(2, 0), // xScale
|
||||
VCURRENT(0), // vCurrent
|
||||
VI_CTRL_PIXEL_ADV(3), // ctrl
|
||||
WIDTH(320), // width
|
||||
BURST(57, 30, 5, 70), // burst
|
||||
VSYNC(525), // vSync
|
||||
HSYNC(3089, 4), // hSync
|
||||
LEAP(3097, 3098), // leap
|
||||
HSTART(108, 748), // hStart
|
||||
SCALE(2, 0), // xScale
|
||||
VCURRENT(0), // vCurrent
|
||||
},
|
||||
{ // fldRegs
|
||||
{
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user