Skip to content

Commit 5ba7090

Browse files
mkstmkst
committed
fixed extra -g in CFLAGS causing grief..
1 parent 090b45b commit 5ba7090

28 files changed

+536
-485
lines changed

‎conker/Makefile‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ INCLUDE_CFLAGS := -I . -I include -I include/2.0L -I include/2.0L/PR -I include/
100100

101101
ASFLAGS = -EB -mtune=vr4300 -march=vr4300 -mabi=32 -I include
102102

103-
CFLAGS := -G 0 -Xfullwarn -Xcpluscomm -signed -g -nostdinc -non_shared -Wab,-r4300_mul
103+
CFLAGS := -G 0 -Xfullwarn -Xcpluscomm -signed -nostdinc -non_shared -Wab,-r4300_mul
104104
CFLAGS += -D_LANGUAGE_C -D_FINALROM -DF3DEX_GBI_2 -D_MIPS_SZLONG=32
105105
# ignore compiler warnings about anonymous structs
106106
CFLAGS += -woff 649,838
@@ -127,10 +127,18 @@ $(BUILD_DIR)/$(SRC_DIR)/init_214F0.o: OPT_FLAGS := -g
127127
$(BUILD_DIR)/$(SRC_DIR)/init_22040.o: OPT_FLAGS := -g
128128
$(BUILD_DIR)/$(SRC_DIR)/init_22460.o: OPT_FLAGS := -g
129129

130-
# $(BUILD_DIR)/$(SRC_DIR)/game_3B920.o: OPT_FLAGS := -g
131130

132-
# not exactly right:
133-
# $(BUILD_DIR)/$(SRC_DIR)/libultra/io/%.o: OPT_FLAGS := -g3
131+
$(BUILD_DIR)/$(SRC_DIR)/libultra/io/ai.o: OPT_FLAGS := -O1
132+
$(BUILD_DIR)/$(SRC_DIR)/libultra/io/aigetstat.o: OPT_FLAGS := -O1
133+
$(BUILD_DIR)/$(SRC_DIR)/libultra/io/aisetfreq.o: OPT_FLAGS := -O1
134+
135+
$(BUILD_DIR)/$(SRC_DIR)/libultra/os/getthreadpri.o: OPT_FLAGS := -O1
136+
137+
$(BUILD_DIR)/$(SRC_DIR)/init_3920.o: OPT_FLAGS := -O2
138+
139+
# $(BUILD_DIR)/$(SRC_DIR)/init_B1B0.o: OPT_FLAGS := -O2
140+
141+
# $(BUILD_DIR)/$(SRC_DIR)/game_14FF90.o: OPT_FLAGS := -O3
134142

135143
### Non-matching
136144
ifeq ($(NON_MATCHING),1)

‎conker/conker.us.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ segments:
127127
- [0x22F60, asm, "libultra/libc/lldiv"]
128128
- [0x23060, asm, "libultra/libc/ldiv"]
129129
- [0x230F0, asm, "libultra/libc/xlitob"]
130-
- [0x23390, asm, "libultra/io/ai"]
130+
- [0x23390, c, "libultra/io/ai"]
131131
- [0x233C0, asm, "libultra/os/virtualtophysical"]
132132
- [0x23440, asm, "libultra/os/recvmesg"]
133133
- [0x23580, asm, "libultra/os/sendmesg"]
@@ -153,7 +153,7 @@ segments:
153153
- [0x24830, asm, "libultra/io/viswapbuf"]
154154
- [0x24880, asm, "libultra/os/setintmask"]
155155
- [0x24920, asm, "libultra/io/pidma"]
156-
- [0x24A30, asm, "libultra/io/aigetstat"]
156+
- [0x24A30, c, "libultra/io/aigetstat"]
157157
- [0x24A40, asm, "libultra/os/settimer"]
158158
- [0x24B20, asm, "libultra/io/sptaskyielded"]
159159
- [0x24BA0, asm, "libultra/io/sptaskyield"]
@@ -175,7 +175,7 @@ segments:
175175
- [0x262C0, asm, "libultra/io/pigetstat"]
176176
- [0x262D0, asm, "libultra/os/unmaptlb"]
177177
- [0x26310, asm, "libultra/os/maptlb"]
178-
- [0x263D0, c, "libultra/io/aisetfreq"] # -O1 -g3
178+
- [0x263D0, c, "libultra/io/aisetfreq"] # -O1
179179
- [0x26530, asm, "libultra/gu/sqrtf"]
180180
- [0x26540, asm, "libultra/gu/sinf"]
181181
- [0x26700, asm, "libultra/io/sprawread"]
@@ -541,7 +541,7 @@ segments:
541541
- [0x118670, asm]
542542
- [0x1188e0, asm]
543543
- [0x119370, asm]
544-
- [0x119960, c]
544+
- [0x119960, c, "game/done/game_119960"]
545545
- [0x1199D0, asm]
546546
- [0x11a680, asm]
547547
- [0x11c2b0, asm]
@@ -618,15 +618,15 @@ segments:
618618
- [0x15d6e0, asm]
619619
- [0x15d730, asm]
620620
- [0x15f680, asm]
621-
- [0x161520, asm]
621+
- [0x161520, c]
622622
- [0x168a90, c]
623623
- [0x169510, c]
624624
- [0x16DC80, c]
625625
- [0x16ee20, c]
626626
- [0x173d40, asm]
627627
- [0x174bf0, asm]
628628
- [0x175250, asm]
629-
- [0x1765e0, asm]
629+
- [0x1765E0, c, "game/done/game_1765E0"]
630630
- [0x176a00, asm]
631631
- [0x179f30, asm]
632632
- [0x17caf0, asm]

