LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 09:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

AS1/2 ActionTry fix

Browse Source 
AS1/2 Infinity
This commit is contained in:
Jindra Pet��k
2013-04-04 21:34:23 +02:00
parent 11da7d8c68
commit c5edeeb3fb
21 changed files with 1039 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java
+70 -74
View File
@@ -1,6 +1,5 @@
package com.jpexs.decompiler.flash.action;
import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer;
import com.jpexs.decompiler.flash.graph.GraphSource;
import com.jpexs.decompiler.flash.graph.GraphSourceItem;
import com.jpexs.decompiler.flash.graph.GraphTargetItem;
@@ -28,8 +27,6 @@ public class ActionGraphSource extends GraphSource {
return actions;
}
public ActionGraphSource(List<GraphSourceItem> actions, int version, HashMap<Integer, String> registerNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
this.actions = actions;
this.version = version;
@@ -61,93 +58,92 @@ public class ActionGraphSource extends GraphSource {
public List<GraphTargetItem> translatePart(List localData, Stack<GraphTargetItem> stack, int start, int end) {
return (Action.actionsPartToTree(registerNames, variables, functions, stack, actions, start, end, version));
}
private List<Long> posCache=null;
private List<Long> posCache = null;
private void rebuildCache(){
private void rebuildCache() {
posCache = new ArrayList<Long>();
for(int i=0;i<size();i++){
for (int i = 0; i < size(); i++) {
posCache.add(pos2adr(i));
}
}
/* public int adr2posInside(long addr){
long lastAddr=0;
if(addr==0){
return 0;
}
for(int i=0;i<size();i++){
long curAdr=pos2adr(i);
if(curAdr==addr){
return i;
}
if(curAdr>addr){
System.err.println("lastAddr="+lastAddr+" addr="+addr+" curAddr="+curAdr);
int contPos=adr2pos(lastAddr);
System.err.println("/insadr2po");
GraphSourceItem src=get(contPos);
if(src instanceof ActionContainer){
ActionContainer cnt=(ActionContainer)src;
return new ActionGraphSource(cnt.getActions(), version, registerNames, variables, functions).adr2pos(addr);
}else{
return -1;
}
}
lastAddr=curAdr;
}
return -1;
}*/
/* public int adr2posInside(long addr){
long lastAddr=0;
if(addr==0){
return 0;
}
for(int i=0;i<size();i++){
long curAdr=pos2adr(i);
if(curAdr==addr){
return i;
}
if(curAdr>addr){
System.err.println("lastAddr="+lastAddr+" addr="+addr+" curAddr="+curAdr);
int contPos=adr2pos(lastAddr);
System.err.println("/insadr2po");
GraphSourceItem src=get(contPos);
if(src instanceof ActionContainer){
ActionContainer cnt=(ActionContainer)src;
return new ActionGraphSource(cnt.getActions(), version, registerNames, variables, functions).adr2pos(addr);
}else{
return -1;
}
}
lastAddr=curAdr;
}
return -1;
}*/
@Override
public int adr2pos(long adr) {
if(posCache==null){
if (posCache == null) {
rebuildCache();
}
if(adr==0){
return 0;
}
int ret=posCache.indexOf((Long)adr);
if(ret==-1){
if(!posCache.isEmpty() && (adr>posCache.get(posCache.size()-1))){
return size();
}
//ret = adr2posInside(adr);
if(ret==-1){
Logger.getLogger(ActionGraphSource.class.getName()).log(Level.SEVERE, "Address loc"+Helper.formatAddress(adr)+" not found");
/*System.err.println("Addr loc"+Helper.formatAddress(adr)+" not found");
int pos=0;
for(long l:posCache){
System.err.println("ip "+pos+" action "+get(pos).toString()+" loc"+Helper.formatAddress(l));
pos++;
}*/
}
}
return ret;
/*int pos = 0;
long lastAddr = 0;
for (Action a : actions) {
lastAddr = a.getAddress();
System.err.println("ip "+pos+" addr "+Helper.formatAddress(lastAddr));
if (lastAddr == adr) {
return pos;
}
pos++;
}
if (adr > lastAddr) {
return actions.size();
}
if (adr == 0) {
return 0;
}
//throw new RuntimeException("Address "+Helper.formatAddress(adr)+" not found");
return -1;*/
int ret = posCache.indexOf((Long) adr);
if (ret == -1) {
if (!posCache.isEmpty() && (adr > posCache.get(posCache.size() - 1))) {
return size();
}
//ret = adr2posInside(adr);
if (ret == -1) {
Logger.getLogger(ActionGraphSource.class.getName()).log(Level.SEVERE, "Address loc" + Helper.formatAddress(adr) + " not found");
/*System.err.println("Addr loc"+Helper.formatAddress(adr)+" not found");
int pos=0;
for(long l:posCache){
System.err.println("ip "+pos+" action "+get(pos).toString()+" loc"+Helper.formatAddress(l));
pos++;
}*/
}
}
return ret;
/*int pos = 0;
long lastAddr = 0;
for (Action a : actions) {
lastAddr = a.getAddress();
System.err.println("ip "+pos+" addr "+Helper.formatAddress(lastAddr));
if (lastAddr == adr) {
return pos;
}
pos++;
}
if (adr > lastAddr) {
return actions.size();
}
if (adr == 0) {
return 0;
}
//throw new RuntimeException("Address "+Helper.formatAddress(adr)+" not found");
return -1;*/
}
@Override
public long pos2adr(int pos) {
GraphSourceItem si=actions.get(pos);
if(si instanceof Action){
return ((Action)si) .getAddress();//Action.ip2adr(actions, pos, version);
GraphSourceItem si = actions.get(pos);
if (si instanceof Action) {
return ((Action) si).getAddress();//Action.ip2adr(actions, pos, version);
}
return 0;
}