diff --git a/configure.py b/configure.py index 10085b52b..a6bcd75d0 100755 --- a/configure.py +++ b/configure.py @@ -166,10 +166,10 @@ if args.no_asm: # Tool versions config.binutils_tag = "2.42-1" config.compilers_tag = "20251118" -config.dtk_tag = "v1.7.6" -config.objdiff_tag = "v3.5.1" +config.dtk_tag = "v1.8.3" +config.objdiff_tag = "v3.7.3" config.sjiswrap_tag = "v1.2.2" -config.wibo_tag = "1.0.0" +config.wibo_tag = "1.1.0" # Project config.config_path = Path("config") / config.version / "config.yml" @@ -215,7 +215,6 @@ cflags_base = [ "-enum int", "-fp hardware", "-Cpp_exceptions off", - # "-W all", # "-O4,p", "-inline auto", '-pragma "cats off"', @@ -1916,6 +1915,7 @@ config.progress_report_args = [ # Marks relocations as mismatching if the target value is different # Default is "functionRelocDiffs=none", which is most lenient "--config functionRelocDiffs=data_value", + "--config preferredStringEncoding=shift_jis", ] # Disable missing return type warnings for incomplete objects diff --git a/tools/project.py b/tools/project.py index b1417ae69..4d96adba5 100644 --- a/tools/project.py +++ b/tools/project.py @@ -2032,6 +2032,7 @@ def calculate_progress(config: ProjectConfig) -> None: total_code = measures.get("total_code", 0) matched_code = measures.get("matched_code", 0) matched_code_percent = measures.get("matched_code_percent", 0) + fuzzy_match_percent = measures.get("fuzzy_match_percent", 0) total_data = measures.get("total_data", 0) matched_data = measures.get("matched_data", 0) matched_data_percent = measures.get("matched_data_percent", 0) @@ -2042,7 +2043,7 @@ def calculate_progress(config: ProjectConfig) -> None: complete_units = measures.get("complete_units", 0) progress_print( - f" {name}: {matched_code_percent:.2f}% matched, {complete_code_percent:.2f}% linked ({complete_units} / {total_units} files)" + f" {name}: {fuzzy_match_percent:.2f}% fuzzy, {matched_code_percent:.2f}% matched, {complete_code_percent:.2f}% linked ({complete_units} / {total_units} files)" ) progress_print( f" Code: {matched_code} / {total_code} bytes ({matched_functions} / {total_functions} functions)"