diff options
| author | D G Turner | 2011-11-29 19:08:51 +0000 |
|---|---|---|
| committer | D G Turner | 2011-11-29 19:08:51 +0000 |
| commit | 1e5d9a07b5e902991ea1978fa9fe9efbc658e8ea (patch) | |
| tree | ca5ad481d4b47acb3137b44e41bafe1b292c1ebf /devtools | |
| parent | 0192d2f2de5838ac380b4ec3c6f0a72a93a4bc2b (diff) | |
| download | scummvm-rg350-1e5d9a07b5e902991ea1978fa9fe9efbc658e8ea.tar.gz scummvm-rg350-1e5d9a07b5e902991ea1978fa9fe9efbc658e8ea.tar.bz2 scummvm-rg350-1e5d9a07b5e902991ea1978fa9fe9efbc658e8ea.zip | |
DEVTOOLS: Add flag to tasm-recover to omit blacklisted function headers.
This flag when set omits the blacklisted function header from the
dreamgen.h output, rather than including it commented out with //.
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 2 | ||||
| -rw-r--r-- | devtools/tasmrecover/tasm/cpp.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index fbc10e3a1b..1712f58f9c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -324,5 +324,5 @@ generator = cpp(context, "DreamGen", blacklist = [ 'inventory', 'mainscreen', 'doload', - ], skip_dispatch_call = True) + ], skip_dispatch_call = True, header_omit_blacklisted = False) generator.generate('dreamweb') #start routine diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py index 6ffce010ce..f93f994681 100644 --- a/devtools/tasmrecover/tasm/cpp.py +++ b/devtools/tasmrecover/tasm/cpp.py @@ -33,7 +33,7 @@ def parse_bin(s): return v class cpp: - def __init__(self, context, namespace, skip_first = 0, blacklist = [], skip_output = [], skip_dispatch_call = False): + def __init__(self, context, namespace, skip_first = 0, blacklist = [], skip_output = [], skip_dispatch_call = False, header_omit_blacklisted = False): self.namespace = namespace fname = namespace.lower() + ".cpp" header = namespace.lower() + ".h" @@ -81,6 +81,7 @@ class cpp: self.failed = list(blacklist) self.skip_output = skip_output self.skip_dispatch_call = skip_dispatch_call + self.header_omit_blacklisted = header_omit_blacklisted self.translated = [] self.proc_addr = [] self.used_data_offsets = set() @@ -637,7 +638,8 @@ public: self.hd.write("\n") for p in set(self.methods): if p in self.blacklist: - self.hd.write("\t//void %s();\n" %p) + if self.header_omit_blacklisted == False: + self.hd.write("\t//void %s();\n" %p) else: self.hd.write("\tvoid %s();\n" %p) |