From 21a9fccc4b249a89dc5563d1ff8e5234c64a114d Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Mon, 11 Sep 2023 21:28:23 -0700 Subject: [PATCH] fix float issues and add decompctx.py tool (#15) --- .gitignore | 1 + include/MSL_C/math.h | 4 +-- tools/decompctx.py | 77 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 tools/decompctx.py diff --git a/.gitignore b/.gitignore index b0fcb7979..03e2d4a00 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ orig/*/* tools/mwcc_compiler/* !tools/mwcc_compiler/.gitkeep /*.txt +ctx.c diff --git a/include/MSL_C/math.h b/include/MSL_C/math.h index ac76223e0..bd44a9a47 100644 --- a/include/MSL_C/math.h +++ b/include/MSL_C/math.h @@ -58,8 +58,8 @@ inline double sqrt_step(double tmpd, float mag) { } extern inline float sqrtf(float x) { - static const double _half = .5; - static const double _three = 3.0; + const double _half = .5; + const double _three = 3.0; volatile float y; if (x > 0.0f) { double guess = __frsqrte((double)x); // returns an approximation to diff --git a/tools/decompctx.py b/tools/decompctx.py new file mode 100644 index 000000000..2e2aa3b8c --- /dev/null +++ b/tools/decompctx.py @@ -0,0 +1,77 @@ +#!/usr/bin/env python3 + +import argparse +import os +import re + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = os.path.abspath(os.path.join(script_dir, "..")) +src_dir = os.path.join(root_dir, "src") +include_dir = os.path.join(root_dir, "include") + +include_pattern = re.compile(r'^#include\s*[<"](.+?)[>"]$') +guard_pattern = re.compile(r'^#ifndef\s+(.*)$') + +defines = set() + +def import_h_file(in_file: str, r_path: str) -> str: + rel_path = os.path.join(root_dir, r_path, in_file) + inc_path = os.path.join(include_dir, in_file) + if os.path.exists(rel_path): + return import_c_file(rel_path) + elif os.path.exists(inc_path): + return import_c_file(inc_path) + else: + print("Failed to locate", in_file) + exit(1) + +def import_c_file(in_file) -> str: + in_file = os.path.relpath(in_file, root_dir) + out_text = '' + + try: + with open(in_file, encoding="shift-jis") as file: + out_text += process_file(in_file, list(file)) + except Exception: + with open(in_file) as file: + out_text += process_file(in_file, list(file)) + return out_text + +def process_file(in_file: str, lines) -> str: + out_text = '' + for idx, line in enumerate(lines): + guard_match = guard_pattern.match(line.strip()) + if idx == 0: + if guard_match: + if guard_match[1] in defines: + break + defines.add(guard_match[1]) + print("Processing file", in_file) + include_match = include_pattern.match(line.strip()) + if include_match and not include_match[1].endswith(".s"): + out_text += f"/* \"{in_file}\" line {idx} \"{include_match[1]}\" */\n" + out_text += import_h_file(include_match[1], os.path.dirname(in_file)) + out_text += f"/* end \"{include_match[1]}\" */\n" + else: + out_text += line + + return out_text + +def main(): + parser = argparse.ArgumentParser( + description="""Create a context file which can be used for decomp.me""" + ) + parser.add_argument( + "c_file", + help="""File from which to create context""", + ) + args = parser.parse_args() + + output = import_c_file(args.c_file) + + with open(os.path.join(root_dir, "ctx.c"), "w", encoding="utf-8") as f: + f.write(output) + + +if __name__ == "__main__": + main() \ No newline at end of file