Index: /trunk/Decompiler.class.php
===================================================================
--- /trunk/Decompiler.class.php	(revision 805)
+++ /trunk/Decompiler.class.php	(revision 806)
@@ -700,8 +700,10 @@
 	}
 	// }}}
-	function decompileBasicBlock(&$EX, $range, $indent) // {{{
+	function decompileBasicBlock(&$EX, $range, $indent, $unhandled = false) // {{{
 	{
 		$this->dasmBasicBlock($EX, $range);
-		// $this->dumpRange($EX, $range, $indent);
+		if ($unhandled) {
+			$this->dumpRange($EX, $range, $indent);
+		}
 		$this->outputPhp($EX, $range, $indent);
 	}
@@ -1005,9 +1007,12 @@
 
 			$this->endComplexBlock($EX);
+			if ($opcodes[$range[1] + 1]['opcode'] == XC_SWITCH_FREE) {
+				$this->removeJmpInfo($EX, $range[1] + 1);
+			}
 			return;
 		}
 		// }}}
 
-		$this->decompileBasicBlock($EX, $range, $indent);
+		$this->decompileBasicBlock($EX, $range, $indent, true);
 	}
 	// }}}