pol/synth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix if-else regs

Browse Source
This commit is contained in:
Paul Mathieu 2021-02-22 20:33:35 -08:00
parent 64d440c94b
commit f3928f52a4
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/cc.py
View File

@ -186,6 +186,15 @@ class RegBank:
if var1 is not None: if var1 is not None:
self.loaded(var1, reg0) self.loaded(var1, reg0)
def snap(self):
return dict(self.vars), dict(self.cleanup)
def restore(self, snap):
self.reset()
vardict, cleanup = snap
for var, reg in vardict.items():
self.loaded(var, reg, cleanup=cleanup.get(reg, None))
@contextlib.contextmanager @contextlib.contextmanager
def borrow(self, howmany): def borrow(self, howmany):
regs = [self.take() for i in range(howmany)] regs = [self.take() for i in range(howmany)]
@ -775,8 +784,10 @@ class CcInterp(lark.visitors.Interpreter):
has_else = len(tree.children) > 2 has_else = len(tree.children) > 2
op = IfOp(self.cur_fun, [tree.children[0].op.out, mark, has_else]) op = IfOp(self.cur_fun, [tree.children[0].op.out, mark, has_else])
self._synth(op) self._synth(op)
begin_vars = self.cur_fun.regs.snap()
self.visit(tree.children[1]) self.visit(tree.children[1])
if has_else: if has_else:
self.cur_fun.regs.restore(begin_vars)
self.cur_fun.ops.append(op.synth_else) self.cur_fun.ops.append(op.synth_else)
self.visit(tree.children[2]) self.visit(tree.children[2])
self.cur_fun.ops.append(op.synth_endif) self.cur_fun.ops.append(op.synth_endif)