mirror of
https://github.com/SAT-R/sa2.git
synced 2026-10-28 09:43:38 +00:00
switch to pre-processor for genctx, move some scripts
This commit is contained in:
Oliver Bell committed
1 parent
0af6623b6c
commit
d5294aafb9
5 files changed
+13
-236
No files matched your search
@@ -147,6 +147,7 @@ else
|
||||
ASM_BUILDDIR =
|
||||
endif
|
||||
|
||||
C_INCLUDEDIR = include
|
||||
C_SUBDIR = src
|
||||
C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
|
||||
|
||||
@@ -180,6 +181,9 @@ C_SRCS := $(shell find $(C_SUBDIR) -name "*.c")
|
||||
endif
|
||||
C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
|
||||
|
||||
# Platform not included as we only need the headers for decomp scratches
|
||||
C_HEADERS := $(shell find $(C_INCLUDEDIR) -name "*.h" -not -path "*/platform/*")
|
||||
|
||||
ifeq ($(PLATFORM),gba)
|
||||
C_ASM_SRCS := $(shell find $(C_SUBDIR) -name "*.s")
|
||||
C_ASM_OBJS := $(patsubst $(C_SUBDIR)/%.s,$(C_BUILDDIR)/%.o,$(C_ASM_SRCS))
|
||||
@@ -214,7 +218,7 @@ FORMAT_H_PATHS := $(shell find . -name "*.h" ! -path '*/build/*' ! -path '*/ex
|
||||
# -P disables line markers (don't EVER use this, if you want proper debug info!)
|
||||
# -I sets an include path
|
||||
# -D defines a symbol
|
||||
CPPFLAGS ?= -iquote include -D $(GAME_REGION)
|
||||
CPPFLAGS ?= -iquote $(C_INCLUDEDIR) -D $(GAME_REGION)
|
||||
CC1FLAGS ?= -Wimplicit -Wparentheses -Werror
|
||||
|
||||
# These have to(?) be defined this way, because
|
||||
@@ -585,3 +589,11 @@ format:
|
||||
check_format:
|
||||
@echo $(FORMAT) -i -style=file --dry-run --Werror "**/*.c" "**/*.h"
|
||||
@$(FORMAT) -i --verbose -style=file --dry-run --Werror $(FORMAT_SRC_PATHS) $(FORMAT_H_PATHS)
|
||||
|
||||
|
||||
### DECOMP TOOLS ###
|
||||
|
||||
ctx.c: $(C_HEADERS)
|
||||
@for header in $(C_HEADERS); do echo "#include \"$$header\""; done > ctx.h
|
||||
$(CPP) -P $(CPPFLAGS) ctx.h -o ctx.c
|
||||
@rm ctx.h
|
||||
-158
@@ -1,158 +0,0 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
# Usage:
|
||||
# calcrom.pl <mapfile> [--verbose]
|
||||
#
|
||||
# mapfile: path to .map file output by LD
|
||||
# verbose: set to get more detailed output
|
||||
|
||||
use IPC::Cmd qw[ run ];
|
||||
use Getopt::Long;
|
||||
|
||||
my $verbose = "";
|
||||
|
||||
GetOptions("verbose" => \$verbose);
|
||||
(@ARGV == 1)
|
||||
or die "ERROR: no map file specified.\n";
|
||||
open(my $file, $ARGV[0])
|
||||
or die "ERROR: could not open file '$ARGV[0]'.\n";
|
||||
|
||||
my $src = 0;
|
||||
my $asm = 0;
|
||||
my $srcdata = 0;
|
||||
my $data = 0;
|
||||
my @pairs = ();
|
||||
while (my $line = <$file>)
|
||||
{
|
||||
if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/)
|
||||
{
|
||||
my $section = $1;
|
||||
my $size = hex($2);
|
||||
my $dir = $3;
|
||||
my $basename = $4;
|
||||
if ($size & 3)
|
||||
{
|
||||
$size += 4 - ($size % 3);
|
||||
}
|
||||
|
||||
if ($section =~ /text/)
|
||||
{
|
||||
if ($dir eq 'src')
|
||||
{
|
||||
$src += $size;
|
||||
}
|
||||
elsif ($dir eq 'asm')
|
||||
{
|
||||
if (!($basename =~ /(crt0|libagbsyscall|libgcnmultiboot|m4a_1)/))
|
||||
{
|
||||
push @pairs, [$basename, $size];
|
||||
}
|
||||
$asm += $size;
|
||||
}
|
||||
}
|
||||
elsif ($section =~ /rodata/)
|
||||
{
|
||||
if ($dir eq 'src')
|
||||
{
|
||||
$srcdata += $size;
|
||||
}
|
||||
elsif ($dir eq 'data')
|
||||
{
|
||||
if ($basename =~ /(strings)/)
|
||||
{
|
||||
$srcdata += $size;
|
||||
}
|
||||
else {
|
||||
$data += $size;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
my @sorted = sort { $a->[1] <=> $b->[1] } @pairs;
|
||||
|
||||
# Note that the grep filters out all branch labels. It also requires a minimum
|
||||
# line length of 5, to filter out a ton of generated symbols (like AcCn). No
|
||||
# settings to nm seem to remove these symbols. Finally, nm prints out a separate
|
||||
# entry for whenever a name appears in a file, not just where it's defined. uniq
|
||||
# removes all the duplicate entries.
|
||||
#
|
||||
#
|
||||
# You'd expect this to take a while, because of uniq. It runs in under a second,
|
||||
# though. Uniq is pretty fast!
|
||||
my $base_cmd = "nm sa2.elf | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
|
||||
|
||||
# This looks for Unknown_, Unknown_, or sub_, followed by just numbers. Note that
|
||||
# it matches even if stuff precedes the unknown, like sUnknown/gUnknown.
|
||||
my $undoc_cmd = "grep '[Uu]nk_[0-9a-fA-F]*\\|sub_[0-9a-fA-F]*'";
|
||||
|
||||
my $count_cmd = "wc -l";
|
||||
|
||||
# It sucks that we have to run this three times, but I can't figure out how to get
|
||||
# stdin working for subcommands in perl while still having a timeout. It's decently
|
||||
# fast anyway.
|
||||
my $total_syms_as_string;
|
||||
(run (
|
||||
command => "$base_cmd | $count_cmd",
|
||||
buffer => \$total_syms_as_string,
|
||||
timeout => 60
|
||||
))
|
||||
or die "ERROR: Error while getting all symbols: $?";
|
||||
|
||||
my $undocumented_as_string;
|
||||
(run (
|
||||
command => "$base_cmd | $undoc_cmd | $count_cmd",
|
||||
buffer => \$undocumented_as_string,
|
||||
timeout => 60
|
||||
))
|
||||
or die "ERROR: Error while filtering for undocumented symbols: $?";
|
||||
|
||||
# Performing addition on a string converts it to a number. Any string that fails
|
||||
# to convert to a number becomes 0. So if our converted number is 0, but our string
|
||||
# is nonzero, then the conversion was an error.
|
||||
my $undocumented = $undocumented_as_string + 0;
|
||||
(($undocumented != 0) and ($undocumented_as_string ne "0"))
|
||||
or die "ERROR: Cannot convert string to num: '$undocumented_as_string'";
|
||||
|
||||
my $total_syms = $total_syms_as_string + 0;
|
||||
(($total_syms != 0) and ($total_syms_as_string ne "0"))
|
||||
or die "ERROR: Cannot convert string to num: '$total_syms_as_string'";
|
||||
|
||||
($total_syms != 0)
|
||||
or die "ERROR: No symbols found.";
|
||||
|
||||
my $total = $src + $asm;
|
||||
my $srcPct = sprintf("%.4f", 100 * $src / $total);
|
||||
my $asmPct = sprintf("%.4f", 100 * $asm / $total);
|
||||
|
||||
my $documented = $total_syms - ($undocumented);
|
||||
my $docPct = sprintf("%.4f", 100 * $documented / $total_syms);
|
||||
my $undocPct = sprintf("%.4f", 100 * $undocumented / $total_syms);
|
||||
|
||||
print "$total total bytes of code\n";
|
||||
print "$src bytes of code in src ($srcPct%)\n";
|
||||
print "$asm bytes of code in asm ($asmPct%)\n";
|
||||
print "\n";
|
||||
|
||||
if ($verbose != 0)
|
||||
{
|
||||
print "BREAKDOWN\n";
|
||||
foreach my $item (@sorted)
|
||||
{
|
||||
print " $item->[1] bytes in asm/$item->[0].s\n"
|
||||
}
|
||||
print "\n";
|
||||
}
|
||||
|
||||
print "$total_syms total symbols\n";
|
||||
print "$documented symbols documented ($docPct%)\n";
|
||||
print "$undocumented symbols undocumented ($undocPct%)\n";
|
||||
|
||||
print "\n";
|
||||
my $dataTotal = $srcdata + $data;
|
||||
my $srcDataPct = sprintf("%.4f", 100 * $srcdata / $dataTotal);
|
||||
my $dataPct = sprintf("%.4f", 100 * $data / $dataTotal);
|
||||
print "$dataTotal total bytes of data\n";
|
||||
print "$srcdata bytes of data in src ($srcDataPct%)\n";
|
||||
print "$data bytes of data in data ($dataPct%)\n";
|
||||
@@ -1,77 +0,0 @@
|
||||
import glob
|
||||
import itertools as it
|
||||
import sys
|
||||
|
||||
# NOTE(Jace):
|
||||
# "ImportError: cannot import name 'TopologicalSorter' from 'graphlib'"
|
||||
#
|
||||
# If you get the above error message, try uninstalling graphlib and install graphlib-backport instead.
|
||||
#
|
||||
# Alternatively you can try updating to a Python version equal to or newer than 3.9,
|
||||
# and reinstall the module, though I haven't tested that.
|
||||
#
|
||||
# The information on graphlib-backport is from:
|
||||
# https://stackoverflow.com/questions/71119487/cannot-get-topologicalsorter-from-graphlib
|
||||
from graphlib import TopologicalSorter
|
||||
|
||||
if len(sys.argv) > 1 and sys.argv[1] == '-e':
|
||||
excluded = sys.argv[1:]
|
||||
else:
|
||||
excluded = []
|
||||
|
||||
depends_on = {}
|
||||
data = {}
|
||||
|
||||
def search_directories(*patterns):
|
||||
return it.chain.from_iterable(glob.iglob(pattern,recursive=True) for pattern in patterns)
|
||||
|
||||
for filename in search_directories('./include/**/*.h'):
|
||||
with open(filename) as header:
|
||||
header_name = "/".join(filename.split('/')[2:])
|
||||
|
||||
if not header_name in depends_on:
|
||||
depends_on[header_name] = set()
|
||||
|
||||
if not header_name.startswith("gba/"):
|
||||
if header_name != "global.h" \
|
||||
and header_name != "config.h" \
|
||||
and header_name != "functions.h":
|
||||
depends_on[header_name].add("global.h")
|
||||
|
||||
else: # header_name.startswith("gba/")
|
||||
if not header_name.endswith("types.h") \
|
||||
and not header_name.endswith("defines.h"):
|
||||
depends_on[header_name].add("gba/types.h")
|
||||
elif not header_name.endswith("multiboot.h") \
|
||||
and not header_name.endswith("types.h"):
|
||||
depends_on[header_name].add("gba/multiboot.h")
|
||||
|
||||
data[header_name] = ""
|
||||
for line in header.readlines():
|
||||
if "#include" in line \
|
||||
and not line.startswith("//") \
|
||||
and '<' not in line:
|
||||
requires = line.split('"')[1]
|
||||
depends_on[header_name].add(requires)
|
||||
continue
|
||||
|
||||
data[header_name] += line
|
||||
data[header_name] += "\n"
|
||||
|
||||
ts = TopologicalSorter(depends_on)
|
||||
print_order = tuple(ts.static_order())
|
||||
|
||||
with open('ctx.c', 'w') as context:
|
||||
# Since the context is only used for matching anyway, auto-insert
|
||||
context.write("#define PLATFORM_GBA 1\n\n")
|
||||
|
||||
for header in print_order:
|
||||
exclude = False
|
||||
for e in excluded:
|
||||
if e in header:
|
||||
exclude = True
|
||||
break
|
||||
|
||||
if not exclude:
|
||||
print(header)
|
||||
context.write(data[header])
|
||||
Vendored
File renamed without changes.
File renamed without changes.
Reference in new issue
Block a user