From 73aa020eeb8fb77f09bd774a216b313de894acd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= <jindra.petrik@gmail.com>
Date: Sat, 22 Dec 2012 12:18:13 +0100
Subject: [PATCH] AS3: Detecting local register types

---
 .../com/jpexs/asdec/abc/avm2/AVM2Code.java    | 24 ++++++++++++++++++-
 .../avm2/instructions/types/CoerceAIns.java   |  8 +++++++
 .../avm2/instructions/types/CoerceIns.java    |  5 ++++
 .../types/CoerceOrConvertTypeIns.java         |  5 +++-
 .../avm2/instructions/types/CoerceSIns.java   |  4 ++++
 .../avm2/instructions/types/ConvertBIns.java  |  4 ++++
 .../avm2/instructions/types/ConvertDIns.java  |  4 ++++
 .../avm2/instructions/types/ConvertIIns.java  |  4 ++++
 .../avm2/instructions/types/ConvertOIns.java  |  4 ++++
 .../avm2/instructions/types/ConvertSIns.java  |  4 ++++
 .../avm2/instructions/types/ConvertUIns.java  |  4 ++++
 11 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java b/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java
index c0f02cd46..62804eeca 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java
@@ -1832,6 +1832,23 @@ public HashMap<Integer,String> getLocalRegNamesFromDebug(ABC abc){
        return maxRegister+1;
     }
 
+    public HashMap<Integer,String> getLocalRegTypes(ConstantPool constants){
+       HashMap<Integer,String> ret=new HashMap<Integer,String>();
+       AVM2Instruction prev=null;
+       for(AVM2Instruction ins:code){
+          if(ins.definition instanceof SetLocalTypeIns){
+             if(prev!=null){
+                if(prev.definition instanceof CoerceOrConvertTypeIns)
+                {
+                   ret.put(((SetLocalTypeIns)ins.definition).getRegisterId(ins),((CoerceOrConvertTypeIns)prev.definition).getTargetType(constants, prev));
+                }
+             }
+          }
+          prev=ins;
+       }
+       return ret;
+    }
+    
     public String toSource(boolean isStatic, int classIndex, ABC abc, ConstantPool constants, MethodInfo method_info[], MethodBody body, boolean hilighted,HashMap<Integer,String> localRegNames) {
         toSourceCount = 0;
         loopList = new ArrayList<Loop>();
@@ -1866,10 +1883,15 @@ public HashMap<Integer,String> getLocalRegNamesFromDebug(ABC abc){
               paramCount++;
            }
         }
+        HashMap<Integer,String> localRegTypes=getLocalRegTypes(constants);
         for(int i=paramCount+1;i<regCount;i++)
         {
             if((!(localRegs.get(i) instanceof NewActivationTreeItem))&&(!isKilled(i, 0, code.size()-1))){
-               sub+="var "+TreeItem.localRegName(localRegNames,i)+";\r\n";
+               sub+="var "+TreeItem.localRegName(localRegNames,i);
+               if(localRegTypes.containsKey(i)){
+                  sub+=":"+localRegTypes.get(i);
+               }
+               sub+=";\r\n";
             }
         }
         try {
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java
index 220aa27fa..01044c292 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java
@@ -36,6 +36,10 @@ public class CoerceAIns extends InstructionDefinition implements CoerceOrConvert
         super(0x82, "coerce_a", new int[]{});
     }
 
+    public String getTargetType(){
+       return "*";
+    }
+    
     @Override
     public void execute(LocalDataArea lda, ConstantPool constants, List arguments) {
         //coerce any type
@@ -51,4 +55,8 @@ public class CoerceAIns extends InstructionDefinition implements CoerceOrConvert
    public int getStackDelta(AVM2Instruction ins, ABC abc) {
       return -1+1;
    }
+    
+    public String getTargetType(ConstantPool constants,AVM2Instruction ins){
+       return "*";
+    }
 }
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java
index 36346698b..90bd5004e 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java
@@ -48,6 +48,11 @@ public class CoerceIns extends InstructionDefinition implements CoerceOrConvertT
         int multinameIndex = ins.operands[0];
         stack.push(new CoerceTreeItem(ins, (TreeItem) stack.pop(), constants.constant_multiname[multinameIndex].getName(constants)));
     }
+    
+    public String getTargetType(ConstantPool constants,AVM2Instruction ins){
+       int multinameIndex = ins.operands[0];
+       return constants.constant_multiname[multinameIndex].getName(constants);
+    }
 
     @Override
    public int getStackDelta(AVM2Instruction ins, ABC abc) {
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java
index a2e232ad3..8be12080b 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java
@@ -17,10 +17,13 @@
 
 package com.jpexs.asdec.abc.avm2.instructions.types;
 
+import com.jpexs.asdec.abc.avm2.ConstantPool;
+import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction;
+
 /**
  *
  * @author JPEXS
  */
 public interface CoerceOrConvertTypeIns {
-
+   public String getTargetType(ConstantPool constants,AVM2Instruction ins);
 }
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java
index c78e13715..c083bd1fb 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java
@@ -52,4 +52,8 @@ public class CoerceSIns extends InstructionDefinition implements CoerceOrConvert
    public int getStackDelta(AVM2Instruction ins, ABC abc) {
       return -1+1;
    }
+    
+    public String getTargetType(ConstantPool constants,AVM2Instruction ins){
+       return "String";
+    }
 }
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java
index 0bb742f25..3470460da 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java
@@ -61,4 +61,8 @@ public class ConvertBIns extends InstructionDefinition implements CoerceOrConver
    public int getStackDelta(AVM2Instruction ins, ABC abc) {
       return -1+1;
    }
+    
+    public String getTargetType(ConstantPool constants,AVM2Instruction ins){
+       return "Boolean";
+    }
 }
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java
index 9fcd8e20e..3df5320b6 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java
@@ -69,4 +69,8 @@ public class ConvertDIns extends InstructionDefinition implements CoerceOrConver
    public int getStackDelta(AVM2Instruction ins, ABC abc) {
       return -1+1;
    }
+    
+    public String getTargetType(ConstantPool constants,AVM2Instruction ins){
+       return "Number";
+    }
 }
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java
index f5cafb1fd..d822636b3 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java
@@ -67,4 +67,8 @@ public class ConvertIIns extends InstructionDefinition implements CoerceOrConver
    public int getStackDelta(AVM2Instruction ins, ABC abc) {
       return -1+1;
    }
+    
+    public String getTargetType(ConstantPool constants,AVM2Instruction ins){
+       return "int";
+    }
 }
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java
index 35a566506..50f96a5e9 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java
@@ -50,4 +50,8 @@ public class ConvertOIns extends InstructionDefinition implements CoerceOrConver
    public int getStackDelta(AVM2Instruction ins, ABC abc) {
       return -1+1;
    }
+    
+    public String getTargetType(ConstantPool constants,AVM2Instruction ins){
+       return "Object";
+    }
 }
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java
index 71eab7255..63d4debbf 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java
@@ -51,4 +51,8 @@ public class ConvertSIns extends InstructionDefinition implements CoerceOrConver
    public int getStackDelta(AVM2Instruction ins, ABC abc) {
       return -1+1;
    }
+    
+    public String getTargetType(ConstantPool constants,AVM2Instruction ins){
+       return "String";
+    }
 }
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java
index 9c17fc7f5..0c52785f9 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java
@@ -50,4 +50,8 @@ public class ConvertUIns extends InstructionDefinition implements CoerceOrConver
    public int getStackDelta(AVM2Instruction ins, ABC abc) {
       return -1+1;
    }
+    
+    public String getTargetType(ConstantPool constants,AVM2Instruction ins){
+       return "uint";
+    }
 }