[vmkit-commits] [vmkit] r85567 - /vmkit/trunk/lib/Mvm/Compiler/JIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Oct 29 20:58:57 2009
New Revision: 85567

URL: http://llvm.org/viewvc/llvm-project?rev=85567&view=rev
Log:
Add a note, assert, and fix isLive method to call.


Modified:
    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp

Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=85567&r1=85566&r2=85567&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Thu Oct 29 20:58:57 2009
@@ -206,6 +206,7 @@
     Boot(Plan);
     
     
+    //===-------------------- TODO: make those virtual. -------------------===//
     F = globalModule->getFunction("JnJVM_org_mmtk_plan_TraceLocal_reportDelayedRootEdge__Lorg_vmmagic_unboxed_Address_2");
     assert(F && "Could not find reportDelayedRootEdge from TraceLocal");
     gc::MMTkDelayedRoot = (gc::MMTkDelayedRootType)
@@ -220,14 +221,12 @@
     assert(F && "Could not find processEdge from TraceLocal");
     gc::MMTkProcessRootEdge = (gc::MMTkProcessRootEdgeType)
       (uintptr_t)executionEngine->getPointerToFunction(F);
-   
     
-    F = globalModule->getFunction("JnJVM_org_mmtk_plan_TraceLocal_isLive__Lorg_vmmagic_unboxed_ObjectReference_2");
+    F = globalModule->getFunction("JnJVM_org_mmtk_plan_marksweep_MSTraceLocal_isLive__Lorg_vmmagic_unboxed_ObjectReference_2");
     assert(F && "Could not find isLive from TraceLocal");
     gc::MMTkIsLive = (gc::MMTkIsLiveType)
       (uintptr_t)executionEngine->getPointerToFunction(F);
-  
-    
+   
     F = globalModule->getFunction("JnJVM_org_mmtk_plan_TraceLocal_retainForFinalize__Lorg_vmmagic_unboxed_ObjectReference_2");
     assert(F && "Could not find isLive from TraceLocal");
     gc::MMTkRetainForFinalize = (gc::MMTkRetainForFinalizeType)
@@ -506,6 +505,7 @@
 
   void** addr = mvm::Thread::get() == th ? 
     (void**)FRAME_PTR() : (void**)th->getLastSP();
+  assert(addr && "No address to start with");
   void** oldAddr = addr;
   DEBUG(fprintf(stderr, "%p trace %p\n", (void*)mvm::Thread::get(), (void*)th));
   DEBUG(th->printBacktraceAfterSignal());