mirror of
https://github.com/izzy2lost/Diddy-Kong-Racing.git
synced 2026-06-19 01:16:26 -07:00
gcc building (#487)
This commit is contained in:
Fazana
@@ -12,6 +12,10 @@ VERSION := us_1.0
|
||||
NON_MATCHING ?= 0
|
||||
$(eval $(call validate-option,NON_MATCHING,0 1))
|
||||
|
||||
# Experimental option for nonmatching builds. GCC may not function identically to ido.
|
||||
COMPILER ?= ido
|
||||
$(eval $(call validate-option,NON_MATCHING,ido gcc))
|
||||
|
||||
LIBULTRA_VERSION_DEFINE := -DBUILD_VERSION=4 -DBUILD_VERSION_STRING=\"2.0G\"
|
||||
|
||||
ifeq ($(VERSION),us_1.0)
|
||||
@@ -30,6 +34,8 @@ ifeq ($(NON_MATCHING),1)
|
||||
DEFINES += AVOID_UB=1
|
||||
else
|
||||
DEFINES += ANTI_TAMPER=1
|
||||
# Override compiler choice on matching builds.
|
||||
COMPILER := ido
|
||||
endif
|
||||
|
||||
# Whether to hide commands or not
|
||||
@@ -41,6 +47,9 @@ endif
|
||||
# Whether to colorize build messages
|
||||
COLOR ?= 1
|
||||
|
||||
# Optimisation flag for nonmatching GCC builds. Can be -O2, -O3, -Os or -OFast, among others.
|
||||
OPT_FLAGS_GCC := -O2
|
||||
|
||||
############################ Setup ###########################
|
||||
|
||||
# Don't do setup checks if cleaning.
|
||||
@@ -216,7 +225,14 @@ ifeq ($(shell getconf LONG_BIT), 64)
|
||||
# Ensure that gcc treats the code as 32-bit
|
||||
CC_CHECK_CFLAGS += -m32
|
||||
endif
|
||||
CC_CHECK_CFLAGS := -fsyntax-only -funsigned-char $(INCLUDE_CFLAGS) $(DEF_INC_CFLAGS) -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-main -DNON_MATCHING -DAVOID_UB -D_LANGUAGE_C -DNDEBUG -Werror-implicit-function-declaration
|
||||
|
||||
ifeq ($(NON_MATCHING),0)
|
||||
C_STANDARD := -std=gnu90
|
||||
else
|
||||
C_STANDARD := -std=gnu99
|
||||
endif
|
||||
|
||||
CC_CHECK_CFLAGS := -fsyntax-only -funsigned-char $(INCLUDE_CFLAGS) $(DEF_INC_CFLAGS) $(C_STANDARD) -Wall -Wextra -Wno-format-security -Wno-main -DNON_MATCHING -DAVOID_UB -D_LANGUAGE_C -DNDEBUG -Werror-implicit-function-declaration
|
||||
|
||||
# Disable GCC complaining about fakematches necessary to match if building a matching ROM. Example: "var2 = (0, var1)"
|
||||
ifeq ($(NON_MATCHING),0)
|
||||
@@ -314,6 +330,38 @@ $(BUILD_DIR)/src/collision.o: MIPSISET := -mips2
|
||||
|
||||
######################## Targets #############################
|
||||
|
||||
ifeq ($(COMPILER),gcc)
|
||||
DUMMY != python3 ./tools/python/gcc_generate.py gcc_safe_files.mk
|
||||
include gcc_safe_files.mk
|
||||
endif
|
||||
|
||||
$(GCC_SAFE_FILES): CC := $(CROSS)gcc
|
||||
|
||||
$(GCC_SAFE_FILES): CFLAGS := -c -DNDEBUG -DAVOID_UB $(OPT_FLAGS_GCC) $(INCLUDE_CFLAGS) $(DEF_INC_CFLAGS) \
|
||||
-EB \
|
||||
-march=vr4300 \
|
||||
-mabi=32 \
|
||||
-mno-check-zero-division \
|
||||
-mno-abicalls \
|
||||
-mgp32 \
|
||||
-mfp32 \
|
||||
-mhard-float \
|
||||
-ffreestanding \
|
||||
-fno-builtin \
|
||||
-fno-common \
|
||||
-mno-long-calls \
|
||||
-ffast-math \
|
||||
-funsafe-math-optimizations \
|
||||
-fno-merge-constants \
|
||||
-fno-strict-aliasing \
|
||||
-fno-zero-initialized-in-bss \
|
||||
-fsingle-precision-constant \
|
||||
-funsigned-char \
|
||||
-mips3 \
|
||||
-fwrapv \
|
||||
-falign-functions=16 \
|
||||
-G 0
|
||||
|
||||
default: all
|
||||
|
||||
TARGET = dkr
|
||||
@@ -355,7 +403,14 @@ else
|
||||
@echo "build lib directory has already been deleted."
|
||||
endif
|
||||
|
||||
clean_src: clean_lib
|
||||
clean_asm:
|
||||
ifneq ($(wildcard $(BUILD_DIR)/lib/.*),)
|
||||
rm -r $(BUILD_DIR)/asm/*.o
|
||||
else
|
||||
@echo "build asm directory has already been deleted."
|
||||
endif
|
||||
|
||||
clean_src: clean_lib clean_asm
|
||||
ifneq ($(wildcard $(BUILD_DIR)/src/.*),)
|
||||
rm -r $(BUILD_DIR)/src/*.o
|
||||
rm -f dkr.ld
|
||||
|
||||
+2
-2
@@ -21,9 +21,9 @@ glabel entrypoint
|
||||
/* 001018 80000418 AD000004 */ sw $zero, 4($t0)
|
||||
/* 00101C 8000041C 1520FFFC */ bnez $t1, .L80000410
|
||||
/* 001020 80000420 21080008 */ addi $t0, $t0, 8
|
||||
/* 001024 80000424 3C0A8006 */ lui $t2, %hi(main) # $t2, 0x8006
|
||||
/* 001024 80000424 3C0A8006 */ lui $t2, %hi(mainproc) # $t2, 0x8006
|
||||
/* 001028 80000428 3C1D8012 */ lui $sp, %hi(gCameraSegment) # $sp, 0x8012
|
||||
/* 00102C 8000042C 254A5D40 */ addiu $t2, %lo(main) # addiu $t2, $t2, 0x5d40
|
||||
/* 00102C 8000042C 254A5D40 */ addiu $t2, %lo(mainproc) # addiu $t2, $t2, 0x5d40
|
||||
/* 001030 80000430 01400008 */ jr $t2
|
||||
/* 001034 80000434 27BD0AC0 */ addiu $sp, %lo(gCameraSegment) # addiu $sp, $sp, 0xac0
|
||||
/* 001038 80000438 00000000 */ nop
|
||||
|
||||
@@ -0,0 +1,267 @@
|
||||
/* The comment below is needed for this file to be picked up by generate_ld */
|
||||
/* RAM_POS: 0x800C68C0 */
|
||||
|
||||
.ifdef NON_MATCHING
|
||||
|
||||
# assembler directives
|
||||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
.set gp=64
|
||||
|
||||
.include "macros.inc"
|
||||
|
||||
.section .rodata
|
||||
glabel D_800E9550
|
||||
.double -0.0
|
||||
glabel D_800E9558
|
||||
.double -0.0
|
||||
|
||||
.section .text, "ax"
|
||||
|
||||
/* -------------------------------------------------------------------------------------- */
|
||||
/* need to asm these functions because lib32gcc-7-dev-mips-cross does not exist so we */
|
||||
/* cannot naturally link a libgcc variant for this target given this architecture and */
|
||||
/* compiler. Until we have a good workaround with a gcc target that doesn't involve */
|
||||
/* assuming a 32-bit to 64-bit change, we have to encode these functions as raw assembly */
|
||||
/* for it to compile. */
|
||||
/* -------------------------------------------------------------------------------------- */
|
||||
|
||||
/* TODO: Is there a non-insane way to fix this hack that doesn't involve the user compiling */
|
||||
/* a library themselves? */
|
||||
glabel __umoddi3
|
||||
sw $a0, ($sp)
|
||||
sw $a1, 4($sp)
|
||||
sw $a2, 8($sp)
|
||||
sw $a3, 0xc($sp)
|
||||
ld $t7, 8($sp)
|
||||
ld $t6, ($sp)
|
||||
ddivu $zero, $t6, $t7
|
||||
bnez $t7, .L80324144
|
||||
nop
|
||||
break 7
|
||||
.L80324144:
|
||||
mfhi $v0
|
||||
dsll32 $v1, $v0, 0
|
||||
dsra32 $v1, $v1, 0
|
||||
jr $ra
|
||||
dsra32 $v0, $v0, 0
|
||||
|
||||
glabel __udivdi3
|
||||
sw $a0, ($sp)
|
||||
sw $a1, 4($sp)
|
||||
sw $a2, 8($sp)
|
||||
sw $a3, 0xc($sp)
|
||||
ld $t7, 8($sp)
|
||||
ld $t6, ($sp)
|
||||
ddivu $zero, $t6, $t7
|
||||
bnez $t7, .L80324180
|
||||
nop
|
||||
break 7
|
||||
.L80324180:
|
||||
mflo $v0
|
||||
dsll32 $v1, $v0, 0
|
||||
dsra32 $v1, $v1, 0
|
||||
jr $ra
|
||||
dsra32 $v0, $v0, 0
|
||||
|
||||
glabel __moddi3
|
||||
sw $a0, ($sp)
|
||||
sw $a1, 4($sp)
|
||||
sw $a2, 8($sp)
|
||||
sw $a3, 0xc($sp)
|
||||
ld $t7, 8($sp)
|
||||
ld $t6, ($sp)
|
||||
ddivu $zero, $t6, $t7
|
||||
bnez $t7, .L803241E8
|
||||
nop
|
||||
break 7
|
||||
.L803241E8:
|
||||
mfhi $v0
|
||||
dsll32 $v1, $v0, 0
|
||||
dsra32 $v1, $v1, 0
|
||||
jr $ra
|
||||
dsra32 $v0, $v0, 0
|
||||
|
||||
glabel __divdi3
|
||||
sw $a0, ($sp)
|
||||
sw $a1, 4($sp)
|
||||
sw $a2, 8($sp)
|
||||
sw $a3, 0xc($sp)
|
||||
ld $t7, 8($sp)
|
||||
ld $t6, ($sp)
|
||||
ddiv $zero, $t6, $t7
|
||||
nop
|
||||
bnez $t7, .L80324228
|
||||
nop
|
||||
break 7
|
||||
.L80324228:
|
||||
daddiu $at, $zero, -1
|
||||
bne $t7, $at, .L80324244
|
||||
daddiu $at, $zero, 1
|
||||
dsll32 $at, $at, 0x1f
|
||||
bne $t6, $at, .L80324244
|
||||
nop
|
||||
break 6
|
||||
.L80324244:
|
||||
mflo $v0
|
||||
dsll32 $v1, $v0, 0
|
||||
dsra32 $v1, $v1, 0
|
||||
jr $ra
|
||||
dsra32 $v0, $v0, 0
|
||||
|
||||
glabel __d_to_ll
|
||||
/* 0CA730 800C9B30 46206109 */ trunc.l.d $f4, $f12
|
||||
/* 0CA734 800C9B34 44222000 */ dmfc1 $v0, $f4
|
||||
/* 0CA738 800C9B38 00000000 */ nop
|
||||
/* 0CA73C 800C9B3C 0002183C */ dsll32 $v1, $v0, 0
|
||||
/* 0CA740 800C9B40 0003183F */ dsra32 $v1, $v1, 0
|
||||
/* 0CA744 800C9B44 03E00008 */ jr $ra
|
||||
/* 0CA748 800C9B48 0002103F */ dsra32 $v0, $v0, 0
|
||||
glabel __f_to_ll
|
||||
/* 0CA74C 800C9B4C 46006109 */ trunc.l.s $f4, $f12
|
||||
/* 0CA750 800C9B50 44222000 */ dmfc1 $v0, $f4
|
||||
/* 0CA754 800C9B54 00000000 */ nop
|
||||
/* 0CA758 800C9B58 0002183C */ dsll32 $v1, $v0, 0
|
||||
/* 0CA75C 800C9B5C 0003183F */ dsra32 $v1, $v1, 0
|
||||
/* 0CA760 800C9B60 03E00008 */ jr $ra
|
||||
/* 0CA764 800C9B64 0002103F */ dsra32 $v0, $v0, 0
|
||||
|
||||
glabel __d_to_ull
|
||||
/* 0CA768 800C9B68 444EF800 */ cfc1 $t6, $31
|
||||
/* 0CA76C 800C9B6C 24020001 */ li $v0, 1
|
||||
/* 0CA770 800C9B70 44C2F800 */ ctc1 $v0, $31
|
||||
/* 0CA774 800C9B74 00000000 */ nop
|
||||
/* 0CA778 800C9B78 46206125 */ cvt.l.d $f4, $f12
|
||||
/* 0CA77C 800C9B7C 4442F800 */ cfc1 $v0, $31
|
||||
/* 0CA780 800C9B80 00000000 */ nop
|
||||
/* 0CA784 800C9B84 30410004 */ andi $at, $v0, 4
|
||||
/* 0CA788 800C9B88 30420078 */ andi $v0, $v0, 0x78
|
||||
/* 0CA78C 800C9B8C 10400015 */ beqz $v0, .L800C9BE4
|
||||
/* 0CA790 800C9B90 3C0143E0 */ li $at, 0x43E00000 # 448.000000
|
||||
/* 0CA794 800C9B94 44812800 */ mtc1 $at, $f5
|
||||
/* 0CA798 800C9B98 44802000 */ mtc1 $zero, $f4
|
||||
/* 0CA79C 800C9B9C 24020001 */ li $v0, 1
|
||||
/* 0CA7A0 800C9BA0 46246101 */ sub.d $f4, $f12, $f4
|
||||
/* 0CA7A4 800C9BA4 44C2F800 */ ctc1 $v0, $31
|
||||
/* 0CA7A8 800C9BA8 00000000 */ nop
|
||||
/* 0CA7AC 800C9BAC 46202125 */ cvt.l.d $f4, $f4
|
||||
/* 0CA7B0 800C9BB0 4442F800 */ cfc1 $v0, $31
|
||||
/* 0CA7B4 800C9BB4 00000000 */ nop
|
||||
/* 0CA7B8 800C9BB8 30410004 */ andi $at, $v0, 4
|
||||
/* 0CA7BC 800C9BBC 30420078 */ andi $v0, $v0, 0x78
|
||||
/* 0CA7C0 800C9BC0 14400006 */ bnez $v0, .L800C9BDC
|
||||
/* 0CA7C4 800C9BC4 00000000 */ nop
|
||||
/* 0CA7C8 800C9BC8 3C0F800F */ lui $t7, %hi(D_800E9550) # $t7, 0x800f
|
||||
/* 0CA7CC 800C9BCC DDEF9550 */ ld $t7, %lo(D_800E9550)($t7)
|
||||
/* 0CA7D0 800C9BD0 44222000 */ dmfc1 $v0, $f4
|
||||
/* 0CA7D4 800C9BD4 10000007 */ b .L800C9BF4
|
||||
/* 0CA7D8 800C9BD8 004F1025 */ or $v0, $v0, $t7
|
||||
.L800C9BDC:
|
||||
/* 0CA7DC 800C9BDC 10000005 */ b .L800C9BF4
|
||||
/* 0CA7E0 800C9BE0 2402FFFF */ li $v0, -1
|
||||
.L800C9BE4:
|
||||
/* 0CA7E4 800C9BE4 44222000 */ dmfc1 $v0, $f4
|
||||
/* 0CA7E8 800C9BE8 00000000 */ nop
|
||||
/* 0CA7EC 800C9BEC 0440FFFB */ bltz $v0, .L800C9BDC
|
||||
/* 0CA7F0 800C9BF0 00000000 */ nop
|
||||
.L800C9BF4:
|
||||
/* 0CA7F4 800C9BF4 44CEF800 */ ctc1 $t6, $31
|
||||
/* 0CA7F8 800C9BF8 0002183C */ dsll32 $v1, $v0, 0
|
||||
/* 0CA7FC 800C9BFC 0003183F */ dsra32 $v1, $v1, 0
|
||||
/* 0CA800 800C9C00 03E00008 */ jr $ra
|
||||
/* 0CA804 800C9C04 0002103F */ dsra32 $v0, $v0, 0
|
||||
|
||||
glabel __f_to_ull
|
||||
/* 0CA808 800C9C08 444EF800 */ cfc1 $t6, $31
|
||||
/* 0CA80C 800C9C0C 24020001 */ li $v0, 1
|
||||
/* 0CA810 800C9C10 44C2F800 */ ctc1 $v0, $31
|
||||
/* 0CA814 800C9C14 00000000 */ nop
|
||||
/* 0CA818 800C9C18 46006125 */ cvt.l.s $f4, $f12
|
||||
/* 0CA81C 800C9C1C 4442F800 */ cfc1 $v0, $31
|
||||
/* 0CA820 800C9C20 00000000 */ nop
|
||||
/* 0CA824 800C9C24 30410004 */ andi $at, $v0, 4
|
||||
/* 0CA828 800C9C28 30420078 */ andi $v0, $v0, 0x78
|
||||
/* 0CA82C 800C9C2C 10400014 */ beqz $v0, .L800C9C80
|
||||
/* 0CA830 800C9C30 3C015F00 */ li $at, 0x5F000000 # 9223372036854775808.000000
|
||||
/* 0CA834 800C9C34 44812000 */ mtc1 $at, $f4
|
||||
/* 0CA838 800C9C38 24020001 */ li $v0, 1
|
||||
/* 0CA83C 800C9C3C 46046101 */ sub.s $f4, $f12, $f4
|
||||
/* 0CA840 800C9C40 44C2F800 */ ctc1 $v0, $31
|
||||
/* 0CA844 800C9C44 00000000 */ nop
|
||||
/* 0CA848 800C9C48 46002125 */ cvt.l.s $f4, $f4
|
||||
/* 0CA84C 800C9C4C 4442F800 */ cfc1 $v0, $31
|
||||
/* 0CA850 800C9C50 00000000 */ nop
|
||||
/* 0CA854 800C9C54 30410004 */ andi $at, $v0, 4
|
||||
/* 0CA858 800C9C58 30420078 */ andi $v0, $v0, 0x78
|
||||
/* 0CA85C 800C9C5C 14400006 */ bnez $v0, .L800C9C78
|
||||
/* 0CA860 800C9C60 00000000 */ nop
|
||||
/* 0CA864 800C9C64 3C0F800F */ lui $t7, %hi(D_800E9558) # $t7, 0x800f
|
||||
/* 0CA868 800C9C68 DDEF9558 */ ld $t7, %lo(D_800E9558)($t7)
|
||||
/* 0CA86C 800C9C6C 44222000 */ dmfc1 $v0, $f4
|
||||
/* 0CA870 800C9C70 10000007 */ b .L800C9C90
|
||||
/* 0CA874 800C9C74 004F1025 */ or $v0, $v0, $t7
|
||||
.L800C9C78:
|
||||
/* 0CA878 800C9C78 10000005 */ b .L800C9C90
|
||||
/* 0CA87C 800C9C7C 2402FFFF */ li $v0, -1
|
||||
.L800C9C80:
|
||||
/* 0CA880 800C9C80 44222000 */ dmfc1 $v0, $f4
|
||||
/* 0CA884 800C9C84 00000000 */ nop
|
||||
/* 0CA888 800C9C88 0440FFFB */ bltz $v0, .L800C9C78
|
||||
/* 0CA88C 800C9C8C 00000000 */ nop
|
||||
.L800C9C90:
|
||||
/* 0CA890 800C9C90 44CEF800 */ ctc1 $t6, $31
|
||||
/* 0CA894 800C9C94 0002183C */ dsll32 $v1, $v0, 0
|
||||
/* 0CA898 800C9C98 0003183F */ dsra32 $v1, $v1, 0
|
||||
/* 0CA89C 800C9C9C 03E00008 */ jr $ra
|
||||
/* 0CA8A0 800C9CA0 0002103F */ dsra32 $v0, $v0, 0
|
||||
|
||||
glabel __ll_to_d
|
||||
/* 0CA8A4 800C9CA4 AFA40000 */ sw $a0, ($sp)
|
||||
/* 0CA8A8 800C9CA8 AFA50004 */ sw $a1, 4($sp)
|
||||
/* 0CA8AC 800C9CAC DFAE0000 */ ld $t6, ($sp)
|
||||
/* 0CA8B0 800C9CB0 44AE2000 */ dmtc1 $t6, $f4
|
||||
/* 0CA8B4 800C9CB4 03E00008 */ jr $ra
|
||||
/* 0CA8B8 800C9CB8 46A02021 */ cvt.d.l $f0, $f4
|
||||
|
||||
glabel __ll_to_f
|
||||
/* 0CA8BC 800C9CBC AFA40000 */ sw $a0, ($sp)
|
||||
/* 0CA8C0 800C9CC0 AFA50004 */ sw $a1, 4($sp)
|
||||
/* 0CA8C4 800C9CC4 DFAE0000 */ ld $t6, ($sp)
|
||||
/* 0CA8C8 800C9CC8 44AE2000 */ dmtc1 $t6, $f4
|
||||
/* 0CA8CC 800C9CCC 03E00008 */ jr $ra
|
||||
/* 0CA8D0 800C9CD0 46A02020 */ cvt.s.l $f0, $f4
|
||||
|
||||
glabel __ull_to_d
|
||||
/* 0CA8D4 800C9CD4 AFA40000 */ sw $a0, ($sp)
|
||||
/* 0CA8D8 800C9CD8 AFA50004 */ sw $a1, 4($sp)
|
||||
/* 0CA8DC 800C9CDC DFAE0000 */ ld $t6, ($sp)
|
||||
/* 0CA8E0 800C9CE0 44AE2000 */ dmtc1 $t6, $f4
|
||||
/* 0CA8E4 800C9CE4 05C10006 */ bgez $t6, .L800C9D00
|
||||
/* 0CA8E8 800C9CE8 46A02021 */ cvt.d.l $f0, $f4
|
||||
/* 0CA8EC 800C9CEC 3C0141F0 */ li $at, 0x41F00000 # 30.000000
|
||||
/* 0CA8F0 800C9CF0 44813800 */ mtc1 $at, $f7
|
||||
/* 0CA8F4 800C9CF4 44803000 */ mtc1 $zero, $f6
|
||||
/* 0CA8F8 800C9CF8 00000000 */ nop
|
||||
/* 0CA8FC 800C9CFC 46260000 */ add.d $f0, $f0, $f6
|
||||
.L800C9D00:
|
||||
/* 0CA900 800C9D00 03E00008 */ jr $ra
|
||||
/* 0CA904 800C9D04 00000000 */ nop
|
||||
|
||||
glabel __ull_to_f
|
||||
/* 0CA908 800C9D08 AFA40000 */ sw $a0, ($sp)
|
||||
/* 0CA90C 800C9D0C AFA50004 */ sw $a1, 4($sp)
|
||||
/* 0CA910 800C9D10 DFAE0000 */ ld $t6, ($sp)
|
||||
/* 0CA914 800C9D14 44AE2000 */ dmtc1 $t6, $f4
|
||||
/* 0CA918 800C9D18 05C10005 */ bgez $t6, .L800C9D30
|
||||
/* 0CA91C 800C9D1C 46A02020 */ cvt.s.l $f0, $f4
|
||||
/* 0CA920 800C9D20 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000
|
||||
/* 0CA924 800C9D24 44813000 */ mtc1 $at, $f6
|
||||
/* 0CA928 800C9D28 00000000 */ nop
|
||||
/* 0CA92C 800C9D2C 46060000 */ add.s $f0, $f0, $f6
|
||||
.L800C9D30:
|
||||
/* 0CA930 800C9D30 03E00008 */ jr $ra
|
||||
/* 0CA934 800C9D34 00000000 */ nop
|
||||
|
||||
/* 0CA938 800C9D38 00000000 */ nop
|
||||
/* 0CA93C 800C9D3C 00000000 */ nop
|
||||
.endif
|
||||
@@ -1,6 +1,11 @@
|
||||
/* The comment below is needed for this file to be picked up by generate_ld */
|
||||
/* RAM_POS: 0x800C9B30 */
|
||||
|
||||
|
||||
#ifndef NON_MATCHING
|
||||
|
||||
// GCC complains if these are compiled, so include assembly variants instead in nonmatching builds.
|
||||
|
||||
long long __d_to_ll(double d) {
|
||||
return d;
|
||||
}
|
||||
@@ -32,3 +37,5 @@ double __ull_to_d(unsigned long long u) {
|
||||
float __ull_to_f(unsigned long long u) {
|
||||
return u;
|
||||
}
|
||||
|
||||
#endif
|
||||
+4
-1
@@ -22,8 +22,11 @@ UNUSED u64 gUnusedThreadStack[0x200];
|
||||
* It kicks things off by initialising thread1, which serves as the top level
|
||||
* Official name: boot
|
||||
*/
|
||||
void main(void) {
|
||||
void mainproc(void) {
|
||||
osInitialize();
|
||||
#ifdef AVOID_UB
|
||||
bzero(&gMainMemoryPool, RAM_END - (s32)(&gMainMemoryPool));
|
||||
#endif
|
||||
osCreateThread(&gThread1, 1, &thread1_main, 0, &gThread1Stack[0x20], OS_PRIORITY_IDLE);
|
||||
osStartThread(&gThread1);
|
||||
}
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "macros.h"
|
||||
#include <ultra64.h>
|
||||
|
||||
void main(void);
|
||||
void mainproc(void);
|
||||
void thread1_main(void *);
|
||||
void thread3_verify_stack(void);
|
||||
|
||||
|
||||
@@ -6135,7 +6135,12 @@ void obj_init_midifade(Object *obj, LevelObjectEntry_MidiFade *entry) {
|
||||
ObjectModel *objModel;
|
||||
Vertex *vertices;
|
||||
Vertex *vertex;
|
||||
// TODO: find a way to have matching builds use this Matrix temp.
|
||||
#ifdef AVOID_UB
|
||||
Matrix mtx;
|
||||
#else
|
||||
f32 mtx[4];
|
||||
#endif
|
||||
f32 sinYRot;
|
||||
f32 tempF3;
|
||||
f32 minX;
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
# Complete file list producer v0.7
|
||||
# Written by ProjectRevoTPP
|
||||
|
||||
import os
|
||||
from glob import glob
|
||||
from itertools import chain
|
||||
import sys
|
||||
|
||||
def holecount(file):
|
||||
with open(file, 'r', encoding = 'utf-8') as infile:
|
||||
contents = infile.readlines()
|
||||
asm_count = 0
|
||||
for i, line in enumerate(contents):
|
||||
if(line.count("GLOBAL_ASM") > 0 and (i + 1 == len(contents) or contents[i+1].count("#endif") == 0)):
|
||||
asm_count += 1
|
||||
return asm_count
|
||||
|
||||
def noncount(file):
|
||||
with open(file, 'r', encoding = 'utf-8') as infile:
|
||||
contents = infile.readlines()
|
||||
noncount = 0
|
||||
for i, line in enumerate(contents):
|
||||
if(line.count("NON_") > 0):
|
||||
noncount += 1
|
||||
return noncount
|
||||
|
||||
def holecount_all(src):
|
||||
for subdir, dirs, files in os.walk(src):
|
||||
for filename in files:
|
||||
filepath = subdir + os.sep + filename
|
||||
if(not filename.endswith('.c')):
|
||||
continue
|
||||
holes = holecount(filepath)
|
||||
nonmatches = noncount(filepath)
|
||||
if(holes > 0 and nonmatches > 0):
|
||||
print(filename, holes, nonmatches)
|
||||
return 1
|
||||
|
||||
paths = ('src', 'lib')
|
||||
|
||||
# get file encoding type
|
||||
def get_encoding_type(file):
|
||||
with open(file, 'rb') as f:
|
||||
rawdata = f.read()
|
||||
return detect(rawdata)['encoding']
|
||||
|
||||
outfile = open(sys.argv[1], "w")
|
||||
outfile.write("# This file is auto-generated. DO NOT MODIFY!\n\n")
|
||||
outfile.write("GCC_SAFE_FILES := \\\n")
|
||||
for directory in chain.from_iterable(os.walk(path) for path in paths):
|
||||
for filename in glob(os.path.join(directory[0], "*.c")):
|
||||
infile = open(filename, "r", encoding="ascii", errors="surrogateescape")
|
||||
# Open content.
|
||||
contents = infile.read()
|
||||
# Set the counts.
|
||||
nonm_count = contents.count("NON_MATCHING")
|
||||
noneq_count = contents.count("NON_EQUIVALENT")
|
||||
global_asm_count = contents.count("GLOBAL_ASM")
|
||||
if nonm_count > 0:
|
||||
print(filename + ": " + str(nonm_count))
|
||||
if noneq_count > 0:
|
||||
print(filename + ": " + str(noneq_count))
|
||||
if global_asm_count > 0:
|
||||
print(filename + ": " + str(global_asm_count))
|
||||
# NOTE: As of now there is no distinction between unattempted files and unfinished ones.
|
||||
if (nonm_count + noneq_count + global_asm_count) == 0 :
|
||||
outfile.write(" $(BUILD_DIR)/")
|
||||
outfile.write(os.path.splitext(filename)[0])
|
||||
outfile.write(".o \\\n")
|
||||
infile.close()
|
||||
outfile.close()
|
||||
Reference in New Issue
Block a user