[llvm-commits] [vmkit] r51711 - in /vmkit/trunk/lib/JnJVM: Classpath/ClasspathVMStackWalker.cpp Classpath/ClasspathVMThrowable.cpp VMCore/JavaJIT.h

[Nicolas Geoffray]

Author: geoffray
Date: Thu May 29 17:35:19 2008
New Revision: 51711

URL: http://llvm.org/viewvc/llvm-project?rev=51711&view=rev
Log:
JavaJIT::getBacktrace has been replaced by mvm::jit::getBacktrace.


Modified:
    vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp
    vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.h

Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp?rev=51711&r1=51710&r2=51711&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp Thu May 29 17:35:19 2008
@@ -12,6 +12,8 @@
 
 #include "types.h"
 
+#include "mvm/JIT.h"
+
 #include "JavaArray.h"
 #include "JavaClass.h"
 #include "JavaJIT.h"
@@ -49,7 +51,7 @@
 #endif
 ) {
   int* ips[100];
-  int real_size = JavaJIT::getBacktrace((void**)(void*)ips, 100);
+  int real_size = mvm::jit::getBacktrace((void**)(void*)ips, 100);
   int i = 0;
   int first = 0;
   CommonClass* cl = Classpath::vmStackWalker; 

Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp?rev=51711&r1=51710&r2=51711&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp Thu May 29 17:35:19 2008
@@ -11,6 +11,8 @@
 
 #include "types.h"
 
+#include "mvm/JIT.h"
+
 #include "JavaAccess.h"
 #include "JavaArray.h"
 #include "JavaClass.h"
@@ -38,7 +40,7 @@
   //int** fp =  (int**)__builtin_frame_address(0);
   Jnjvm* vm = JavaThread::get()->isolate;
   int** stack = (int**)malloc(sizeof(int*) * 100);
-  int real_size = JavaJIT::getBacktrace((void**)stack, 100);
+  int real_size = mvm::jit::getBacktrace((void**)stack, 100);
   stack[real_size] = 0;
   JavaObject* vmThrowable = Classpath::newVMThrowable->doNew(vm);
   ((JavaObject**)((uint64)vmThrowable + Classpath::vmDataVMThrowable->ptrOffset))[0] = (JavaObject*)stack;

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.h?rev=51711&r1=51710&r2=51711&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.h Thu May 29 17:35:19 2008
@@ -269,7 +269,6 @@
   static Class* getCallingClassWalker();
   static JavaObject* getCallingClassLoader();
   static void printBacktrace();
-  static int getBacktrace(void** array, int size);
   static JavaMethod* IPToJavaMethod(void* ip);
 };