dol2asm: generate makefiles that use header dependencies for smarter rebuilds

This commit is contained in:
Jcw87 2023-01-06 03:42:42 -08:00
parent b4bfca89a1
commit 5aa83db436
3 changed files with 91 additions and 4 deletions

View File

@ -92,6 +92,8 @@ LDFLAGS := -unused -map $(MAP) -fp hard -nodefaults -w off
# Compiler flags
CFLAGS += -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -str pool,readonly,reuse -RTTI off -maxerrors 5 -enum int $(INCLUDES)
DEPFLAGS := $(if $(DISABLE_DEPS),,-MD)
# O4,p for init.c
$(BUILD_DIR)/src/init.o: CFLAGS := -Cpp_exceptions off -proc gekko -fp hard -O4,p -nodefaults -str pool,readonly,reuse -RTTI off -maxerrors 5 -enum int $(INCLUDES)

View File

@ -58,11 +58,19 @@ async def create_library(library: Library):
#await builder.write(f"\t@$(STRIP) -d -R .dead -R .comment {target_path}")
await builder.write("")
await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp")
await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp {o_path}/%.d")
await builder.write(f"\t@mkdir -p $(@D)")
await builder.write(f"\t@echo building... $<")
await builder.write(f"\t@$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp")
await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) -c -o $@ $(basename $@).cpp")
await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp")
await builder.write("\t@if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi")
await builder.write("")
await builder.write("ifndef DISABLE_DEPS")
await builder.write(f"{prefix}_D_FILES := $({prefix}_O_FILES:.o=.d)")
await builder.write(f"$({prefix}_D_FILES):")
await builder.write(f"include $(wildcard $({prefix}_D_FILES))")
await builder.write("endif")
await builder.write("")
debug(f"generated Makefile: '{makefile_path}'")
@ -146,11 +154,19 @@ async def create_rel(module: Module, rel_path: Path):
await builder.write(f"\t@$(LD) -opt_partial -strip_partial $({prefix}_LDFLAGS) -o $({prefix}_TARGET) @{input_file}")
await builder.write("")
await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp")
await builder.write(f"{o_path}/%.o: {cpp_path}/%.cpp {o_path}/%.d")
await builder.write(f"\t@echo [{module.index:>3}] building $@")
await builder.write(f"\t@mkdir -p $(@D)")
await builder.write(f"\t@$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp")
await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) -c -o $@ $(basename $@).cpp")
await builder.write(f"\t@$(CC) $(CFLAGS) $({prefix}_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp")
await builder.write("\t@if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi")
await builder.write("")
await builder.write("ifndef DISABLE_DEPS")
await builder.write(f"{prefix}_D_FILES := $({prefix}_O_FILES:.o=.d)")
await builder.write(f"$({prefix}_D_FILES):")
await builder.write(f"include $(wildcard $({prefix}_D_FILES))")
await builder.write("endif")
await builder.write("")
for library in libraries[1:]:

69
tools/transform-dep.py Executable file
View File

@ -0,0 +1,69 @@
#!/usr/bin/env python3
# borrowed from prime-decomp
import argparse
import os
from platform import uname
if os.name != 'nt':
wineprefix = os.environ.get('WINEPREFIX', os.path.join(os.environ['HOME'], '.wine'))
winedevices = os.path.join(wineprefix, 'dosdevices')
def in_wsl() -> bool:
return 'microsoft-standard' in uname().release
def import_d_file(in_file) -> str:
out_lines = []
with open(in_file) as file:
for idx, line in enumerate(file):
if idx == 0:
if line.endswith(' \\\n'):
out_lines.append(line[:-3].replace('\\', '/') + " \\\n")
else:
out_lines.append(line.replace('\\', '/'))
else:
suffix = ''
if line.endswith(' \\\n'):
suffix = ' \\'
path = line.lstrip()[:-3]
else:
path = line.strip()
# lowercase drive letter
path = path[0].lower() + path[1:]
if os.name == 'nt':
path = path.replace('\\', '/')
elif path[0] == 'z':
# shortcut for z:
path = path[2:].replace('\\', '/')
elif in_wsl():
path = path[0:1] + path[2:]
path = os.path.join('/mnt', path.replace('\\', '/'))
else:
# use $WINEPREFIX/dosdevices to resolve path
path = os.path.realpath(os.path.join(winedevices, path.replace('\\', '/')))
out_lines.append(f"\t{path}{suffix}\n")
return ''.join(out_lines)
def main():
parser = argparse.ArgumentParser(
description="""Transform a .d file from Wine paths to normal paths"""
)
parser.add_argument(
"d_file",
help="""Dependency file in""",
)
parser.add_argument(
"d_file_out",
help="""Dependency file out""",
)
args = parser.parse_args()
output = import_d_file(args.d_file)
with open(args.d_file_out, "w", encoding="UTF-8") as f:
f.write(output)
if __name__ == "__main__":
main()