pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix alignment for bins (#1201)

Browse Source
This commit is contained in:
Ethan Roseman 2024-09-12 16:15:01 +09:00 committed by GitHub
parent 1bcc4ff623
commit 8b198cf9d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/build/configure.py
View File

@ -66,6 +66,8 @@ def write_ninja_rules(
cc_egcs = f"{cc_egcs_dir}/gcc" cc_egcs = f"{cc_egcs_dir}/gcc"
cxx = f"{BUILD_TOOLS}/cc/gcc/g++" cxx = f"{BUILD_TOOLS}/cc/gcc/g++"
BFDNAME = "elf32-tradbigmips"
CPPFLAGS_COMMON = ( CPPFLAGS_COMMON = (
"-Iver/$version/include -Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D_LANGUAGE_C -D_FINALROM " "-Iver/$version/include -Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D_LANGUAGE_C -D_FINALROM "
"-DVERSION=$version -DF3DEX_GBI_2 -D_MIPS_SZLONG=32" "-DVERSION=$version -DF3DEX_GBI_2 -D_MIPS_SZLONG=32"
@ -166,13 +168,13 @@ def write_ninja_rules(
ninja.rule( ninja.rule(
"cc_272", "cc_272",
description="cc_272 $in", description="cc_272 $in",
command=f"bash -o pipefail -c 'COMPILER_PATH={cc_272_dir} {cc_272} {CPPFLAGS_272} {extra_cppflags} $cppflags {cflags_272} $cflags $in -o $out && mips-linux-gnu-objcopy -N $in $out'", command=f"bash -o pipefail -c 'COMPILER_PATH={cc_272_dir} {cc_272} {CPPFLAGS_272} {extra_cppflags} $cppflags {cflags_272} $cflags $in -o $out && {cross}objcopy -N $in $out'",
) )
ninja.rule( ninja.rule(
"cc_egcs", "cc_egcs",
description="cc_egcs $in", description="cc_egcs $in",
command=f"bash -o pipefail -c '{cc_egcs} {CPPFLAGS_EGCS} {extra_cppflags} $cppflags {cflags_egcs} $cflags $in -o $out && mips-linux-gnu-objcopy -N $in $out && python3 ./tools/patch_64bit_compile.py $out'", command=f"bash -o pipefail -c '{cc_egcs} {CPPFLAGS_EGCS} {extra_cppflags} $cppflags {cflags_egcs} $cflags $in -o $out && {cross}objcopy -N $in $out && python3 ./tools/patch_64bit_compile.py $out'",
) )
ninja.rule( ninja.rule(
@ -186,13 +188,13 @@ def write_ninja_rules(
ninja.rule( ninja.rule(
"dead_cc_fix", "dead_cc_fix",
description="dead_cc_fix $in", description="dead_cc_fix $in",
command=f"mips-linux-gnu-objcopy --redefine-sym sqrtf=dead_sqrtf $in $out", command=f"{cross}objcopy --redefine-sym sqrtf=dead_sqrtf $in $out",
) )
ninja.rule( ninja.rule(
"bin", "bin",
description="bin $in", description="bin $in",
command=f"{ld} -r -b binary $in -o $out", command=f"{cross}objcopy -I binary -O {BFDNAME} --set-section-alignment .data=8 $in $out",
) )
ninja.rule( ninja.rule(

2
ver/jp/splat.yaml
View File

@ -10194,8 +10194,6 @@ segments:
start: 0xE272F0 start: 0xE272F0
vram: 0x80240000 vram: 0x80240000
- [ 0xE28FA0, bin ]
- type: code - type: code
name: inspect_icon name: inspect_icon
start: 0xE28FA0 start: 0xE28FA0

4
ver/pal/splat.yaml
View File

@ -1075,8 +1075,6 @@ segments:
start: 0x25C5A0 start: 0x25C5A0
# TODO: split into images # TODO: split into images
- [0x2705A0, bin]
- start: 0x2705A0 - start: 0x2705A0
type: pm_imgfx_data type: pm_imgfx_data
name: imgfx_data name: imgfx_data
@ -12129,9 +12127,7 @@ segments:
- [0xE8AFB0, c, settings] - [0xE8AFB0, c, settings]
- [0xE8AFB0, c, main] - [0xE8AFB0, c, main]
# todo: add heaps2 # todo: add heaps2
- [0xE8D120, bin]
- type: code - type: code
start: 0xE8D120 start: 0xE8D120