LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-30 22:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

AS3 p-code more RAbcDasm like: lookupswitch caseoffsets in brackets

Browse Source
This commit is contained in:
Jindra Petřík
2021-01-25 21:34:21 +01:00
parent 286fb9d5e4
commit 90bf2057fe
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
View File

@@ -336,13 +336,17 @@ public class AVM2Instruction implements Cloneable, GraphSourceItem {
s.append(Helper.formatAddress(address + operands[i]));
break;
case AVM2Code.OPT_CASE_OFFSETS:
s.append(" ");
s.append(operands[i]);
s.append(" [");
boolean first = true;
for (int j = i + 1; j < operands.length; j++) {
s.append(" ");
if (!first) {
s.append(", ");
}
first = false;
s.append("ofs");
s.append(Helper.formatAddress(address + operands[j]));
}
s.append("]");
break;
default:
s.append(" ");

34
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/ASM3Parser.java
View File

@@ -1025,21 +1025,35 @@ public class ASM3Parser {
break;
case AVM2Code.OPT_CASE_OFFSETS:
if (parsedOperand.type == ParsedSymbol.TYPE_INTEGER) {
int patCount = (int) (long) (Long) parsedOperand.value;
operandsList.add(patCount);
if (parsedOperand.type == ParsedSymbol.TYPE_BRACKET_OPEN) {
parsedOperand = lexer.lex();
for (int c = 0; c <= patCount; c++) {
int c = 0;
while (parsedOperand.type == ParsedSymbol.TYPE_IDENTIFIER) {
offsetItems.add(new CaseOffsetItem((String) parsedOperand.value, code.code.size(), i + (c + 1)));
c++;
parsedOperand = lexer.lex();
if (parsedOperand.type == ParsedSymbol.TYPE_IDENTIFIER) {
offsetItems.add(new CaseOffsetItem((String) parsedOperand.value, code.code.size(), i + (c + 1)));
operandsList.add(0);
} else {
throw new AVM2ParseException("Offset expected", lexer.yyline());
if (parsedOperand.type == ParsedSymbol.TYPE_BRACKET_CLOSE) {
break;
}
if (parsedOperand.type != ParsedSymbol.TYPE_COMMA) {
throw new AVM2ParseException("Comma , expected", lexer.yyline());
}
parsedOperand = lexer.lex();
}
if (parsedOperand.type != ParsedSymbol.TYPE_BRACKET_CLOSE) {
throw new AVM2ParseException("Bracket close ] expected", lexer.yyline());
}
if (c == 0) {
throw new AVM2ParseException("At least single offset expected", lexer.yyline());
}
operandsList.add(c - 1);
for (int d = 0; d < c; d++) {
operandsList.add(0);
}
} else {
throw new AVM2ParseException("Case count expected", lexer.yyline());
throw new AVM2ParseException("Bracket open [ expected", lexer.yyline());
}
break;
case AVM2Code.OPT_S8: