mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-05 03:34:20 +00:00
Code Issues Projects Releases Wiki Activity

[iQue] Don't use -funsigned-char for z_std_dma (#2427)

Browse source
This commit is contained in:
cadmic 2025-01-19 18:41:57 -08:00 • committed by GitHub
parent c76d2a8a4d
commit c3806155c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -594,8 +594,6 @@ EGCS_O_FILES += $(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope
$(EGCS_O_FILES): CC := $(EGCS_CC)
$(EGCS_O_FILES): CFLAGS := $(EGCS_CFLAGS) -mno-abicalls
$(EGCS_O_FILES): MIPS_VERSION :=
$(BUILD_DIR)/src/boot/z_std_dma.o: CFLAGS += -funsigned-char
endif
ifeq ($(PLATFORM),IQUE)

8
src/boot/z_std_dma.c
View file

@ -75,7 +75,7 @@ const char* sDmaMgrFileNames[] = {
* -1 if the first character that does not match has a smaller value in str1 than str2,
* +1 if the first character that does not match has a greater value in str1 than str2
*/
s32 DmaMgr_StrCmp(const char* str1, const char* str2) {
s32 DmaMgr_StrCmp(const u8* str1, const u8* str2) {
while (*str1 != '\0') {
if (*str1 > *str2) {
return 1;
@ -338,7 +338,8 @@ const char* DmaMgr_GetFileName(uintptr_t vrom) {
return "(unknown)";
}
if (DmaMgr_StrCmp(ret, "kanji") == 0 || DmaMgr_StrCmp(ret, "link_animetion") == 0) {
if (DmaMgr_StrCmp((const u8*)ret, (const u8*)"kanji") == 0 ||
DmaMgr_StrCmp((const u8*)ret, (const u8*)"link_animetion") == 0) {
// This check may be related to these files being too large to be loaded all at once, however a NULL filename
// does not prevent them from being loaded.
return NULL;
@ -379,7 +380,8 @@ void DmaMgr_ProcessRequest(DmaRequest* req) {
if (0) {
#if !PLATFORM_GC
// Based on the MM Debug ROM, these strings are part of the condition for the empty if statement below
if (DmaMgr_StrCmp("", "kanji") != 0 && DmaMgr_StrCmp("", "link_animetion") != 0)
if (DmaMgr_StrCmp((const u8*)"", (const u8*)"kanji") != 0 &&
DmaMgr_StrCmp((const u8*)"", (const u8*)"link_animetion") != 0)
#endif
{
// The string is defined in .rodata of debug builds but not used, suggesting a debug print is here