From d5131c70be7215339e14e42ef87bcadad4e5a39d Mon Sep 17 00:00:00 2001
From: jochen <jochen@379699f6-c40d-0410-875b-85095c16579e>
Date: Sat, 26 Sep 1998 09:53:09 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@37 379699f6-c40d-0410-875b-85095c16579e
---
 .../decompiler/LocalVariableRangeList.java    |  4 +-
 jode/jode/decompiler/LocalVariableTable.java  |  2 +-
 jode/jode/flow/CatchBlock.java                | 60 +++++++++---
 jode/jode/flow/FlowBlock.java                 |  9 +-
 jode/jode/flow/InstructionBlock.java          | 37 +++++++-
 jode/jode/flow/RawTryCatchBlock.java          | 54 +++++------
 jode/jode/flow/StructuredBlock.java           | 24 +++++
 jode/jode/flow/jode.ppl                       | 94 ++++++++++++++++++-
 jode/jode/type/ClassRangeType.java            |  8 +-
 jode/jode/type/MyType.java                    |  5 +-
 10 files changed, 242 insertions(+), 55 deletions(-)

diff --git a/jode/jode/decompiler/LocalVariableRangeList.java b/jode/jode/decompiler/LocalVariableRangeList.java
index 42703c1..253fe40 100644
--- a/jode/jode/decompiler/LocalVariableRangeList.java
+++ b/jode/jode/decompiler/LocalVariableRangeList.java
@@ -62,9 +62,9 @@ public class LocalVariableRangeList implements LocalVariable {
 
     private LocalInfo find(int addr) {
         MyLocalInfo li = list;
-        while (li != null && addr > li.start+li.length)
+        while (li != null && addr >= li.start+li.length)
             li = li.next;
-        if (li == null || li.start > addr) {
+        if (li == null || li.start > addr+2/*XXX*/) {
             LocalInfo temp = new LocalInfo(slot);
             return temp;
         }
diff --git a/jode/jode/decompiler/LocalVariableTable.java b/jode/jode/decompiler/LocalVariableTable.java
index 93d8905..3438c5f 100644
--- a/jode/jode/decompiler/LocalVariableTable.java
+++ b/jode/jode/decompiler/LocalVariableTable.java
@@ -43,7 +43,7 @@ public class LocalVariableTable {
     {
         int count = stream.readUnsignedShort();
         for (int i=0; i<count; i++) {
-            int start  = stream.readUnsignedShort()-2; /*XXX*/
+            int start  = stream.readUnsignedShort();
             int length = stream.readUnsignedShort();
             int name_i = stream.readUnsignedShort();
             int desc_i = stream.readUnsignedShort();
diff --git a/jode/jode/flow/CatchBlock.java b/jode/jode/flow/CatchBlock.java
index 08874de..0f7a0be 100644
--- a/jode/jode/flow/CatchBlock.java
+++ b/jode/jode/flow/CatchBlock.java
@@ -59,28 +59,43 @@ public class CatchBlock extends StructuredBlock {
      * @param catchBlock the catch block.
      */
     public void setCatchBlock(StructuredBlock catchBlock) {
-        if (catchBlock instanceof SequentialBlock
-            && catchBlock.getSubBlocks()[0] instanceof InstructionBlock) {
-            
-            InstructionBlock localBlock = 
-                (InstructionBlock) catchBlock.getSubBlocks()[0];
-            jode.Instruction instr = localBlock.getInstruction();
+        if ((catchBlock instanceof SequentialBlock
+             && catchBlock.getSubBlocks()[0] instanceof InstructionBlock)
+            || catchBlock instanceof InstructionBlock) {
             
+            jode.Instruction instr = 
+                ((InstructionBlock) (catchBlock instanceof InstructionBlock 
+                                     ? catchBlock
+                                     : catchBlock.getSubBlocks()[0])
+                 ).getInstruction();
+
             if (instr instanceof jode.PopOperator) {
-                exceptionLocal = new LocalInfo(99);
+                exceptionLocal = new LocalInfo(-1);
                 exceptionLocal.setName
                     (Identifier.lookup("exception_"+(serialno++)+"_"));
-                catchBlock = catchBlock.getSubBlocks()[1];
+                exceptionLocal.setType(exceptionType);
             } else if (instr instanceof jode.LocalStoreOperator) {
                 exceptionLocal = 
                     ((jode.LocalStoreOperator) instr).getLocalInfo();
-                catchBlock = catchBlock.getSubBlocks()[1];
-            } 
+            }
+
+            if (exceptionLocal != null) {
+                StructuredBlock newCatchBlock = 
+                    (catchBlock instanceof InstructionBlock 
+                     ? new EmptyBlock()
+                     : catchBlock.getSubBlocks()[1]);
+
+                if (catchBlock.jump != null)
+                    newCatchBlock.moveJump(catchBlock);
+                catchBlock = newCatchBlock;
+            }
         }
         if (exceptionLocal == null) { 
-            exceptionLocal = new LocalInfo(99);
+            exceptionLocal = new LocalInfo(-1);
             exceptionLocal.setName(Identifier.lookup("ERROR!!!"));
+            exceptionLocal.setType(exceptionType);
         }
+        used.addElement(exceptionLocal);
         this.catchBlock = catchBlock;
         catchBlock.outer = this;
         catchBlock.setFlowBlock(flowBlock);
@@ -124,6 +139,24 @@ public class CatchBlock extends StructuredBlock {
             && (catchBlock.jump != null || catchBlock.jumpMayBeChanged());
     }
 
+    /**
+     * Print the code for the declaration of a local variable.
+     * @param writer The tabbed print writer, where we print to.
+     * @param local  The local that should be declared.
+     */
+    public void dumpDeclaration(jode.TabbedPrintWriter writer, LocalInfo local)
+        throws java.io.IOException
+    {
+        if (local != exceptionLocal) {
+            /* exceptionLocal will be automatically declared in
+             * dumpInstruction.
+             *
+             * This is currently broken for nested tries... XXX
+             */
+            super.dumpDeclaration(writer, local);
+        }
+    }
+
     public void dumpInstruction(jode.TabbedPrintWriter writer) 
         throws java.io.IOException {
         /* avoid ugly nested tries */
@@ -132,7 +165,7 @@ public class CatchBlock extends StructuredBlock {
             writer.println("try {");
             writer.tab();
         }
-        tryBlock.dumpInstruction(writer);
+        tryBlock.dumpSource(writer);
         writer.untab();
         writer.println("} catch ("+/*XXX*/exceptionType.typeString
                        (exceptionLocal.getName().toString())+") {");
@@ -145,3 +178,6 @@ public class CatchBlock extends StructuredBlock {
         }
     }
 }
+
+
+
diff --git a/jode/jode/flow/FlowBlock.java b/jode/jode/flow/FlowBlock.java
index 3dc721b..21a21ed 100644
--- a/jode/jode/flow/FlowBlock.java
+++ b/jode/jode/flow/FlowBlock.java
@@ -150,7 +150,7 @@ public class FlowBlock {
         same_jump: while(true) {
             /* if the jump is the jump of the appendBlock, skip it.
              */
-            if (jump.prev == appendBlock)
+            if (jump.prev == null || jump.prev == appendBlock)
                 continue next_jump;
 
             /* Note: jump.prev.outer != null, since appendBlock is
@@ -671,7 +671,7 @@ public class FlowBlock {
             /* Do the following modifications on the struct block. */
             appendBlock = precedingcase;
             succ.block.setFlowBlock(this);
-            switchBlock.define(defineHere);
+//             switchBlock.define(defineHere);
 
         } else {
 
@@ -698,7 +698,7 @@ public class FlowBlock {
             sequBlock.setFirst(appendBlock);
             sequBlock.setSecond(succ.block);
             succ.block.setFlowBlock(this);
-            sequBlock.define(defineHere);
+//             sequBlock.define(defineHere);
         }
 
         /* Merge the sucessors from the successing flow block
@@ -773,7 +773,6 @@ public class FlowBlock {
                                              LoopBlock.FALSE);
 
             int breaklevel = 1;
-            Jump debug=jump;
             for (StructuredBlock surrounder = jump.prev.outer;
                  surrounder != appendBlock.outer; 
                  surrounder = surrounder.outer) {
@@ -898,7 +897,7 @@ public class FlowBlock {
 
             whileBlock.replace(bodyBlock, bodyBlock);
             whileBlock.setBody(bodyBlock);
-            whileBlock.define(defineHere);
+//             whileBlock.define(defineHere);
 
             /* Try to eliminate as many jumps as possible.
              */
diff --git a/jode/jode/flow/InstructionBlock.java b/jode/jode/flow/InstructionBlock.java
index 4c70a24..e63d625 100644
--- a/jode/jode/flow/InstructionBlock.java
+++ b/jode/jode/flow/InstructionBlock.java
@@ -31,11 +31,42 @@ public class InstructionBlock extends InstructionContainer {
         super(instr, jump);
     }
 
+    /**
+     * True if this is a declaration.
+     */
+    private boolean isDeclaration = false;
+
+    public void dumpDeclaration(TabbedPrintWriter writer, LocalInfo local)
+	throws java.io.IOException
+    {
+        if (instr instanceof Expression
+            && ((Expression)instr).getOperator() instanceof LocalStoreOperator
+            && ((LocalStoreOperator) ((Expression)instr).getOperator())
+            .getLocalInfo() == local) {
+            isDeclaration = true;
+        } else
+            super.dumpDeclaration(writer, local);
+    }
+
+    public void dumpSource(TabbedPrintWriter writer) 
+	throws java.io.IOException
+    {
+        isDeclaration = false;
+        super.dumpSource(writer);
+    }
+
     public void dumpInstruction(TabbedPrintWriter writer) 
 	throws java.io.IOException
     {
-        if (instr.getType() != MyType.tVoid)
-            writer.print("push ");
-        writer.println(instr.toString()+";");
+        if (isDeclaration) {
+            writer.println
+                (((LocalStoreOperator) ((Expression)instr).getOperator())
+                 .getLocalInfo().getType().toString()/*XXX*/
+                 + " " + instr.toString() + ";");
+        } else {
+            if (instr.getType() != MyType.tVoid)
+                writer.print("push ");
+            writer.println(instr.toString()+";");
+        }
     }
 }
diff --git a/jode/jode/flow/RawTryCatchBlock.java b/jode/jode/flow/RawTryCatchBlock.java
index e40feb6..8a8d016 100644
--- a/jode/jode/flow/RawTryCatchBlock.java
+++ b/jode/jode/flow/RawTryCatchBlock.java
@@ -47,8 +47,8 @@ public class RawTryCatchBlock extends StructuredBlock {
                             Jump endDest, Jump catchDest) {
         this.type = type;
 
-        endBlock = new EmptyBlock(endDest);
-        endBlock.outer = this;
+//         endBlock = new EmptyBlock(endDest);
+//         endBlock.outer = this;
 
         catchBlock = new EmptyBlock(catchDest);
         catchBlock.outer = this;
@@ -57,13 +57,13 @@ public class RawTryCatchBlock extends StructuredBlock {
         this.tryBlock = tryBlock;
         tryBlock.outer = this;
 
-        endBlock.setFlowBlock(flowBlock);
-        if (tryBlock instanceof RawTryCatchBlock
-            && ((RawTryCatchBlock)tryBlock).endBlock.jump.destination 
-            == endDest.destination)
-            endBlock.jump = null;
-        else
-            flowBlock.addSuccessor(endDest);
+//         endBlock.setFlowBlock(flowBlock);
+//         if (tryBlock instanceof RawTryCatchBlock
+//             && ((RawTryCatchBlock)tryBlock).endBlock.jump.destination 
+//             == endDest.destination)
+//             endBlock.jump = null;
+//         else
+//             flowBlock.addSuccessor(endDest);
 
         catchBlock.setFlowBlock(flowBlock);
         flowBlock.addSuccessor(catchDest);
@@ -74,11 +74,11 @@ public class RawTryCatchBlock extends StructuredBlock {
      */
     StructuredBlock tryBlock;
 
-    /**
-     * An empty block containing an unconditional jump to the EndBlock.
-     * Or null if the try block is completely read.
-     */
-    StructuredBlock endBlock;
+//     /**
+//      * An empty block containing an unconditional jump to the EndBlock.
+//      * Or null if the try block is completely read.
+//      */
+//     StructuredBlock endBlock;
 
     /**
      * The catch block.
@@ -99,16 +99,16 @@ public class RawTryCatchBlock extends StructuredBlock {
      */
     public boolean replaceSubBlock(StructuredBlock oldBlock, 
                                    StructuredBlock newBlock) {
-        if (tryBlock == oldBlock) {
+        if (tryBlock == oldBlock)
             tryBlock = newBlock;
 
-            if (tryBlock instanceof RawTryCatchBlock
-                && ((RawTryCatchBlock)tryBlock).endBlock.jump.destination 
-                == endBlock.jump.destination) {
-                endBlock.removeJump();
-            }
-        } else if (endBlock == oldBlock)
-            endBlock = newBlock;
+//             if (tryBlock instanceof RawTryCatchBlock
+//                 && ((RawTryCatchBlock)tryBlock).endBlock.jump.destination 
+//                 == endBlock.jump.destination) {
+//                 endBlock.removeJump();
+//             }
+//         } else if (endBlock == oldBlock) {
+//             endBlock = newBlock;
         else if (catchBlock == oldBlock)
             catchBlock = newBlock;
         else
@@ -120,7 +120,7 @@ public class RawTryCatchBlock extends StructuredBlock {
      * Returns all sub block of this structured block.
      */
     public StructuredBlock[] getSubBlocks() {
-        StructuredBlock[] result = { tryBlock, endBlock, catchBlock };
+        StructuredBlock[] result = { tryBlock/*, endBlock*/, catchBlock };
         return result;
     }
 
@@ -140,10 +140,10 @@ public class RawTryCatchBlock extends StructuredBlock {
         writer.tab();
         tryBlock.dumpSource(writer);
         writer.untab();
-        writer.println("UNTIL");
-        writer.tab();
-        endBlock.dumpSource(writer);
-        writer.untab();
+//         writer.println("UNTIL");
+//         writer.tab();
+//         endBlock.dumpSource(writer);
+//         writer.untab();
         writer.println("CATCH TO");
         writer.tab();
         catchBlock.dumpSource(writer);
diff --git a/jode/jode/flow/StructuredBlock.java b/jode/jode/flow/StructuredBlock.java
index 58e0db3..b95c764 100644
--- a/jode/jode/flow/StructuredBlock.java
+++ b/jode/jode/flow/StructuredBlock.java
@@ -275,6 +275,29 @@ public abstract class StructuredBlock {
         }
     }
 
+    public VariableSet propagateUsage() {
+        StructuredBlock[] subs = getSubBlocks();
+        VariableSet[] childUse = new VariableSet[subs.length];
+        VariableSet allUse = (VariableSet) used.clone();
+        for (int i=0; i<subs.length; i++) {
+            childUse[i] = subs[i].propagateUsage();
+            allUse.addExact(childUse[i]);
+        }
+        if (subs.length == 2) {
+            /* All variables used in both sub blocks, are used in
+             * this block, too.  But a sequential block is a notable
+             * exception, since it is enough if the first sub block
+             * declares the Variable
+             */
+            VariableSet newUse = childUse[0].intersectExact(childUse[1]);
+            if (this instanceof SequentialBlock)
+                subs[0].used.addExact(newUse);
+            else
+                used.addExact(newUse);
+        }
+        return allUse;
+    }
+
     /**
      * Make the declarations, i.e. initialize the declare variable
      * to correct values.  This will declare every variable that
@@ -282,6 +305,7 @@ public abstract class StructuredBlock {
      * @param done The set of the already declare variables.
      */
     public void makeDeclaration(VariableSet done) {
+        propagateUsage();
 	declare.addExact(used);
 	declare.subtractExact(done);
 	done.addExact(declare);
diff --git a/jode/jode/flow/jode.ppl b/jode/jode/flow/jode.ppl
index b09f24d..9d75b26 100755
--- a/jode/jode/flow/jode.ppl
+++ b/jode/jode/flow/jode.ppl
@@ -94,7 +94,7 @@
 1998-09-22 20:44:33 bi
    essen
 1998-09-22 21:37:22 ei
-1998-09-22 21:35:26 be
+1998-09-22 21:37:26 be
 1998-09-22 21:39:59 ee cd data wrongorder FlowBlock.java
 1998-09-22 21:40:17 be
 1998-09-22 21:42:46 ee cd null omission FlowBlock.java
@@ -134,3 +134,95 @@
    some heavy errors still...
    ... fixing
 1998-09-23 13:27:22 ete
+1998-09-23 22:21:47 bcd
+   Local Variable improvements...
+1998-09-23 22:35:31 bi
+1998-09-23 22:47:50 ei
+1998-09-23 23:11:14 bi
+1998-09-24 00:05:02 ei
+1998-09-24 00:05:07 ecd
+1998-09-24 08:22:33 be
+   Fixing a bug I found overnight
+1998-09-24 08:23:33 ee cd data omission FlowBlock.java
+1998-09-24 09:18:15 be
+   Wrong place for in-Variables??
+   Make it FlowBlock-Member now!
+1998-09-24 09:30:12 ee ds data ... StructuredBlock.java
+1998-09-24 09:30:12 bdr
+   in:  FlowBlock-Member?
+   out: Jump-Member???
+1998-09-24 10:14:31 bi
+1998-09-24 10:18:30 ei
+1998-09-24 10:18:31 edr   
+1998-09-24 10:18:32 be
+   in/out trafos stimmen nicht!
+1998-09-24 10:36:57 ee cd data overwritten StructuredBlock.java
+1998-09-24 10:36:58 bte
+1998-09-24 10:45:14 ete
+1998-09-24 10:48:54 bcr
+   Clean up!
+1998-09-24 10:53:42 ecr
+1998-09-24 10:55:15 bte
+1998-09-24 11:01:54 be
+1998-09-24 11:06:42 ee ds flow notenoughthinking CodeAnalyzer.java
+   Test did succeed, now!!!
+1998-09-24 11:11:22 ete
+1998-09-24 11:11:38 bds
+   local definition
+1998-09-24 11:24:30 eds
+1998-09-24 11:24:33 bte
+   fine tuning...
+   ... no success it really needs more thinking!!!
+1998-09-24 12:40:16 ete
+   Essen fahren!
+1998-09-24 16:00:00 bcd   
+1998-09-24 20:40:00 ecd   
+   Local Variables are still broken
+1998-09-25 11:25:27 bcd
+   Doing some other expression-building
+1998-09-25 11:28:22 bi
+   java-mode configuration
+1998-09-25 11:40:57 ei
+1998-09-25 13:30:28 ecd
+   Essen fahren,  CreateAssignExpression angefangen, aber noch nicht fertig!
+1998-09-25 20:27:42 bcd
+1998-09-25 20:32:43 ecd
+1998-09-25 20:32:47 bcp
+1998-09-25 20:38:43 ecp
+1998-09-25 20:38:49 bte
+1998-09-25 20:38:51 bi
+1998-09-25 20:50:39 ei
+1998-09-25 20:50:41 be
+1998-09-25 20:55:58 
+   it's a error in the old version. Doesn't support postinc's on static
+   fields.
+1998-09-25 20:58:57 bi
+1998-09-25 21:10:56 ei 
+1998-09-25 21:19:24 ee prevcd
+1998-09-25 21:19:24 ete
+   We should probably try to simplify the expression mechanism.  We
+   don't need to produce an expression if the operator has no parameters
+   at all.
+1998-09-25 21:20:54 bcd
+   I now want to handle the try-catch blocks.  Finally will be done later...
+1998-09-25 22:25:25 ecd
+1998-09-25 22:25:27 bte
+   finetuning until try catch block are working.
+1998-09-25 23:41:36 ete
+   Now it runs most times... 
+   	(but the relationship of endBlock and catchBlock must be solved)
+   Important tasks:
+   	1. Implement switch
+   	2. locals need more thought
+   	3. Handle JSR
+   	4. Implement finally
+   	5. Handle MonitorEnter/Exit
+   	6. Implement synchronized()
+	7. field initialization
+   	8. Type output
+   	9. Differentiate local and member variables with same name.
+1998-09-26 10:30:00 bcd
+   local declaration.
+   bug fix for empty switches
+1998-09-26 11:51:09 ecd
+   Okay 2. works perfect
diff --git a/jode/jode/type/ClassRangeType.java b/jode/jode/type/ClassRangeType.java
index 6b58e0c..5cab4f4 100644
--- a/jode/jode/type/ClassRangeType.java
+++ b/jode/jode/type/ClassRangeType.java
@@ -350,10 +350,12 @@ public class ClassRangeType extends MyType {
 
     public String typeString(String string, boolean flag1, boolean flag2)
     {
-// 	if (verbose??)
+	if (Decompiler.isDebugging)
 	    return "<"+bottomType+"-"+topType+">" + string;
-// 	else
-// 	    return bottomType.typeString(string, flag1, flag2);
+	else if (bottomType != null)
+	    return bottomType.typeString(string, flag1, flag2);
+        else
+	    return tObject.typeString(string, flag1, flag2);
     }
 
 //     public String toString()
diff --git a/jode/jode/type/MyType.java b/jode/jode/type/MyType.java
index 6a376bd..07ac1d6 100644
--- a/jode/jode/type/MyType.java
+++ b/jode/jode/type/MyType.java
@@ -59,8 +59,11 @@ public class MyType extends Type {
 
     public static Type tSuperType(Type type) {
 	int typeCode = type.getTypeCode();
-	if (typeCode == 9 || typeCode == 10 || typeCode == 103) 
+	if (typeCode == 9 || typeCode == 10)
 	    return new ClassRangeType(tObject, type);
+        else if (typeCode == 103)
+            return (((ClassRangeType)type).topType == null 
+                    ? tUnknown : new ClassRangeType(tObject, null));
 	else
 	    return type;
     }