LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-03 16:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into v7

Browse Source 
Conflicts:
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java
This commit is contained in:
Jindra Petřík
2015-11-18 06:47:48 +01:00
parent 5bf48d14bb d1d24d63a2
commit ffc232d147
8 changed files with 160 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
View File

@@ -1034,6 +1034,14 @@ public class AVM2Code implements Cloneable {
return bos.toByteArray();
}
public void markOffsets() {
long offset = 0;
for (int i = 0; i < code.size(); i++) {
code.get(i).offset = offset;
offset += code.get(i).getBytesLength();
}
}
@Override
public String toString() {
StringBuilder s = new StringBuilder();

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2ConstantPool.java
View File

@@ -122,6 +122,7 @@ public class AVM2ConstantPool implements Cloneable {
public synchronized int addInt(long value) {
ensureDefault(constant_int);
value = (int) value;
constant_int.add(value);
return constant_int.size() - 1;
}
@@ -150,6 +151,7 @@ public class AVM2ConstantPool implements Cloneable {
public synchronized int addUInt(long value) {
ensureDefault(constant_uint);
value &= 0xffffffffl;
constant_uint.add(value);
return constant_uint.size() - 1;
}

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java
View File

@@ -36,13 +36,13 @@ public class PushByteIns extends InstructionDefinition implements PushIntegerTyp
@Override
public boolean execute(LocalDataArea lda, AVM2ConstantPool constants, AVM2Instruction ins) {
lda.operandStack.push(ins.getParam(constants, 0));
lda.operandStack.push((long) (byte) ins.operands[0]);
return true;
}
@Override
public void translate(AVM2LocalData localData, TranslateStack stack, AVM2Instruction ins, List<GraphTargetItem> output, String path) {
stack.push(new IntegerValueAVM2Item(ins, localData.lineStartInstruction, (long) ins.operands[0]));
stack.push(new IntegerValueAVM2Item(ins, localData.lineStartInstruction, (long) (byte) ins.operands[0]));
}
@Override

21
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/fastactionlist/FastActionList.java
View File

@@ -57,12 +57,12 @@ public class FastActionList implements Collection<ActionItem> {
getJumps(actions, actionItemMap);
}
final ActionItem insertItemAfter(ActionItem item, Action action) {
public final ActionItem insertItemAfter(ActionItem item, Action action) {
ActionItem newItem = new ActionItem(action);
return insertItemAfter(item, newItem);
}
final ActionItem insertItemBefore(ActionItem item, ActionItem newItem) {
public final ActionItem insertItemBefore(ActionItem item, ActionItem newItem) {
insertItemAfter(item.prev, newItem);
if (item == firstItem) {
firstItem = newItem;
@@ -71,7 +71,7 @@ public class FastActionList implements Collection<ActionItem> {
return newItem;
}
final ActionItem insertItemAfter(ActionItem item, ActionItem newItem) {
public final ActionItem insertItemAfter(ActionItem item, ActionItem newItem) {
if (item == null && firstItem == null) {
firstItem = newItem;
newItem.next = newItem;
@@ -95,7 +95,7 @@ public class FastActionList implements Collection<ActionItem> {
return newItem;
}
ActionItem removeItem(ActionItem item) {
public ActionItem removeItem(ActionItem item) {
ActionItem next = null;
if (item == firstItem) {
if (item.next == item) {
@@ -135,6 +135,19 @@ public class FastActionList implements Collection<ActionItem> {
return next;
}
public void removeItem(int index, int count) {
FastActionListIterator iterator = new FastActionListIterator(this, index);
for (int i = 0; i < count; i++) {
iterator.next();
iterator.remove();
}
}
public ActionItem get(int index) {
FastActionListIterator iterator = new FastActionListIterator(this, index);
return iterator.next();
}
public void replaceJumpTargets(ActionItem target, ActionItem newTarget) {
if (target.jumpsHere != null) {
for (ActionItem item : new ArrayList<>(target.jumpsHere)) {

14
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/fastactionlist/FastActionListIterator.java
View File

@@ -23,7 +23,7 @@ import java.util.Iterator;
*
* @author JPEXS
*/
public class FastActionListIterator implements Iterator<ActionItem> {
public final class FastActionListIterator implements Iterator<ActionItem> {
private ActionItem item;
@@ -36,6 +36,18 @@ public class FastActionListIterator implements Iterator<ActionItem> {
this.list = list;
}
FastActionListIterator(FastActionList list, int index) {
item = list.first();
this.list = list;
for (int i = 0; i < index; i++) {
if (!hasNext()) {
throw new Error("Invalid index");
}
next();
}
}
@Override
public boolean hasNext() {
return item != null && (!started || item != list.first());

7
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaScript.java
View File

@@ -48,8 +48,13 @@ public class EcmaScript {
return (double) (int) (Integer) o;
}
if (o instanceof String) {
String str = (String) o;
if (str.isEmpty()) {
return 0.0;
}
try {
return Double.parseDouble((String) o);
return Double.parseDouble(str);
} catch (NumberFormatException nfe) {
return Double.NaN;
}