Tweak interpreter debug output to emit IPC as well

jruby · May 8, 2015 · 89c7044 · 89c7044
1 parent 690d554
commit 89c7044
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/ir/interpreter/BodyInterpreterEngine.java b/core/src/main/java/org/jruby/ir/interpreter/BodyInterpreterEngine.java
@@ -56,14 +56,14 @@ public IRubyObject interpret(ThreadContext context, IRubyObject self, Interprete
         while (ipc < n) {
             Instr instr = instrs[ipc];
 
-            ipc++;
-
             Operation operation = instr.getOperation();
             if (debug) {
-                Interpreter.LOG.info("I: {}", instr);
+                Interpreter.LOG.info("I: {" + ipc + "} ", instr);
                 Interpreter.interpInstrsCount++;
             }
 
+            ipc++;
+
             try {
                 switch (operation) {
                     case RETURN:

diff --git a/core/src/main/java/org/jruby/ir/interpreter/InterpreterEngine.java b/core/src/main/java/org/jruby/ir/interpreter/InterpreterEngine.java
@@ -129,16 +129,18 @@ public IRubyObject interpret(ThreadContext context, IRubyObject self,
         // Enter the looooop!
         while (ipc < n) {
             Instr instr = instrs[ipc];
-            ipc++;
+
             Operation operation = instr.getOperation();
             if (debug) {
-                Interpreter.LOG.info("I: {}", instr);
+                Interpreter.LOG.info("I: {" + ipc + "} ", instr);
                 Interpreter.interpInstrsCount++;
             } else if (profile) {
                 Profiler.instrTick(operation);
                 Interpreter.interpInstrsCount++;
             }
 
+            ipc++;
+
             try {
                 switch (operation.opClass) {
                     case INT_OP:

diff --git a/core/src/main/java/org/jruby/ir/interpreter/StartupInterpreterEngine.java b/core/src/main/java/org/jruby/ir/interpreter/StartupInterpreterEngine.java
@@ -56,16 +56,18 @@ public IRubyObject interpret(ThreadContext context, IRubyObject self,
         // Enter the looooop!
         while (ipc < n) {
             Instr instr = instrs[ipc];
-            ipc++;
+
             Operation operation = instr.getOperation();
             if (debug) {
-                Interpreter.LOG.info("I: {}", instr);
+                Interpreter.LOG.info("I: {" + ipc + "} ", instr);
                 Interpreter.interpInstrsCount++;
             } else if (profile) {
                 Profiler.instrTick(operation);
                 Interpreter.interpInstrsCount++;
             }
 
+            ipc++;
+
             try {
                 switch (operation.opClass) {
                     case ARG_OP: