aboutsummaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
Diffstat (limited to 'devtools')
-rw-r--r--devtools/tasmrecover/dreamweb/sprite.asm2
-rw-r--r--devtools/tasmrecover/tasm/cpp.py167
-rw-r--r--devtools/tasmrecover/tasm/op.py12
-rw-r--r--devtools/tasmrecover/tasm/proc.py47
4 files changed, 126 insertions, 102 deletions
diff --git a/devtools/tasmrecover/dreamweb/sprite.asm b/devtools/tasmrecover/dreamweb/sprite.asm
index bb7ba402f8..f6e883abeb 100644
--- a/devtools/tasmrecover/dreamweb/sprite.asm
+++ b/devtools/tasmrecover/dreamweb/sprite.asm
@@ -441,7 +441,7 @@ notinbed: ret
Edeninbath proc near
cmp generaldead,0
- jz notinbed
+ jz notinbath
cmp sartaindead,0
jnz notinbath
call showgamereel
diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py
index 3e5ae78438..0196e5b45c 100644
--- a/devtools/tasmrecover/tasm/cpp.py
+++ b/devtools/tasmrecover/tasm/cpp.py
@@ -36,20 +36,19 @@ class cpp:
self.failed = list(blacklist)
self.translated = []
self.proc_addr = []
- self.forwards = []
+ self.methods = []
self.fd.write("""%s
#include \"%s\"
namespace %s {
-
""" %(banner, header, namespace))
def expand_cb(self, match):
name = match.group(0).lower()
if len(name) == 2 and \
((name[0] in ['a', 'b', 'c', 'd'] and name[1] in ['h', 'x', 'l']) or name in ['si', 'di', 'es', 'ds', 'cs']):
- return "context.%s" %name
+ return "%s" %name
if self.indirection == -1:
try:
@@ -74,7 +73,7 @@ namespace %s {
if size == 0:
raise Exception("invalid var '%s' size %u" %(name, size))
if self.indirection == 0:
- value = "context.data.%s(k%s)" %("byte" if size == 1 else "word", name.capitalize())
+ value = "data.%s(k%s)" %("byte" if size == 1 else "word", name.capitalize())
elif self.indirection == -1:
value = "%s" %g.offset
self.indirection = 0
@@ -135,7 +134,7 @@ namespace %s {
m = re.match(r'seg\s+(.*?)$', expr)
if m is not None:
- return "context.data"
+ return "data"
match_id = True
m = re.match(r'offset\s+(.*?)$', expr)
@@ -174,7 +173,7 @@ namespace %s {
plus = ""
match_id = False
#print "COMMON_REG: ", reg, plus
- expr = "context.%s%s" %(reg, plus)
+ expr = "%s%s" %(reg, plus)
expr = re.sub(r'\b([0-9][a-fA-F0-9]*)h', '0x\\1', expr)
expr = re.sub(r'\b([0-1]+)b', parse_bin, expr)
@@ -188,9 +187,9 @@ namespace %s {
if indirection == 1:
if size == 1:
- expr = "context.%s.byte(%s)" %(seg_prefix, expr)
+ expr = "%s.byte(%s)" %(seg_prefix, expr)
elif size == 2:
- expr = "context.%s.word(%s)" %(seg_prefix, expr)
+ expr = "%s.word(%s)" %(seg_prefix, expr)
else:
expr = "@invalid size 0"
elif indirection == 0:
@@ -238,9 +237,11 @@ namespace %s {
jump_proc = True
if jump_proc:
- self.add_forward(name)
- return "{ %s(context); return; }" %name
+ return "{ %s(); return; }" %name
else:
+ # TODO: name or self.resolve_label(name) or self.mangle_label(name)??
+ if name in self.proc.retlabels:
+ return "return /* (%s) */" % (name)
return "goto %s" %self.resolve_label(name)
def _label(self, name):
@@ -253,17 +254,12 @@ namespace %s {
print "+scheduling function %s..." %name
self.proc_queue.append(name)
- def add_forward(self, name):
- if name not in self.forwards and name not in self.failed:
- self.forwards.append(name)
-
def _call(self, name):
name = name.lower()
if name == 'ax':
- self.body += "\t__dispatch_call(context, %s);\n" %self.expand('ax', 2)
+ self.body += "\t__dispatch_call(%s);\n" %self.expand('ax', 2)
return
- self.body += "\t%s(context);\n" %name
- self.add_forward(name);
+ self.body += "\t%s();\n" %name
self.schedule(name)
def _ret(self):
@@ -286,111 +282,111 @@ namespace %s {
self.body += "\t%s = %s;\n" %self.parse2(dst, src)
def _add(self, dst, src):
- self.body += "\tcontext._add(%s, %s);\n" %self.parse2(dst, src)
+ self.body += "\t_add(%s, %s);\n" %self.parse2(dst, src)
def _sub(self, dst, src):
- self.body += "\tcontext._sub(%s, %s);\n" %self.parse2(dst, src)
+ self.body += "\t_sub(%s, %s);\n" %self.parse2(dst, src)
def _and(self, dst, src):
- self.body += "\tcontext._and(%s, %s);\n" %self.parse2(dst, src)
+ self.body += "\t_and(%s, %s);\n" %self.parse2(dst, src)
def _or(self, dst, src):
- self.body += "\tcontext._or(%s, %s);\n" %self.parse2(dst, src)
+ self.body += "\t_or(%s, %s);\n" %self.parse2(dst, src)
def _xor(self, dst, src):
- self.body += "\tcontext._xor(%s, %s);\n" %self.parse2(dst, src)
+ self.body += "\t_xor(%s, %s);\n" %self.parse2(dst, src)
def _neg(self, dst):
dst = self.expand(dst)
- self.body += "\tcontext._neg(%s);\n" %(dst)
+ self.body += "\t_neg(%s);\n" %(dst)
def _cbw(self):
- self.body += "\tcontext.ax.cbw();\n"
+ self.body += "\tax.cbw();\n"
def _shr(self, dst, src):
- self.body += "\tcontext._shr(%s, %s);\n" %self.parse2(dst, src)
+ self.body += "\t_shr(%s, %s);\n" %self.parse2(dst, src)
def _shl(self, dst, src):
- self.body += "\tcontext._shl(%s, %s);\n" %self.parse2(dst, src)
+ self.body += "\t_shl(%s, %s);\n" %self.parse2(dst, src)
#def _sar(self, dst, src):
- # self.body += "\tcontext._sar(%s%s);\n" %self.parse2(dst, src)
+ # self.body += "\t_sar(%s%s);\n" %self.parse2(dst, src)
#def _sal(self, dst, src):
- # self.body += "\tcontext._sal(%s, %s);\n" %self.parse2(dst, src)
+ # self.body += "\t_sal(%s, %s);\n" %self.parse2(dst, src)
#def _rcl(self, dst, src):
- # self.body += "\tcontext._rcl(%s, %s);\n" %self.parse2(dst, src)
+ # self.body += "\t_rcl(%s, %s);\n" %self.parse2(dst, src)
#def _rcr(self, dst, src):
- # self.body += "\tcontext._rcr(%s, %s);\n" %self.parse2(dst, src)
+ # self.body += "\t_rcr(%s, %s);\n" %self.parse2(dst, src)
def _mul(self, src):
src = self.expand(src)
- self.body += "\tcontext._mul(%s);\n" %(src)
+ self.body += "\t_mul(%s);\n" %(src)
def _div(self, src):
src = self.expand(src)
- self.body += "\tcontext._div(%s);\n" %(src)
+ self.body += "\t_div(%s);\n" %(src)
def _inc(self, dst):
dst = self.expand(dst)
- self.body += "\tcontext._inc(%s);\n" %(dst)
+ self.body += "\t_inc(%s);\n" %(dst)
def _dec(self, dst):
dst = self.expand(dst)
- self.body += "\tcontext._dec(%s);\n" %(dst)
+ self.body += "\t_dec(%s);\n" %(dst)
def _cmp(self, a, b):
- self.body += "\tcontext._cmp(%s, %s);\n" %self.parse2(a, b)
+ self.body += "\t_cmp(%s, %s);\n" %self.parse2(a, b)
def _test(self, a, b):
- self.body += "\tcontext._test(%s, %s);\n" %self.parse2(a, b)
+ self.body += "\t_test(%s, %s);\n" %self.parse2(a, b)
def _js(self, label):
- self.body += "\tif (context.flags.s())\n\t\t%s;\n" %(self.jump_to_label(label))
+ self.body += "\tif (flags.s())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jns(self, label):
- self.body += "\tif (!context.flags.s())\n\t\t%s;\n" %(self.jump_to_label(label))
+ self.body += "\tif (!flags.s())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jz(self, label):
- self.body += "\tif (context.flags.z())\n\t\t%s;\n" %(self.jump_to_label(label))
+ self.body += "\tif (flags.z())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jnz(self, label):
- self.body += "\tif (!context.flags.z())\n\t\t%s;\n" %(self.jump_to_label(label))
+ self.body += "\tif (!flags.z())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jl(self, label):
- self.body += "\tif (context.flags.l())\n\t\t%s;\n" %(self.jump_to_label(label))
+ self.body += "\tif (flags.l())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jg(self, label):
- self.body += "\tif (!context.flags.le())\n\t\t%s;\n" %(self.jump_to_label(label))
+ self.body += "\tif (!flags.le())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jle(self, label):
- self.body += "\tif (context.flags.le())\n\t\t%s;\n" %(self.jump_to_label(label))
+ self.body += "\tif (flags.le())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jge(self, label):
- self.body += "\tif (!context.flags.l())\n\t\t%s;\n" %(self.jump_to_label(label))
+ self.body += "\tif (!flags.l())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jc(self, label):
- self.body += "\tif (context.flags.c())\n\t\t%s;\n" %(self.jump_to_label(label))
+ self.body += "\tif (flags.c())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jnc(self, label):
- self.body += "\tif (!context.flags.c())\n\t\t%s;\n" %(self.jump_to_label(label))
+ self.body += "\tif (!flags.c())\n\t\t%s;\n" %(self.jump_to_label(label))
def _xchg(self, dst, src):
- self.body += "\tcontext._xchg(%s, %s);\n" %self.parse2(dst, src)
+ self.body += "\t_xchg(%s, %s);\n" %self.parse2(dst, src)
def _jmp(self, label):
self.body += "\t%s;\n" %(self.jump_to_label(label))
def _loop(self, label):
- self.body += "\tif (--context.cx)\n\t\t%s;\n" %self.jump_to_label(label)
+ self.body += "\tif (--cx)\n\t\t%s;\n" %self.jump_to_label(label)
def _push(self, regs):
p = str();
for r in regs:
r = self.expand(r)
- p += "\tcontext.push(%s);\n" %(r)
+ p += "\tpush(%s);\n" %(r)
self.body += p
def _pop(self, regs):
@@ -399,35 +395,35 @@ namespace %s {
self.temps_count -= 1
i = self.temps_count
r = self.expand(r)
- p += "\t%s = context.pop();\n" %r
+ p += "\t%s = pop();\n" %r
self.body += p
def _rep(self):
- self.body += "\twhile(context.cx--)\n\t"
+ self.body += "\twhile(cx--)\n\t"
def _lodsb(self):
- self.body += "\tcontext._lodsb();\n"
+ self.body += "\t_lodsb();\n"
def _lodsw(self):
- self.body += "\tcontext._lodsw();\n"
+ self.body += "\t_lodsw();\n"
- def _stosb(self, n):
- self.body += "\tcontext._stosb(%s);\n" %("" if n == 1 else n)
+ def _stosb(self, n, clear_cx):
+ self.body += "\t_stosb(%s%s);\n" %("" if n == 1 else n, ", true" if clear_cx else "")
- def _stosw(self, n):
- self.body += "\tcontext._stosw(%s);\n" %("" if n == 1 else n)
+ def _stosw(self, n, clear_cx):
+ self.body += "\t_stosw(%s%s);\n" %("" if n == 1 else n, ", true" if clear_cx else "")
- def _movsb(self, n):
- self.body += "\tcontext._movsb(%s);\n" %("" if n == 1 else n)
+ def _movsb(self, n, clear_cx):
+ self.body += "\t_movsb(%s%s);\n" %("" if n == 1 else n, ", true" if clear_cx else "")
- def _movsw(self, n):
- self.body += "\tcontext._movsw(%s);\n" %("" if n == 1 else n)
+ def _movsw(self, n, clear_cx):
+ self.body += "\t_movsw(%s%s);\n" %("" if n == 1 else n, ", true" if clear_cx else "")
def _stc(self):
- self.body += "\tcontext.flags._c = true;\n "
+ self.body += "\tflags._c = true;\n "
def _clc(self):
- self.body += "\tcontext.flags._c = false;\n "
+ self.body += "\tflags._c = false;\n "
def __proc(self, name, def_skip = 0):
try:
@@ -443,6 +439,7 @@ namespace %s {
self.proc = proc_module.proc(name)
self.proc.stmts = copy(src_proc.stmts)
self.proc.labels = copy(src_proc.labels)
+ self.proc.retlabels = copy(src_proc.retlabels)
#for p in xrange(skip, len(self.proc.stmts)):
# s = self.proc.stmts[p]
# if isinstance(s, op.basejmp):
@@ -453,7 +450,7 @@ namespace %s {
self.proc_addr.append((name, self.proc.offset))
self.body = str()
- self.body += "void %s(Context &context) {\n\tSTACK_CHECK(context);\n" %name;
+ self.body += "void %sContext::%s() {\n\tSTACK_CHECK;\n" %(self.namespace, name);
self.proc.optimize()
self.unbounded = []
self.proc.visit(self, skip)
@@ -479,6 +476,8 @@ namespace %s {
self.proc.stmts.append(s)
self.proc.add("ret")
print "skipping %d instructions, todo: %d" %(start, len(self.proc.stmts) - start)
+ print "re-optimizing..."
+ self.proc.optimize(keep_labels=[label])
self.proc.visit(self, start)
self.body += "}\n";
self.translated.insert(0, self.body)
@@ -499,7 +498,7 @@ namespace %s {
fd = open(fname, "wt")
fd.write("namespace %s {\n" %self.namespace)
for p in procs:
- fd.write("void %s(Context &context) {\n\t::error(\"%s\");\n}\n\n" %(p, p))
+ fd.write("void %sContext::%s() {\n\t::error(\"%s\");\n}\n\n" %(self.namespace, p, p))
fd.write("} /*namespace %s */\n" %self.namespace)
fd.close()
@@ -520,13 +519,11 @@ namespace %s {
print "continuing on %s" %name
self.proc_done.append(name)
self.__proc(name)
+ self.methods.append(name)
self.write_stubs("_stubs.cpp", self.failed)
+ self.methods += self.failed
done, failed = len(self.proc_done), len(self.failed)
- for f in self.forwards:
- if f not in self.failed:
- self.fd.write("void %s(Context &context);\n" %f)
-
self.fd.write("\n")
self.fd.write("\n".join(self.translated))
self.fd.write("\n\n")
@@ -540,20 +537,19 @@ namespace %s {
n += 1
if (n & 0xf) == 0:
data_impl += "\n\t\t"
- data_impl += "};\n\tcontext.ds.assign(src, src + sizeof(src));\n"
+ data_impl += "};\n\tds.assign(src, src + sizeof(src));\n"
self.hd.write(
"""\n#include "dreamweb/runtime.h"
namespace %s {
- void __dispatch_call(Context &context, unsigned addr);
- void __start(Context &context);
+class %sContext : public Context {
+public:
+ void __start();
+ void __dispatch_call(uint16 addr);
-""" %(self.namespace))
- for f in self.failed:
- self.hd.write("\tvoid %s(Context &context);\n" %f)
-
- offsets_decl = "\n"
+"""
+%(self.namespace, self.namespace))
offsets = []
for k, v in self.context.get_globals().items():
if isinstance(v, op.var):
@@ -563,20 +559,21 @@ namespace %s {
offsets = sorted(offsets, key=lambda t: t[1])
for o in offsets:
- offsets_decl += "\tconst static uint16 k%s = %s;\n" %o
- offsets_decl += "\n"
- self.hd.write(offsets_decl);
+ self.hd.write("\tconst static uint16 k%s = %s;\n" %o)
+ self.hd.write("\n")
+ for p in set(self.methods):
+ self.hd.write("\tvoid %s();\n" %p)
- self.hd.write("\n}\n\n#endif\n")
+ self.hd.write("};\n}\n\n#endif\n")
self.hd.close()
- self.fd.write("\nvoid __start(Context &context) { %s%s(context); \n}\n" %(data_impl, start))
+ self.fd.write("\nvoid %sContext::__start() { %s%s(); \n}\n" %(self.namespace, data_impl, start))
- self.fd.write("\nvoid __dispatch_call(Context &context, unsigned addr) {\n\tswitch(addr) {\n")
+ self.fd.write("\nvoid %sContext::__dispatch_call(uint16 addr) {\n\tswitch(addr) {\n" %self.namespace)
self.proc_addr.sort(cmp = lambda x, y: x[1] - y[1])
for name,addr in self.proc_addr:
- self.fd.write("\t\tcase 0x%04x: %s(context); break;\n" %(addr, name))
- self.fd.write("\t\tdefault: ::error(\"invalid call to %04x dispatched\", (uint16)context.ax);")
+ self.fd.write("\t\tcase 0x%04x: %s(); break;\n" %(addr, name))
+ self.fd.write("\t\tdefault: ::error(\"invalid call to %04x dispatched\", (uint16)ax);")
self.fd.write("\n\t}\n}\n\n} /*namespace*/\n")
self.fd.close()
diff --git a/devtools/tasmrecover/tasm/op.py b/devtools/tasmrecover/tasm/op.py
index 9baebccfc3..10fdd8a568 100644
--- a/devtools/tasmrecover/tasm/op.py
+++ b/devtools/tasmrecover/tasm/op.py
@@ -317,26 +317,30 @@ class _lodsw(baseop):
class _stosw(baseop):
def __init__(self, arg):
self.repeat = 1
+ self.clear_cx = False
def visit(self, visitor):
- visitor._stosw(self.repeat)
+ visitor._stosw(self.repeat, self.clear_cx)
class _stosb(baseop):
def __init__(self, arg):
self.repeat = 1
+ self.clear_cx = False
def visit(self, visitor):
- visitor._stosb(self.repeat)
+ visitor._stosb(self.repeat, self.clear_cx)
class _movsw(baseop):
def __init__(self, arg):
self.repeat = 1
+ self.clear_cx = False
def visit(self, visitor):
- visitor._movsw(self.repeat)
+ visitor._movsw(self.repeat, self.clear_cx)
class _movsb(baseop):
def __init__(self, arg):
self.repeat = 1
+ self.clear_cx = False
def visit(self, visitor):
- visitor._movsb(self.repeat)
+ visitor._movsb(self.repeat, self.clear_cx)
class _in(baseop):
def __init__(self, arg):
diff --git a/devtools/tasmrecover/tasm/proc.py b/devtools/tasmrecover/tasm/proc.py
index 1350ea1e0b..c127c406f7 100644
--- a/devtools/tasmrecover/tasm/proc.py
+++ b/devtools/tasmrecover/tasm/proc.py
@@ -9,6 +9,7 @@ class proc:
self.calls = []
self.stmts = []
self.labels = set()
+ self.retlabels = set()
self.__label_re = re.compile(r'^(\S+):(.*)$')
self.offset = proc.last_addr
proc.last_addr += 4
@@ -60,20 +61,28 @@ class proc:
if i + 1 >= len(stmts):
break
if isinstance(stmts[i + 1], cls):
- stmts[i + 1].repeat = 'context.cx'
+ stmts[i + 1].repeat = 'cx'
+ stmts[i + 1].clear_cx = True
del stmts[i]
i += 1
return
- def optimize(self):
+ def optimize(self, keep_labels=[]):
print "optimizing..."
- #trivial simplifications, removing last ret
+ #trivial simplifications
while len(self.stmts) and isinstance(self.stmts[-1], op.label):
print "stripping last label"
self.stmts.pop()
- if isinstance(self.stmts[-1], op._ret) and (len(self.stmts) < 2 or not isinstance(self.stmts[-2], op.label)):
- print "stripping last ret"
- self.stmts.pop()
+ #mark labels that directly precede a ret
+ for i in range(len(self.stmts)):
+ if not isinstance(self.stmts[i], op.label):
+ continue
+ j = i
+ while j < len(self.stmts) and isinstance(self.stmts[j], op.label):
+ j += 1
+ if j == len(self.stmts) or isinstance(self.stmts[j], op._ret):
+ print "Return label: %s" % (self.stmts[i].name,)
+ self.retlabels.add(self.stmts[i].name)
#merging push ax pop bx constructs
i = 0
while i + 1 < len(self.stmts):
@@ -101,16 +110,30 @@ class proc:
if not isinstance(s, op.label):
continue
print "checking label %s..." %s.name
- used = False
- for j in self.stmts:
- if isinstance(j, op.basejmp) and j.label == s.name:
- print "used"
- used = True
- break
+ used = s.name in keep_labels
+ if s.name not in self.retlabels:
+ for j in self.stmts:
+ if isinstance(j, op.basejmp) and j.label == s.name:
+ print "used"
+ used = True
+ break
if not used:
print self.labels
self.remove_label(s.name)
+ #removing duplicate rets
+ i = 0
+ while i < len(self.stmts)-1:
+ if isinstance(self.stmts[i], op._ret) and isinstance(self.stmts[i+1], op._ret):
+ del self.stmts[i]
+ else:
+ i += 1
+
+ #removing last ret
+ while len(self.stmts) > 0 and isinstance(self.stmts[-1], op._ret) and (len(self.stmts) < 2 or not isinstance(self.stmts[-2], op.label)):
+ print "stripping last ret"
+ self.stmts.pop()
+
self.optimize_sequence(op._stosb);
self.optimize_sequence(op._stosw);
self.optimize_sequence(op._movsb);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-16 05:11:07 +0000