[vmkit-commits] [vmkit] r61824 - in /vmkit/trunk/lib/JnJVM: LLVMRuntime/runtime-default.ll VMCore/JavaJITOpcodes.cpp VMCore/JavaRuntimeJIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jan  6 15:25:36 2009
New Revision: 61824

URL: http://llvm.org/viewvc/llvm-project?rev=61824&view=rev
Log:
Give the opcode instead of the opcode name when debugging.


Modified:
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp

Modified: vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll?rev=61824&r1=61823&r2=61824&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll Tue Jan  6 15:25:36 2009
@@ -207,6 +207,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Debugging methods ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-declare void @printExecution(i8*, i32, i8*)
+declare void @printExecution(i32, i32, i8*)
 declare void @printMethodStart(i8*)
 declare void @printMethodEnd(i8*)

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp?rev=61824&r1=61823&r2=61824&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp Tue Jan  6 15:25:36 2009
@@ -144,10 +144,7 @@
 #if JNJVM_EXECUTE > 1
     {
       Value* args[3] = {
-        ConstantExpr::getIntToPtr(
-            ConstantInt::get(Type::Int64Ty, (int64_t)OpcodeNames[bytecodes[i]]),
-            module->ptrType),
-
+        ConstantInt::get(Type::Int32Ty, (int64_t)bytecodes[i]),
         ConstantInt::get(Type::Int32Ty, (int64_t)i),
     
         ConstantExpr::getIntToPtr(

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp?rev=61824&r1=61823&r2=61824&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Tue Jan  6 15:25:36 2009
@@ -16,6 +16,7 @@
 #include "JavaCache.h"
 #include "JavaClass.h"
 #include "JavaConstantPool.h"
+#include "JavaJIT.h"
 #include "JavaString.h"
 #include "JavaThread.h"
 #include "JavaTypes.h"
@@ -503,9 +504,9 @@
   fflush(stdout);
 }
 
-extern "C" void printExecution(char* opcode, uint32 index, JavaMethod* meth) {
+extern "C" void printExecution(uint32 opcode, uint32 index, JavaMethod* meth) {
   printf("[%p] executing %s %s at %d\n", (void*)mvm::Thread::get(),
-         meth->printString(), opcode, index);
+         meth->printString(), JavaJIT::OpcodeNames[opcode], index);
   fflush(stdout);
 }