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

git subrepo pull tools/splat

Browse Source 
subrepo:
  subdir:   "tools/splat"
  merged:   "42786d2a7"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "42786d2a7"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
This commit is contained in:
Ethan Roseman 2021-01-25 00:41:31 +09:00
parent 4141881c33
commit 4201a08a28
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/splat/.gitrepo
View File

@ -6,7 +6,7 @@
[subrepo] [subrepo]
remote = https://github.com/ethteck/splat.git remote = https://github.com/ethteck/splat.git
branch = master branch = master
commit = 687885c4d8bcb86d399dbb7dcd660ad8548acdf7 commit = 42786d2a77813ab4aa9e34f010f0e783a4f336d9
parent = dc7285954620634e352b43bcae320ba1f8dd8de7 parent = 4141881c33fb386869a5cd512e9e19dc7f4cb683
method = merge method = merge
cmdver = 0.4.3 cmdver = 0.4.3

8
tools/splat/split.py
View File

@ -194,6 +194,8 @@ def get_extension_class(options, config_path, seg_type, platform):
return getattr(ext_mod, f"{platform.upper()}Seg{seg_type[0].upper()}{seg_type[1:]}") return getattr(ext_mod, f"{platform.upper()}Seg{seg_type[0].upper()}{seg_type[1:]}")
def get_platform(options):
return options.get("platform", "n64")
def fmt_size(size): def fmt_size(size):
if size > 1000000: if size > 1000000:
@ -204,7 +206,7 @@ def fmt_size(size):
return str(size) + " B" return str(size) + " B"
def initialize_segments(options, config_path, config_segments, platform): def initialize_segments(options, config_path, config_segments):
seen_segment_names = set() seen_segment_names = set()
ret = [] ret = []
@ -215,6 +217,8 @@ def initialize_segments(options, config_path, config_segments, platform):
seg_type = parse_segment_type(segment) seg_type = parse_segment_type(segment)
platform = get_platform(options)
segment_class = get_base_segment_class(seg_type, platform) segment_class = get_base_segment_class(seg_type, platform)
if segment_class == None: if segment_class == None:
# Look in extensions # Look in extensions
@ -254,7 +258,7 @@ def main(rom_path, config_path, repo_path, modes, verbose, ignore_cache=False):
symbol_addrs_path = get_symbol_addrs_path(repo_path, options) symbol_addrs_path = get_symbol_addrs_path(repo_path, options)
undefined_syms_path = get_undefined_syms_path(repo_path, options) undefined_syms_path = get_undefined_syms_path(repo_path, options)
provided_symbols, c_func_labels_to_add, special_labels, ranges = gather_symbols(symbol_addrs_path, undefined_syms_path) provided_symbols, c_func_labels_to_add, special_labels, ranges = gather_symbols(symbol_addrs_path, undefined_syms_path)
platform = options.get("platform", "n64") platform = get_platform(options)
processed_segments = [] processed_segments = []
ld_sections = [] ld_sections = []