mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 13:30:47 +00:00
Code Issues Projects Releases Wiki Activity

Fixup permuter_settings (#1746)

Browse source 
* fix how permuter imports PRINTF macros wrt the ido-has-no-variadic-macros hack

* more permuter_settings fixups
This commit is contained in:
Dragorn421 2024-02-20 13:38:58 +01:00 committed by GitHub
parent cd98f991b5
commit 5c3a722aca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/macros.h
View file

@ -114,7 +114,7 @@
// argument errors instead. // argument errors instead.
// Note some tools define __sgi but preprocess with a modern cpp implementation, // Note some tools define __sgi but preprocess with a modern cpp implementation,
// ensure that these do not use the IDO workaround to avoid errors. // ensure that these do not use the IDO workaround to avoid errors.
#define IDO_PRINTF_WORKAROUND (__sgi && !__GNUC__ && !PERMUTER && !M2CTX) #define IDO_PRINTF_WORKAROUND (__sgi && !__GNUC__ && !M2CTX)
#if OOT_DEBUG #if OOT_DEBUG
#define PRINTF osSyncPrintf #define PRINTF osSyncPrintf

20
tools/permuter_settings.toml
View file

@ -1,3 +1,6 @@
build_system = "make"
compiler_type = "ido" # adjusts default weights for permuting
[preserve_macros] [preserve_macros]
"g[DS]P.*" = "void" "g[DS]P.*" = "void"
"gDma.*" = "void" "gDma.*" = "void"
@ -10,7 +13,6 @@ OPEN_DISPS = "void"
CLOSE_DISPS = "void" CLOSE_DISPS = "void"
GRAPH_ALLOC = "void*" GRAPH_ALLOC = "void*"
LOG_UTILS_CHECK_NULL_POINTER = "void" LOG_UTILS_CHECK_NULL_POINTER = "void"
PRINTF = "void"
WORK_DISP = "void*" WORK_DISP = "void*"
POLY_OPA_DISP = "void*" POLY_OPA_DISP = "void*"
POLY_XLU_DISP = "void*" POLY_XLU_DISP = "void*"
@ -20,10 +22,14 @@ ABS = "int"
SQ = "int" SQ = "int"
CLAMP = "int" CLAMP = "int"
# If changing to not preserve these, add a check for the permuter to IDO_PRINTF_WORKAROUND,
# so that modern CPP (used by the permuter import) does not error on the IDO-specific hack.
# For example:
# #define IDO_PRINTF_WORKAROUND (__sgi && !__GNUC__ && !PERMUTER && !M2CTX)
PRINTF = "void"
SCHED_DEBUG_PRINTF = "void"
ACTOR_DEBUG_PRINTF = "void"
[decompme.compilers] [decompme.compilers]
"tools/ido_recomp/linux/7.1/cc" = "ido7.1" "tools/ido_recomp/*/7.1/cc" = "ido7.1"
"tools/ido_recomp/macos/7.1/cc" = "ido7.1" "tools/ido_recomp/*/5.3/cc" = "ido5.3"
"tools/ido_recomp/windows/7.1/cc" = "ido7.1"
"tools/ido_recomp/linux/5.3/cc" = "ido5.3"
"tools/ido_recomp/macos/5.3/cc" = "ido5.3"
"tools/ido_recomp/windows/5.3/cc" = "ido5.3"