Cool_Tools/bemaniutils
1
0
Fork 0
mirror of synced 2025-02-20 20:50:59 +01:00
Code Releases Activity

Avoid duplicating labels outside of and inside of do-while statements. Avoid going to or generating negative labels (artificially inserted nodes).

Browse Source
This commit is contained in:
Jennifer Taylor 2021-04-26 03:24:24 +00:00
parent b7523b5521
commit 8cf219cb25
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bemani/format/afp/decompile.py
View File

@ -180,6 +180,9 @@ class ContinueStatement(Statement):
class GotoStatement(Statement):
# A goto, including the ID of the chunk we want to jump to.
def __init__(self, location: int) -> None:
if location < 0:
raise Exception(f"Logic error, attempting to go to artificially inserted location {location}!")
self.location = location
def __repr__(self) -> str:
@ -2600,9 +2603,6 @@ class ByteCodeDecompiler(VerboseOutput):
else:
next_chunk_id = next_id
# Make sure when we collapse chunks, we don't lose labels.
statements.append(DefineLabelStatement(start_id))
if isinstance(chunk, Loop):
# Evaluate the loop. No need to update per-chunk stacks here since we will do it in a child eval.
self.vprint(f"Evaluating graph in Loop {chunk.id}")
@ -2614,6 +2614,10 @@ class ByteCodeDecompiler(VerboseOutput):
# We should have evaluated this earlier!
raise Exception("Logic error!")
else:
if start_id >= 0:
# Make sure when we collapse chunks, we don't lose labels.
statements.append(DefineLabelStatement(start_id))
# Grab the computed start stack for this ID
stack = stacks[chunk.id]
del stacks[chunk.id]