[vmkit-commits] [vmkit] r85220 - in /vmkit/trunk: include/mvm/VirtualMachine.h lib/JnJVM/Classpath/ClasspathReflect.h lib/JnJVM/Classpath/JavaUpcalls.cpp lib/JnJVM/VMCore/Jnjvm.h

[Nicolas Geoffray]

Author: geoffray
Date: Tue Oct 27 04:16:56 2009
New Revision: 85220

URL: http://llvm.org/viewvc/llvm-project?rev=85220&view=rev
Log:
Fix API to get a pointer to a referent.


Modified:
    vmkit/trunk/include/mvm/VirtualMachine.h
    vmkit/trunk/lib/JnJVM/Classpath/ClasspathReflect.h
    vmkit/trunk/lib/JnJVM/Classpath/JavaUpcalls.cpp
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h

Modified: vmkit/trunk/include/mvm/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/VirtualMachine.h?rev=85220&r1=85219&r2=85220&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/VirtualMachine.h (original)
+++ vmkit/trunk/include/mvm/VirtualMachine.h Tue Oct 27 04:16:56 2009
@@ -388,7 +388,7 @@
   /// getReferent - Get the referent of the reference. Should be overriden
   /// by the VM.
   //
-  virtual gc** getReferent(gc*) { return 0; }
+  virtual gc** getReferentPtr(gc*) { return 0; }
 
   /// enqueueReference - Calls the enqueue method. Should be overriden
   /// by the VM.

Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathReflect.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathReflect.h?rev=85220&r1=85219&r2=85220&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathReflect.h (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathReflect.h Tue Oct 27 04:16:56 2009
@@ -161,7 +161,7 @@
     queue = q;
   }
 
-  JavaObject** getReferent() { return &referent; }
+  JavaObject** getReferentPtr() { return &referent; }
   void setReferent(JavaObject* r) { referent = r; }
   
   static void staticTracer(JavaObjectReference* obj) {

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/JavaUpcalls.cpp Tue Oct 27 04:16:56 2009
@@ -1051,9 +1051,9 @@
 
 }
 
-gc** Jnjvm::getReferent(gc* _obj) {
+gc** Jnjvm::getReferentPtr(gc* _obj) {
   JavaObjectReference* obj = (JavaObjectReference*)_obj;
-  return (gc**)obj->getReferent();
+  return (gc**)obj->getReferentPtr();
  }
  
 void Jnjvm::clearReferent(gc* _obj) {

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h Tue Oct 27 04:16:56 2009
@@ -359,7 +359,7 @@
 #endif
 
   virtual void clearReferent(gc*);
-  virtual gc** getReferent(gc*);
+  virtual gc** getReferentPtr(gc*);
   virtual bool enqueueReference(gc*);
 
 protected: