Update debug information

m3m0r7 · m3m0r7 · commit 024c4442f575 · 2019-02-24T19:02:02.000+09:00
diff --git a/src/core/JavaClassInvoker.php b/src/core/JavaClassInvoker.php
@@ -115,17 +115,21 @@ public function debug(): void
 
         $methodName = $cpInfo[$this->debugTraces['method']->getNameIndex()]->getString();
         $descriptor = Formatter::parseSignature($cpInfo[$this->debugTraces['method']->getDescriptorIndex()]->getString());
-        $formattedArguments = implode(
-            ', ',
-            array_map(
-                function ($argument) {
-                    $arrayBrackets = str_repeat('[]', $argument['deep_array']);
-                    if ($argument['type'] === 'class') {
-                        return $argument['class_name'] . $arrayBrackets;
-                    }
-                    return $argument['type'] . $arrayBrackets;
-                },
-                $descriptor['arguments']
+        $formattedArguments = str_replace(
+            '/',
+            '.',
+                implode(
+                ', ',
+                array_map(
+                    function ($argument) {
+                        $arrayBrackets = str_repeat('[]', $argument['deep_array']);
+                        if ($argument['type'] === 'class') {
+                            return $argument['class_name'] . $arrayBrackets;
+                        }
+                        return $argument['type'] . $arrayBrackets;
+                    },
+                    $descriptor['arguments']
+                )
             )
         );
 
@@ -141,13 +145,25 @@ function ($argument) {
         printf(ltrim("$methodAccessibility $type $methodName($formattedArguments)\n", ' '));
         printf("\n");
         printf("[code]\n");
+
+        $codeCounter = 0;
         printf(
             "%s\n",
             implode(
                 "\n",
                 array_map(
-                    function ($code) {
-                        return '<0x' . implode('> <0x', $code) . '>';
+                    function ($codes) use (&$codeCounter) {
+                        return implode(
+                            ' ',
+                            array_map(
+                                function ($code) use (&$codeCounter) {
+                                    $isMnemonic = in_array($codeCounter, $this->debugTraces['mnemonic_indexes']);
+                                    $codeCounter++;
+                                    return ($isMnemonic ? "\e[1m\e[35m" : "") . "<0x{$code}>" . ($isMnemonic ? "\e[m" : "");
+                                },
+                                $codes
+                            )
+                        );
                     },
                     array_chunk(str_split(bin2hex($this->debugTraces['raw_code']), 2), 20)
                 )
diff --git a/src/core/jvm/invoker/Invokable.php b/src/core/jvm/invoker/Invokable.php
@@ -64,6 +64,7 @@ public function __call($name, $arguments)
         // debug code attribution with HEX
         $this->debugTraces['raw_code'] = $codeAttribute->getCode();
         $this->debugTraces['method'] = $method;
+        $this->debugTraces['mnemonic_indexes'] = [];
         $this->debugTraces['executed'] = [];
 
         $reader = new BinaryReader($handle);
@@ -90,6 +91,7 @@ public function __call($name, $arguments)
 
             $fullName = '\\PHPJava\\Kernel\\Mnemonics\\' . $mnemonic;
             $this->debugTraces['executed'][] = [$opcode, $mnemonic, $localStorage, $stacks, $pointer];
+            $this->debugTraces['mnemonic_indexes'][] = $pointer;
 
             /**
              * @var OperationInterface|Accumulator|ConstantPool $executor