‎conker/include/functions.h‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ s32 func_1000B8B8(s32 arg0, u8 arg1, f32 arg2, f32 arg3, f32 arg4);
6767
s32 func_1000BBE8(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
6868
s32 func_1000BC28(s32 arg0, u8 arg1, s32 arg2, s32 arg3);
6969
void func_1000CBA8(s32 arg0);
70+
s32 func_1000CD40(s32 arg0, s32 arg1, s32 arg2);
7071
void func_1000E054(s32 arg0, s32 arg1);
7172
s32 func_1000E0F8(s32 arg0);
7273
void func_1000E40C(s32 arg0, s32 arg1);
@@ -144,14 +145,12 @@ void func_10017F10(struct26 *arg0, u8 arg1, u8 arg2, u8 arg3, s32 arg4);
144145

145146
void n_alInit(struct07 *arg0, s32 arg1);
146147
void n_alClose(s32 arg0);
147-
void _n_freeParam(struct36 **arg0);
148148
s32 _n_timeToSamplesNoRound(s32 micros);
149149
s32 _n_timeToSamples(s32 micros);
150150
f32 alCents2Ratio(s32 arg0);
151151
void func_10019B50(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
152152
void func_10019C28(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
153153
void func_10019CD0(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
154-
void func_10019CFC(struct21 *arg0, s32 arg1, s32 arg2, s32 arg3);
155154
void func_10019D6C(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
156155
void func_10019ED8(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
157156
void func_10019F38(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
@@ -165,27 +164,18 @@ void func_1001A9DC(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
165164
void func_1001AA08(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
166165
s32 __n_vsDelta(struct07 *arg0, s32 arg1);
167166
void func_1001B620(struct26 *arg0, s32 arg1);
168-
void func_1001C770(struct22 *arg0);
169-
void func_1001C910(struct22 *arg0, s16 arg1, s32 arg2);
170-
void func_1001C9E0(struct22 *arg0, f32 arg1);
171-
void func_1001CA90(struct22 *arg0, f32 arg1);
172-
void func_1001CB40(struct22 *arg0, u8 arg1);
173167
void func_1001CBF0(f32 arg0, f32 arg1, f32 arg2, struct17 *arg3, struct17 *arg4);
174168
void func_1001CD54(struct125 *arg0);
175169
f32 func_1001CEA4(s32 arg0);
176170
void func_1001D6E8(struct42 *arg0, s32 (*arg1)(s32 arg), struct15 *arg2);
177-
void func_1001D900(struct22 *arg0, u8 arg1);
178171
s32 func_1001D9B0(s16 arg0);
179172
s32 func_1001DA28(s16 arg0);
180173
void func_1001DAA0(s32 arg0, s16 arg1, s32 arg2);
181174
void func_1001DAE4(struct139 *arg0, s16 arg1, s32 *arg2);
182-
void func_1001E170(struct22 *arg0, s32 *w, f32 pitch, s16 vol, u8 pan, u8 fxmix, u8 arg6, f32 arg7, u8 arg8, s32 arg9);
183-
// void func_1001E2A0(struct22 *arg0, u8 arg1);
184-
// void func_1001E350(struct22 *arg0, u8 arg1);
175+
// void func_1001E170(struct22 *arg0, s32 *w, f32 pitch, s16 vol, u8 pan, u8 fxmix, u8 arg6, f32 arg7, u8 arg8, s32 arg9);
185176
// void func_1001E400(struct26 *arg0, s32 arg1, u8 arg2, u8 arg3, u8 arg4);
186177
s32 func_1001E4A0(s16 arg0, s32 arg1, s32 arg2);
187178
f32 func_1001FA78(f32 arg0[4][4], s32 arg1);
188-
s32 func_10020978(struct21 *arg0, s32 arg1, s32 arg2);
189179
/* chunk0 */
190180
void func_15000000(void);
191181
void func_15000090(void);
@@ -736,18 +726,25 @@ void func_1511FC20(s32 arg0);
736726
s32 func_1511FC2C(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
737727
s32 func_1511FC44(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
738728
void func_15122AE0(void);
739-
void func_15124770(struct108 *arg0, s32 arg1);
729+
void func_15124B18(struct108 *arg0);
740730
void func_15123508(struct108 *arg0);
731+
void func_15124770(struct108 *arg0, s32 arg1);
741732
void func_15124AB4(struct108 *arg0);
733+
void func_1512523C(struct108 *arg0);
734+
void func_15125330(struct108 *arg0);
742735
void func_15125394(struct108 *arg0);
736+
s32 func_151253CC(struct108 *arg0);
743737
void func_15125594(struct108 *arg0);
744738
void func_15125608(struct108 *arg0);
745739
void func_15125690(struct108 *arg0, s32 arg1);
746740
void func_15126138(struct108 *arg0);
747741
void func_15127FEC(struct108 *arg0, s32 arg1, s32 arg2);
748-
void func_15128680(s32 arg0);
742+
void func_15128680(struct108 *arg0);
743+
void func_1512868C(struct108 *arg0);
749744
void func_15128774(struct108 *arg0, struct127 *arg1);
750745
void func_1512D380(s32 arg0);
746+
s32 func_1513416C(struct102 *arg0);
747+
751748
struct210 *func_1513C4EC(s32 arg0, s32 arg1, u8 arg2, u8 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, u8 arg9, u8 argA, s32 argB, s32 argC, s32 argD, u8 argE, s32 argF);
752749
struct210 *func_1513C5B0(s32 arg0, s32 arg1, u8 arg2, u8 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, u8 arg9, u8 argA, s32 argB, u8 argC, s32 argD);
753750
struct210 *func_1513C650(s32 arg0, u8 arg1, u8 arg2, s32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, u8 arg9, u8 argA, s32 argB, s32 argC, s32 argD, u8 argE, s32 argF);
@@ -796,12 +793,23 @@ f32 func_15145A0C(f32 arg0, f32 arg1, f32 arg2);
796793
void func_15145A50(struct127 *arg0);
797794
void func_15146508(struct127 *arg0, struct127 *arg1);
798795
void func_151467A4(f32 *arg0, f32 arg1, f32 *arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 *arg7);
796+
struct260 *func_15149130(s16 arg0, s8 arg1, s8 arg2, s8 arg3, u8 arg4, u8 arg5, struct37 *arg6, u8 arg7, s32 arg8);
797+
struct260 *func_151491F4(s16 arg0, s8 arg1, s8 arg2, u8 arg3, u8 arg4, s32 arg5, u8 arg6, s32 arg7);
798+
void func_15149318(struct260 *arg0);
799+
void func_1514933C(struct260 *arg0);
800+
void func_15149368(struct260 *arg0);
801+
void func_15149394(struct260 *arg0);
802+
void func_151493E4(struct260 *arg0);
803+
void func_15149434(struct260 *arg0, s32 arg1, u8 arg2);
804+
s32 func_15149490(s32 arg0, struct260 *arg1, s16 arg2);
805+
void func_151494E0(s32 arg0, u8 arg1);
806+
void func_15149514(s32 arg0, u8 arg1, s32 arg2, s32 arg3, s32 arg4);
799807
void func_15165F70(void);
800808
void func_1516972C(struct102 *arg0);
801809
void func_1516979C(struct102 *arg0);
802810
void func_15169804(struct102 *arg0);
803-
void func_15169824(s32 arg0);
804-
void func_1519EF70(struct127* arg0, s32 arg1, s32 arg2);
811+
void func_15169824(struct102 *arg0);
812+
void func_1519EF70(struct127 *arg0, s32 arg1, s32 arg2);
805813

806814
void func_151DB004(struct218 *arg0);
807815
void func_151DB068(struct218 *arg0);
@@ -922,7 +930,6 @@ s32 func_1000C530(s32, u8, f32, f32, f32);
922930
//func_1000CAE4
923931
//func_1000CBF0
924932
//func_1000CC54
925-
//func_1000CD40
926933
//func_1000CDA0
927934
//func_1000CEAC
928935
//func_1000D2F8
@@ -953,7 +960,7 @@ s32 func_1000EE70(void *arg0, s32 arg1, void *arg2, s32 arg3, s32 arg4, void *a
953960
//func_1000F6B8
954961
void func_1000F85C(u16 arg0, u16 arg1, s32 arg2);
955962
void func_1000F91C(u16 arg0, u16 arg1, s16 arg2, u8 arg3, s32 arg4, s16 arg5, s16 arg6, s16 arg7, s16 arg8, s16 arg9);
956-
u16 func_1000FA64(u16 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4, u16 arg5, s16 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB);
963+
u16 func_1000FA64(u16 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4, u16 arg5, s16 arg6, s32 arg7, void *arg8, s32 arg9, s32 argA, s32 argB);
957964
//func_1000FC18
958965
//func_1000FD38
959966
//func_1000FDF4
@@ -979,13 +986,12 @@ void func_100114D0(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s
979986
//func_10012020
980987
//func_1001263C
981988
//func_100126E8
982-
void func_10015464(struct18 *arg0, f32 arg1);
983989
// void func_10017870(u8 arg0);
984990
void func_100186DC(void *arg0, void *arg1);
985991
void func_10018790(void *arg0, s32 arg1, u32 arg2, u32 arg3);
986-
void func_10019D98(struct26 *arg0, u8 arg1);
987-
void func_1001A030(struct26 *arg0, s32 arg1, s32 arg2, u32 arg3);
988-
void func_1001A508(struct26 *arg0, struct25 *arg1, s32 arg2, s32 arg3);
992+
// void func_10019D98(struct26 *arg0, u8 arg1);
993+
// void func_1001A030(struct26 *arg0, s32 arg1, s32 arg2, u32 arg3);
994+
// void func_1001A508(struct26 *arg0, struct25 *arg1, s32 arg2, s32 arg3);
989995
//func_1001AAE0
990996
//func_1001ADA4
991997
//func_1001AFEC
@@ -1027,8 +1033,6 @@ void func_1001E530(s32 arg0, void *arg1, s32 arg2);
10271033
//func_101A0538
10281034
void func_1001C224(void *arg0, s32 arg1, s32 arg2, s32 arg3);
10291035
void func_1001CF38(struct139 *arg0, f32 arg1);
1030-
struct21 *func_10020ABC(struct42 *arg0, struct119 *arg1, s32 arg2, s32 arg3, struct21 *arg4);
1031-
struct21 *func_10022040(struct42 *arg0, struct119 *arg1, s32 arg2, struct21 *arg3);
10321036

10331037
u16 *func_15001DE0(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5);
10341038
void func_1501748C(s16 arg0);
@@ -1103,6 +1107,7 @@ s32 func_1515D6D0(s32 arg0, s32 arg1);
11031107
void func_1515D4D4(u8, u8, u8, s32);
11041108
void func_15169260(s32, s32, s32, u8);
11051109
void func_1516944C(s32, s32, u8);
1110+
void func_15169850(s32, u8, s32, s32, s32);
11061111
void func_15174690(s32, s32, s32, s32, s32, s32, s32, s32, s32);
11071112
void func_15177410(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, f32 arg5, s32 arg6, f32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB, s32 argC, s32 argD, s32 argE, s32 argF);
11081113
s32 func_1517EFAC(s32 arg0);

0 commit comments

Comments
 (0)