pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix .s dependency generation

Browse Source
This commit is contained in:
Alex Bates 2021-01-14 04:16:42 +00:00
parent 6a085bc6d0
commit c6fe6eee00
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/build/build.py
View File

@ -8,7 +8,7 @@ from subprocess import PIPE
c_files = glob("src/**/*.c", recursive=True) c_files = glob("src/**/*.c", recursive=True)
INCLUDE_ASM_RE = re.compile(r"INCLUDE_ASM\([^,]+, ([^,]+), ([^,)]+)") INCLUDE_ASM_RE = re.compile(r"_INCLUDE_ASM\([^,]+, ([^,]+), ([^,)]+)") # note _ prefix
CPPFLAGS = "-Iinclude -Isrc -D _LANGUAGE_C -D _FINALROM -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32" CPPFLAGS = "-Iinclude -Isrc -D _LANGUAGE_C -D _FINALROM -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32"
def obj(path: str): def obj(path: str):
@ -21,18 +21,18 @@ async def shell(cmd: str):
assert proc.returncode == 0, f"{cmd} failed: {stderr}" assert proc.returncode == 0, f"{cmd} failed: {stderr}"
return str(stdout), str(stderr) return stdout.decode("utf-8"), stderr.decode("utf-8")
async def build_c_file(c_file: str, rule: str, dsl_rule: str): async def build_c_file(c_file: str, rule: str, dsl_rule: str):
# preprocess c_file, but dont expand INCLUDE_ASM or SCRIPT # preprocess c_file, but simply put an _ in front of INCLUDE_ASM and SCRIPT
stdout, stderr = await shell(f"{cpp} {CPPFLAGS} '-DINCLUDE_ASM(...)=INCLUDE_ASM(__VA_ARGS__)' '-DSCRIPT(...)=SCRIPT(__VA_ARGS__)' {c_file} -o -") stdout, stderr = await shell(f"{cpp} {CPPFLAGS} '-DINCLUDE_ASM(...)=_INCLUDE_ASM(__VA_ARGS__)' '-DSCRIPT(...)=_SCRIPT(__VA_ARGS__)' {c_file} -o -")
# search for macro usage # search for macro usage (note _ prefix)
uses_dsl = "SCRIPT(" in stdout uses_dsl = "_SCRIPT(" in stdout
s_deps = [] s_deps = []
for line in stdout.splitlines(): for line in stdout.splitlines():
if line.startswith("INCLUDE_ASM"): if line.startswith("_INCLUDE_ASM"):
match = INCLUDE_ASM_RE.match(line) match = INCLUDE_ASM_RE.match(line)
if match: if match:
s_deps.append("asm/nonmatchings/" + eval(match[1]) + "/" + match[2] + ".s") s_deps.append("asm/nonmatchings/" + eval(match[1]) + "/" + match[2] + ".s")
@ -93,6 +93,7 @@ async def main():
num_tasks = len(tasks) num_tasks = len(tasks)
num_tasks_done = 0 num_tasks_done = 0
await asyncio.gather(*tasks) await asyncio.gather(*tasks)
print(" done")
if __name__ == "__main__": if __name__ == "__main__":
asyncio.run(main()) asyncio.run(main())