[vmkit-commits] [vmkit] r91569 - in /vmkit/trunk/mmtk: mmtk-alloc/Selected.cpp mmtk-fake/Selected.cpp mmtk-j3/ActivePlan.cpp mmtk-j3/Assert.cpp mmtk-j3/Collection.cpp mmtk-j3/FinalizableProcessor.cpp mmtk-j3/Lock.cpp mmtk-j3/Memory.cpp mmtk-j3/ObjectModel.cpp mmtk-j3/ReferenceProcessor.cpp mmtk-j3/RuntimeHelpers.cpp mmtk-j3/Scanning.cpp mmtk-j3/Selected.cpp mmtk-j3/Statistics.cpp mmtk-j3/Strings.cpp mmtk-j3/SynchronizedCounter.cpp mmtk-j3/TraceInterface.cpp mmtk-j3/VM.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Wed Dec 16 13:42:06 PST 2009
Author: geoffray
Date: Wed Dec 16 15:42:06 2009
New Revision: 91569
URL: http://llvm.org/viewvc/llvm-project?rev=91569&view=rev
Log:
Forgot these changes from last commit.
Modified:
vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
vmkit/trunk/mmtk/mmtk-fake/Selected.cpp
vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp
vmkit/trunk/mmtk/mmtk-j3/Assert.cpp
vmkit/trunk/mmtk/mmtk-j3/Collection.cpp
vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp
vmkit/trunk/mmtk/mmtk-j3/Lock.cpp
vmkit/trunk/mmtk/mmtk-j3/Memory.cpp
vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp
vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp
vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
vmkit/trunk/mmtk/mmtk-j3/Selected.cpp
vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp
vmkit/trunk/mmtk/mmtk-j3/Strings.cpp
vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp
vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp
vmkit/trunk/mmtk/mmtk-j3/VM.cpp
Modified: vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp Wed Dec 16 15:42:06 2009
@@ -13,7 +13,7 @@
#include "JavaThread.h"
#include "MutatorThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" void* JnJVM_org_mmtk_plan_marksweep_MSMutator_alloc__IIIII(uintptr_t Mutator, int32_t sz, int32_t align, int32_t offset, int32_t allocator, int32_t site) __attribute__((always_inline));
extern "C" int32_t JnJVM_org_mmtk_plan_MutatorContext_checkAllocator__III(uintptr_t Mutator, int32_t bytes, int32_t align, int32_t allocator) __attribute__((always_inline));
Modified: vmkit/trunk/mmtk/mmtk-fake/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-fake/Selected.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-fake/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-fake/Selected.cpp Wed Dec 16 15:42:06 2009
@@ -15,7 +15,7 @@
#include <set>
-using namespace jnjvm;
+using namespace j3;
extern "C" gc* internalMalloc(uintptr_t Mutator, int32_t sz, int32_t align,
int32_t offset, int32_t allocator,
Modified: vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp Wed Dec 16 15:42:06 2009
@@ -11,7 +11,7 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
struct ActivePlan {
JavaObject obj;
Modified: vmkit/trunk/mmtk/mmtk-j3/Assert.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Assert.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Assert.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Assert.cpp Wed Dec 16 15:42:06 2009
@@ -10,6 +10,6 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" void Java_org_j3_mmtk_Assert_dumpStack__ () { JavaThread::get()->printBacktrace(); abort(); }
Modified: vmkit/trunk/mmtk/mmtk-j3/Collection.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Collection.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Collection.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Collection.cpp Wed Dec 16 15:42:06 2009
@@ -10,7 +10,7 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" void JnJVM_org_mmtk_plan_Plan_setCollectionTriggered__();
Modified: vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp Wed Dec 16 15:42:06 2009
@@ -11,7 +11,7 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" void Java_org_j3_mmtk_FinalizableProcessor_clear__ () {
JavaThread::get()->printBacktrace(); abort();
Modified: vmkit/trunk/mmtk/mmtk-j3/Lock.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Lock.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Lock.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Lock.cpp Wed Dec 16 15:42:06 2009
@@ -12,7 +12,7 @@
#include "JavaThread.h"
#include "mvm/Threads/Locks.h"
-using namespace jnjvm;
+using namespace j3;
struct Lock {
JavaObject base;
Modified: vmkit/trunk/mmtk/mmtk-j3/Memory.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Memory.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Memory.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Memory.cpp Wed Dec 16 15:42:06 2009
@@ -13,7 +13,7 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" uintptr_t Java_org_j3_mmtk_Memory_getHeapStartConstant__ () {
return (uintptr_t)0x30000000;
}
Modified: vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp Wed Dec 16 15:42:06 2009
@@ -10,7 +10,7 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" intptr_t Java_org_j3_mmtk_ObjectModel_getArrayBaseOffset__ () {
return sizeof(JavaObject) + sizeof(ssize_t);
Modified: vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp Wed Dec 16 15:42:06 2009
@@ -11,7 +11,7 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
struct ReferenceProcessor {
JavaObject obj;
Modified: vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp Wed Dec 16 15:42:06 2009
@@ -11,7 +11,7 @@
#include "JavaClass.h"
#include "JavaString.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" uint16_t MMTkCharAt(JavaString* str, uint32_t index) {
return str->value->elements[index];
Modified: vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp Wed Dec 16 15:42:06 2009
@@ -10,7 +10,7 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" void Java_org_j3_mmtk_Scanning_computeThreadRoots__Lorg_mmtk_plan_TraceLocal_2 (JavaObject* Scanning, JavaObject* TL) {
// When entering this function, all threads are waiting on the rendezvous to
Modified: vmkit/trunk/mmtk/mmtk-j3/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Selected.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Selected.cpp Wed Dec 16 15:42:06 2009
@@ -13,7 +13,7 @@
#include "JavaThread.h"
#include "MutatorThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" JavaObject* Java_org_j3_config_Selected_00024Mutator_get__() {
return (JavaObject*)mvm::MutatorThread::get()->MutatorContext;
Modified: vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp Wed Dec 16 15:42:06 2009
@@ -13,7 +13,7 @@
#include <sys/time.h>
#include <ctime>
-using namespace jnjvm;
+using namespace j3;
extern "C" void Java_org_j3_mmtk_Statistics_perfCtrInit__I (JavaObject* S) {
// Implement me
Modified: vmkit/trunk/mmtk/mmtk-j3/Strings.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Strings.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Strings.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Strings.cpp Wed Dec 16 15:42:06 2009
@@ -12,7 +12,7 @@
#include "JavaString.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" void Java_org_j3_mmtk_Strings_write___3CI(JavaObject* str,
ArrayUInt16* msg,
Modified: vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp Wed Dec 16 15:42:06 2009
@@ -11,7 +11,7 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" void Java_org_j3_mmtk_SynchronizedCounter_reset__ () { JavaThread::get()->printBacktrace(); abort(); }
extern "C" void Java_org_j3_mmtk_SynchronizedCounter_increment__ () { JavaThread::get()->printBacktrace(); abort(); }
Modified: vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp Wed Dec 16 15:42:06 2009
@@ -10,7 +10,7 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" void Java_org_j3_mmtk_TraceInterface_gcEnabled__ () { JavaThread::get()->printBacktrace(); abort(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_adjustSlotOffset__ZLorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2 () { JavaThread::get()->printBacktrace(); abort(); }
Modified: vmkit/trunk/mmtk/mmtk-j3/VM.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/VM.cpp?rev=91569&r1=91568&r2=91569&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/VM.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/VM.cpp Wed Dec 16 15:42:06 2009
@@ -10,7 +10,7 @@
#include "JavaObject.h"
#include "JavaThread.h"
-using namespace jnjvm;
+using namespace j3;
extern "C" void Java_org_j3_runtime_VM_sysWrite__Lorg_vmmagic_unboxed_Extent_2 () { JavaThread::get()->printBacktrace(); abort(); }
extern "C" void Java_org_j3_runtime_VM_sysWrite__Lorg_vmmagic_unboxed_Address_2 () { JavaThread::get()->printBacktrace(); abort(); }
More information about the vmkit-commits
mailing list