Changeset 760

Timestamp:

2011-04-17T12:23:55+02:00 (2 years ago)

Author:

moo

Message:

Decompiler: jmp_set/jmpz adjust

Location:

trunk

Files:

• Decompiler.class.php (modified) (3 diffs)
• decompilesample.php (modified) (2 diffs)

trunk/Decompiler.class.php

@@ -897 +897 @@
                 continue;
             }
-            // $this->dumpop($op, $EX); //var_dump($op);
+            // echo $i; $this->dumpop($op, $EX); //var_dump($op);
 
             $resvar = null;
@@ -1500 +1500 @@
                     break;
                 case XC_JMP_SET: // ?:
+                    $resvar = $this->getOpVal($op1, $EX);
+                    $op['cond'] = $resvar; 
+                    $op['isjmp'] = true;
+                    break;
                 case XC_JMPNZ: // while
                 case XC_JMPZNZ: // for
@@ -1521 +1525 @@
                         var_dump($op);// exit;
                     }
-                    if ($opc == XC_JMPZ_EX || $opc == XC_JMPNZ_EX || $opc == XC_JMPZ) {
+                    if ($opc == XC_JMPZ_EX || $opc == XC_JMPNZ_EX) {
                         $targetop = &$EX['opcodes'][$op2['opline_num']];
                         if ($opc == XC_JMPNZ_EX) {

trunk/decompilesample.php

@@ -206 +206 @@
 $a = $b xor $c;
 $a = !$b;
+$a = $b ? $c : $d;
+$a = f1() ? f2() : f3();
 $a = $b and $c;
 $a = $b or $c;
 $a = $b && $c;
 $a = $b || $c;
-$a = $b ? $c : $d;
-$a = f1() ? f2() : f3();
 
 try {
@@ -294 +294 @@
 
 $a = $b ?: $d;
+$a = ($b ?: $d) + $c;
 $a = f1() ?: f2();