[vmkit-commits] [vmkit] r120220 - in /vmkit/trunk/mmtk/mmtk-j3: ActivePlan.cpp Assert.cpp Collection.cpp FinalizableProcessor.cpp Lock.cpp MMTkObject.h MMTk_Events.cpp Memory.cpp ObjectModel.cpp ReferenceProcessor.cpp RuntimeHelpers.cpp Scanning.cpp Selected.cpp Statistics.cpp Strings.cpp SynchronizedCounter.cpp TraceInterface.cpp VM.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Sat Nov 27 06:01:20 PST 2010
Author: geoffray
Date: Sat Nov 27 08:01:20 2010
New Revision: 120220
URL: http://llvm.org/viewvc/llvm-project?rev=120220&view=rev
Log:
Remove dependencies on Java header files in MMTk.
Added:
vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h
Modified:
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/MMTk_Events.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-j3/ActivePlan.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp Sat Nov 27 08:01:20 2010
@@ -7,27 +7,19 @@
//
//===----------------------------------------------------------------------===//
-#include "mvm/VirtualMachine.h"
-
-#include "JavaClass.h"
-#include "JavaObject.h"
-#include "JavaThread.h"
-
#include "debug.h"
+#include "mvm/VirtualMachine.h"
+#include "MMTkObject.h"
+#include "MutatorThread.h"
-using namespace j3;
-
-struct ActivePlan {
- JavaObject obj;
- mvm::MutatorThread* current;
-};
+namespace mmtk {
-extern "C" JavaObject* Java_org_j3_mmtk_ActivePlan_getNextMutator__ (ActivePlan* A) {
+extern "C" MMTkObject* Java_org_j3_mmtk_ActivePlan_getNextMutator__(MMTkActivePlan* A) {
assert(A && "No active plan");
if (A->current == NULL) {
- A->current = (mvm::MutatorThread*)JavaThread::get()->MyVM->mainThread;
- } else if (A->current->next() == JavaThread::get()->MyVM->mainThread) {
+ A->current = (mvm::MutatorThread*)mvm::Thread::get()->MyVM->mainThread;
+ } else if (A->current->next() == mvm::Thread::get()->MyVM->mainThread) {
A->current = NULL;
return NULL;
} else {
@@ -37,11 +29,15 @@
if (A->current->MutatorContext == 0) {
return Java_org_j3_mmtk_ActivePlan_getNextMutator__(A);
}
- return (JavaObject*)A->current->MutatorContext;
+ return (MMTkObject*)A->current->MutatorContext;
}
-extern "C" void Java_org_j3_mmtk_ActivePlan_resetMutatorIterator__ (ActivePlan* A) {
+extern "C" void Java_org_j3_mmtk_ActivePlan_resetMutatorIterator__(MMTkActivePlan* A) {
A->current = NULL;
}
-extern "C" void Java_org_j3_mmtk_ActivePlan_collectorCount__ (ActivePlan* A) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_ActivePlan_collectorCount__ (MMTkActivePlan* A) {
+ UNIMPLEMENTED();
+}
+
+}
Modified: vmkit/trunk/mmtk/mmtk-j3/Assert.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Assert.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Assert.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Assert.cpp Sat Nov 27 08:01:20 2010
@@ -7,12 +7,11 @@
//
//===----------------------------------------------------------------------===//
-#include "mvm/VirtualMachine.h"
-#include "JavaObject.h"
-#include "JavaThread.h"
-
#include "debug.h"
+#include "MMTkObject.h"
+
+namespace mmtk {
-using namespace j3;
+extern "C" void Java_org_j3_mmtk_Assert_dumpStack__ (MMTkObject* self) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_mmtk_Assert_dumpStack__ (JavaObject* self) { UNIMPLEMENTED(); }
+}
Modified: vmkit/trunk/mmtk/mmtk-j3/Collection.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Collection.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Collection.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Collection.cpp Sat Nov 27 08:01:20 2010
@@ -7,39 +7,31 @@
//
//===----------------------------------------------------------------------===//
-#include "mvm/VirtualMachine.h"
-
-#include "JavaObject.h"
-#include "JavaThread.h"
-
#include "debug.h"
+#include "mvm/VirtualMachine.h"
+#include "MMTkObject.h"
+#include "MvmGC.h"
-using namespace j3;
+namespace mmtk {
extern "C" void JnJVM_org_mmtk_plan_Plan_setCollectionTriggered__();
-
extern "C" void JnJVM_org_j3_config_Selected_00024Collector_staticCollect__();
-
extern "C" void JnJVM_org_mmtk_plan_Plan_collectionComplete__();
-
extern "C" uint8_t JnJVM_org_mmtk_utility_heap_HeapGrowthManager_considerHeapSize__();
-
extern "C" void JnJVM_org_mmtk_utility_heap_HeapGrowthManager_reset__();
-
extern "C" int64_t Java_org_j3_mmtk_Statistics_nanoTime__ ();
-
extern "C" void JnJVM_org_mmtk_utility_heap_HeapGrowthManager_recordGCTime__D(double);
-extern "C" bool Java_org_j3_mmtk_Collection_isEmergencyAllocation__ (JavaObject* C) {
+extern "C" bool Java_org_j3_mmtk_Collection_isEmergencyAllocation__ (MMTkObject* C) {
// TODO: emergency when OOM.
return false;
}
-extern "C" void Java_org_j3_mmtk_Collection_reportAllocationSuccess__ (JavaObject* C) {
+extern "C" void Java_org_j3_mmtk_Collection_reportAllocationSuccess__ (MMTkObject* C) {
// TODO: clear internal data.
}
-extern "C" void Java_org_j3_mmtk_Collection_triggerCollection__I (JavaObject* C, int why) {
+extern "C" void Java_org_j3_mmtk_Collection_triggerCollection__I (MMTkObject* C, int why) {
mvm::Thread* th = mvm::Thread::get();
// Verify that another collection is not happening.
@@ -86,31 +78,33 @@
}
-extern "C" void Java_org_j3_mmtk_Collection_joinCollection__ (JavaObject* C) {
+extern "C" void Java_org_j3_mmtk_Collection_joinCollection__ (MMTkObject* C) {
mvm::Thread* th = mvm::Thread::get();
assert(th->inRV && "Joining collection without a rendezvous");
th->MyVM->rendezvous.join();
}
-extern "C" int Java_org_j3_mmtk_Collection_rendezvous__I (JavaObject* C, int where) {
+extern "C" int Java_org_j3_mmtk_Collection_rendezvous__I (MMTkObject* C, int where) {
return 1;
}
-extern "C" int Java_org_j3_mmtk_Collection_maximumCollectionAttempt__ (JavaObject* C) {
+extern "C" int Java_org_j3_mmtk_Collection_maximumCollectionAttempt__ (MMTkObject* C) {
return 0;
}
-extern "C" void Java_org_j3_mmtk_Collection_prepareCollector__Lorg_mmtk_plan_CollectorContext_2 (JavaObject* C, JavaObject* CC) {
+extern "C" void Java_org_j3_mmtk_Collection_prepareCollector__Lorg_mmtk_plan_CollectorContext_2 (MMTkObject* C, MMTkObject* CC) {
// Nothing to do.
}
-extern "C" void Java_org_j3_mmtk_Collection_prepareMutator__Lorg_mmtk_plan_MutatorContext_2 (JavaObject* C, JavaObject* MC) {
+extern "C" void Java_org_j3_mmtk_Collection_prepareMutator__Lorg_mmtk_plan_MutatorContext_2 (MMTkObject* C, MMTkObject* MC) {
}
-extern "C" void Java_org_j3_mmtk_Collection_reportPhysicalAllocationFailed__ (JavaObject* C) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_mmtk_Collection_triggerAsyncCollection__I (JavaObject* C, sint32 val) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_mmtk_Collection_noThreadsInGC__ (JavaObject* C) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_mmtk_Collection_activeGCThreads__ (JavaObject* C) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_mmtk_Collection_activeGCThreadOrdinal__ (JavaObject* C) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_mmtk_Collection_requestMutatorFlush__ (JavaObject* C) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_Collection_reportPhysicalAllocationFailed__ (MMTkObject* C) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_Collection_triggerAsyncCollection__I (MMTkObject* C, sint32 val) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_Collection_noThreadsInGC__ (MMTkObject* C) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_Collection_activeGCThreads__ (MMTkObject* C) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_Collection_activeGCThreadOrdinal__ (MMTkObject* C) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_Collection_requestMutatorFlush__ (MMTkObject* C) { UNIMPLEMENTED(); }
+
+} // namespace mmtk
Modified: vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp Sat Nov 27 08:01:20 2010
@@ -8,26 +8,25 @@
//
//===----------------------------------------------------------------------===//
-#include "mvm/VirtualMachine.h"
-
-#include "JavaObject.h"
-#include "JavaThread.h"
-
#include "debug.h"
+#include "mvm/VirtualMachine.h"
+#include "MMTkObject.h"
-using namespace j3;
+namespace mmtk {
-extern "C" void Java_org_j3_mmtk_FinalizableProcessor_clear__ (JavaObject* P) {
+extern "C" void Java_org_j3_mmtk_FinalizableProcessor_clear__ (MMTkObject* P) {
UNIMPLEMENTED();
}
extern "C" void
-Java_org_j3_mmtk_FinalizableProcessor_forward__Lorg_mmtk_plan_TraceLocal_2Z (JavaObject* P, uintptr_t TL, uint8_t nursery) {
+Java_org_j3_mmtk_FinalizableProcessor_forward__Lorg_mmtk_plan_TraceLocal_2Z (MMTkObject* P, uintptr_t TL, uint8_t nursery) {
UNIMPLEMENTED();
}
extern "C" void
-Java_org_j3_mmtk_FinalizableProcessor_scan__Lorg_mmtk_plan_TraceLocal_2Z (JavaObject* FP, JavaObject* TL, uint8_t nursery) {
+Java_org_j3_mmtk_FinalizableProcessor_scan__Lorg_mmtk_plan_TraceLocal_2Z (MMTkObject* FP, MMTkObject* TL, uint8_t nursery) {
mvm::Thread* th = mvm::Thread::get();
th->MyVM->scanFinalizationQueue(reinterpret_cast<uintptr_t>(TL));
}
+
+}
Modified: vmkit/trunk/mmtk/mmtk-j3/Lock.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Lock.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Lock.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Lock.cpp Sat Nov 27 08:01:20 2010
@@ -7,34 +7,30 @@
//
//===----------------------------------------------------------------------===//
-#include "JavaObject.h"
-#include "JavaString.h"
-#include "JavaThread.h"
-#include "mvm/Threads/Locks.h"
-#include "mvm/VirtualMachine.h"
-
#include "debug.h"
-using namespace j3;
+#include "MMTkObject.h"
+
+namespace mmtk {
-struct Lock {
- JavaObject base;
- mvm::SpinLock spin;
- JavaString* name;
-};
+extern "C" void Java_org_j3_mmtk_Lock_acquire__(MMTkLock* l) {
+ for (uint32 count = 0; count < 1000; ++count) {
+ uint32 res = __sync_val_compare_and_swap(&(l->state), 0, 1);
+ if (!res) return;
+ }
+
+ while (__sync_val_compare_and_swap(&(l->state), 0, 1)) {
+ sched_yield();
+ }
+}
+
+extern "C" void Java_org_j3_mmtk_Lock_release__(MMTkLock* l) {
+ l->state = 0;
+}
-extern "C" void Java_org_j3_mmtk_Lock_acquire__(Lock* l) {
- bool saved = mvm::Thread::get()->inRV;
- mvm::Thread::get()->inRV = true;
- l->spin.acquire();
- mvm::Thread::get()->inRV = saved;
+extern "C" void Java_org_j3_mmtk_Lock_check__I (MMTkLock* l, int i) {
+ UNIMPLEMENTED();
}
-extern "C" void Java_org_j3_mmtk_Lock_check__I (Lock* l, int i) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_mmtk_Lock_release__(Lock* l) {
- bool saved = mvm::Thread::get()->inRV;
- mvm::Thread::get()->inRV = true;
- l->spin.release();
- mvm::Thread::get()->inRV = saved;
}
Added: vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h?rev=120220&view=auto
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h (added)
+++ vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h Sat Nov 27 08:01:20 2010
@@ -0,0 +1,51 @@
+//===----------- MMTkObject.h - Internal object type for MMTk ------------===//
+//
+// The VMKit project
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef MMTK_OBJECT_H
+#define MMTK_OBJECT_H
+
+#include <stdint.h>
+#include "MutatorThread.h"
+
+namespace mmtk {
+
+struct MMTkObject {
+ uintptr_t virtual_table;
+ uintptr_t header;
+};
+
+struct MMTkArray : public MMTkObject {
+ uintptr_t size;
+ uint16_t elements[1];
+};
+
+struct MMTkString : public MMTkObject {
+ MMTkArray* value;
+ int32_t count;
+ int32_t cachedHashCode;
+ int32_t offset;
+};
+
+struct MMTkLock : public MMTkObject {
+ uint32_t state;
+ MMTkString* name;
+};
+
+struct MMTkActivePlan : public MMTkObject {
+ mvm::MutatorThread* current;
+};
+
+struct MMTkReferenceProcessor : public MMTkObject {
+ MMTkObject* semantics;
+ int32_t ordinal;
+};
+
+} // namespace mmtk
+
+#endif // MMTK_OBJECT_H
Modified: vmkit/trunk/mmtk/mmtk-j3/MMTk_Events.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/MMTk_Events.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/MMTk_Events.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/MMTk_Events.cpp Sat Nov 27 08:01:20 2010
@@ -7,31 +7,29 @@
//
//===----------------------------------------------------------------------===//
-#include "JavaArray.h"
-#include "JavaClass.h"
-#include "JavaObject.h"
-#include "JavaThread.h"
-#include "MutatorThread.h"
+#include "MMTkObject.h"
-using namespace j3;
+namespace mmtk {
extern "C" void Java_org_j3_mmtk_MMTk_1Events_tracePageAcquired__Lorg_mmtk_policy_Space_2Lorg_vmmagic_unboxed_Address_2I(
- JavaObject* event, JavaObject* space, uintptr_t address, int numPages) {
+ MMTkObject* event, MMTkObject* space, uintptr_t address, int numPages) {
#if 0
fprintf(stderr, "Pages acquired by thread %p from space %p at %x (%d)\n", (void*)mvm::Thread::get(), (void*)space, address, numPages);
#endif
}
extern "C" void Java_org_j3_mmtk_MMTk_1Events_tracePageReleased__Lorg_mmtk_policy_Space_2Lorg_vmmagic_unboxed_Address_2I(
- JavaObject* event, JavaObject* space, uintptr_t address, int numPages) {
+ MMTkObject* event, MMTkObject* space, uintptr_t address, int numPages) {
#if 0
fprintf(stderr, "Pages released by thread %p from space %p at %x (%d)\n", (void*)mvm::Thread::get(), (void*)space, address, numPages);
#endif
}
extern "C" void Java_org_j3_mmtk_MMTk_1Events_heapSizeChanged__Lorg_vmmagic_unboxed_Extent_2(
- JavaObject* event, uintptr_t heapSize) {
+ MMTkObject* event, uintptr_t heapSize) {
#if 0
fprintf(stderr, "New heap size : %d\n", (int)heapSize);
#endif
}
+
+}
Modified: vmkit/trunk/mmtk/mmtk-j3/Memory.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Memory.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Memory.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Memory.cpp Sat Nov 27 08:01:20 2010
@@ -7,34 +7,32 @@
//
//===----------------------------------------------------------------------===//
-#include <sys/mman.h>
-
+#include "debug.h"
#include "mvm/VirtualMachine.h"
-#include "JavaObject.h"
-#include "JavaThread.h"
+#include "MMTkObject.h"
-#include "debug.h"
+#include <sys/mman.h>
-using namespace j3;
+namespace mmtk {
-extern "C" uintptr_t Java_org_j3_mmtk_Memory_getHeapStartConstant__ (JavaObject* M) {
+extern "C" uintptr_t Java_org_j3_mmtk_Memory_getHeapStartConstant__ (MMTkObject* M) {
return (uintptr_t)0x30000000;
}
-extern "C" uintptr_t Java_org_j3_mmtk_Memory_getHeapEndConstant__ (JavaObject* M) {
+extern "C" uintptr_t Java_org_j3_mmtk_Memory_getHeapEndConstant__ (MMTkObject* M) {
return (uintptr_t)0x60000000;
}
-extern "C" uintptr_t Java_org_j3_mmtk_Memory_getAvailableStartConstant__ (JavaObject* M) {
+extern "C" uintptr_t Java_org_j3_mmtk_Memory_getAvailableStartConstant__ (MMTkObject* M) {
return (uintptr_t)0x30000000;
}
-extern "C" uintptr_t Java_org_j3_mmtk_Memory_getAvailableEndConstant__ (JavaObject* M) {
+extern "C" uintptr_t Java_org_j3_mmtk_Memory_getAvailableEndConstant__ (MMTkObject* M) {
return (uintptr_t)0x60000000;
}
extern "C" sint32
-Java_org_j3_mmtk_Memory_dzmmap__Lorg_vmmagic_unboxed_Address_2I(JavaObject* M,
+Java_org_j3_mmtk_Memory_dzmmap__Lorg_vmmagic_unboxed_Address_2I(MMTkObject* M,
void* start,
sint32 size) {
// Already mmapped during initialization.
@@ -42,30 +40,32 @@
}
extern "C" uint8_t
-Java_org_j3_mmtk_Memory_mprotect__Lorg_vmmagic_unboxed_Address_2I (JavaObject* M, uintptr_t address, sint32 size) {
+Java_org_j3_mmtk_Memory_mprotect__Lorg_vmmagic_unboxed_Address_2I (MMTkObject* M, uintptr_t address, sint32 size) {
int val = mprotect((void*)address, size, PROT_NONE);
return (val == 0);
}
extern "C" uint8_t
-Java_org_j3_mmtk_Memory_munprotect__Lorg_vmmagic_unboxed_Address_2I (JavaObject* M, uintptr_t address, sint32 size) {
+Java_org_j3_mmtk_Memory_munprotect__Lorg_vmmagic_unboxed_Address_2I (MMTkObject* M, uintptr_t address, sint32 size) {
int val = mprotect((void*)address, size, PROT_READ | PROT_WRITE);
return (val == 0);
}
extern "C" void
-Java_org_j3_mmtk_Memory_zero__Lorg_vmmagic_unboxed_Address_2Lorg_vmmagic_unboxed_Extent_2(JavaObject* M,
+Java_org_j3_mmtk_Memory_zero__Lorg_vmmagic_unboxed_Address_2Lorg_vmmagic_unboxed_Extent_2(MMTkObject* M,
void* addr,
uintptr_t len) {
memset(addr, 0, len);
}
extern "C" void
-Java_org_j3_mmtk_Memory_zeroPages__Lorg_vmmagic_unboxed_Address_2I (JavaObject* M, uintptr_t address, sint32 size) {
+Java_org_j3_mmtk_Memory_zeroPages__Lorg_vmmagic_unboxed_Address_2I (MMTkObject* M, uintptr_t address, sint32 size) {
UNIMPLEMENTED();
}
extern "C" void
-Java_org_j3_mmtk_Memory_dumpMemory__Lorg_vmmagic_unboxed_Address_2II (JavaObject* M, uintptr_t address, sint32 before, sint32 after) {
+Java_org_j3_mmtk_Memory_dumpMemory__Lorg_vmmagic_unboxed_Address_2II (MMTkObject* M, uintptr_t address, sint32 before, sint32 after) {
UNIMPLEMENTED();
}
+
+}
Modified: vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp Sat Nov 27 08:01:20 2010
@@ -10,39 +10,39 @@
#include "JavaArray.h"
#include "JavaClass.h"
#include "JavaObject.h"
-#include "JavaString.h"
-#include "JavaThread.h"
+
+#include "MMTkObject.h"
#include "debug.h"
-using namespace j3;
+namespace mmtk {
-extern "C" intptr_t Java_org_j3_mmtk_ObjectModel_getArrayBaseOffset__ (JavaObject* OM) {
- return sizeof(JavaObject) + sizeof(ssize_t);
+extern "C" intptr_t Java_org_j3_mmtk_ObjectModel_getArrayBaseOffset__ (MMTkObject* OM) {
+ return sizeof(j3::JavaObject) + sizeof(ssize_t);
}
-extern "C" intptr_t Java_org_j3_mmtk_ObjectModel_GC_1HEADER_1OFFSET__ (JavaObject* OM) {
+extern "C" intptr_t Java_org_j3_mmtk_ObjectModel_GC_1HEADER_1OFFSET__ (MMTkObject* OM) {
return sizeof(void*);
}
-extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_readAvailableBitsWord__Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* OM, JavaObject* obj) {
+extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_readAvailableBitsWord__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
return obj->header;
}
extern "C" void Java_org_j3_mmtk_ObjectModel_writeAvailableBitsWord__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Word_2 (
- JavaObject* OM, JavaObject* obj, uintptr_t val) {
+ MMTkObject* OM, gc* obj, uintptr_t val) {
obj->header = val;
}
-extern "C" JavaObject* Java_org_j3_mmtk_ObjectModel_objectStartRef__Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* OM, JavaObject* obj) {
+extern "C" gc* Java_org_j3_mmtk_ObjectModel_objectStartRef__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
return obj;
}
-extern "C" JavaObject* Java_org_j3_mmtk_ObjectModel_refToAddress__Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* OM, JavaObject* obj) {
+extern "C" gc* Java_org_j3_mmtk_ObjectModel_refToAddress__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
return obj;
}
-extern "C" uint8_t Java_org_j3_mmtk_ObjectModel_readAvailableByte__Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* OM, JavaObject* obj) {
+extern "C" uint8_t Java_org_j3_mmtk_ObjectModel_readAvailableByte__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
#if defined(__PPC__)
return ((uint8_t*)obj)[7];
#else
@@ -50,7 +50,7 @@
#endif
}
-extern "C" void Java_org_j3_mmtk_ObjectModel_writeAvailableByte__Lorg_vmmagic_unboxed_ObjectReference_2B (JavaObject* OM, JavaObject* obj, uint8_t val) {
+extern "C" void Java_org_j3_mmtk_ObjectModel_writeAvailableByte__Lorg_vmmagic_unboxed_ObjectReference_2B (MMTkObject* OM, gc* obj, uint8_t val) {
#if defined(__PPC__)
((uint8_t*)obj)[7] = val;
#else
@@ -58,17 +58,17 @@
#endif
}
-extern "C" JavaObject* Java_org_j3_mmtk_ObjectModel_getObjectFromStartAddress__Lorg_vmmagic_unboxed_Address_2 (JavaObject* OM, JavaObject* obj) {
+extern "C" gc* Java_org_j3_mmtk_ObjectModel_getObjectFromStartAddress__Lorg_vmmagic_unboxed_Address_2 (MMTkObject* OM, gc* obj) {
return obj;
}
-extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_prepareAvailableBits__Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* OM, JavaObject* obj) {
+extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_prepareAvailableBits__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
return obj->header;
}
extern "C" uint8_t
Java_org_j3_mmtk_ObjectModel_attemptAvailableBits__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Word_2Lorg_vmmagic_unboxed_Word_2(
- JavaObject* OM, JavaObject* obj, intptr_t oldValue, intptr_t newValue) {
+ MMTkObject* OM, gc* obj, intptr_t oldValue, intptr_t newValue) {
intptr_t val = __sync_val_compare_and_swap(&(obj->header), oldValue, newValue);
return (val == oldValue);
}
@@ -82,27 +82,27 @@
}
extern "C" uintptr_t JnJVM_org_j3_bindings_Bindings_copy__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2II(
- JavaObject* obj, VirtualTable* VT, int size, int allocator) ALWAYS_INLINE;
+ gc* obj, VirtualTable* VT, int size, int allocator) ALWAYS_INLINE;
extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_copy__Lorg_vmmagic_unboxed_ObjectReference_2I (
- JavaObject* OM, JavaObject* src, int allocator) ALWAYS_INLINE;
+ MMTkObject* OM, gc* src, int allocator) ALWAYS_INLINE;
extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_copy__Lorg_vmmagic_unboxed_ObjectReference_2I (
- JavaObject* OM, JavaObject* src, int allocator) {
+ MMTkObject* OM, gc* src, int allocator) {
size_t size = 0;
VirtualTable* VT = src->getVirtualTable();
- if (VMClassLoader::isVMClassLoader(src)) {
- size = sizeof(VMClassLoader);
+ if (j3::VMClassLoader::isVMClassLoader((j3::JavaObject*)src)) {
+ size = sizeof(j3::VMClassLoader);
} else {
- CommonClass* cl = JavaObject::getClass(src);
+ j3::CommonClass* cl = j3::JavaObject::getClass((j3::JavaObject*)src);
if (cl->isArray()) {
- UserClassArray* array = cl->asArrayClass();
- UserCommonClass* base = array->baseClass();
+ j3::UserClassArray* array = cl->asArrayClass();
+ j3::UserCommonClass* base = array->baseClass();
uint32 logSize = base->isPrimitive() ?
- base->asPrimitiveClass()->logSize : (sizeof(JavaObject*) == 8 ? 3 : 2);
+ base->asPrimitiveClass()->logSize : (sizeof(j3::JavaObject*) == 8 ? 3 : 2);
- size = sizeof(JavaObject) + sizeof(ssize_t) +
- (JavaArray::getSize(src) << logSize);
+ size = sizeof(j3::JavaObject) + sizeof(ssize_t) +
+ (j3::JavaArray::getSize((j3::JavaObject*)src) << logSize);
} else {
assert(cl->isClass() && "Not a class!");
size = cl->asClass()->getVirtualSize();
@@ -115,31 +115,31 @@
}
extern "C" void Java_org_j3_mmtk_ObjectModel_copyTo__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2 (
- JavaObject* OM, uintptr_t from, uintptr_t to, uintptr_t region) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t from, uintptr_t to, uintptr_t region) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getReferenceWhenCopiedTo__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2 (
- JavaObject* OM, uintptr_t from, uintptr_t to) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t from, uintptr_t to) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getObjectEndAddress__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getSizeWhenCopied__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getAlignWhenCopied__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getAlignOffsetWhenCopied__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getCurrentSize__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getNextObject__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
-class FakeByteArray {
+class FakeByteArray : public MMTkObject {
public:
void* operator new(size_t size, int length) {
return new char[size + length];
@@ -152,40 +152,41 @@
}
}
- FakeByteArray(const UTF8* name) {
+ FakeByteArray(const j3::UTF8* name) {
length = name->size;
for (uint32 i = 0; i < length; i++) {
elements[i] = name->elements[i];
}
}
private:
- JavaObject header;
size_t length;
uint8_t elements[1];
};
extern "C" FakeByteArray* Java_org_j3_mmtk_ObjectModel_getTypeDescriptor__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, JavaObject* src) {
- if (VMClassLoader::isVMClassLoader(src)) {
+ MMTkObject* OM, gc* src) {
+ if (j3::VMClassLoader::isVMClassLoader((j3::JavaObject*)src)) {
return new (14) FakeByteArray("VMClassLoader");
} else {
- CommonClass* cl = JavaObject::getClass(src);
+ j3::CommonClass* cl = j3::JavaObject::getClass((j3::JavaObject*)src);
return new (cl->name->size) FakeByteArray(cl->name);
}
}
extern "C" void Java_org_j3_mmtk_ObjectModel_getArrayLength__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_isArray__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_isPrimitiveArray__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_isAcyclic__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_dumpObject__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+
+}
Modified: vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp Sat Nov 27 08:01:20 2010
@@ -8,22 +8,13 @@
//
//===----------------------------------------------------------------------===//
-#include "mvm/VirtualMachine.h"
-
-#include "JavaObject.h"
-#include "JavaThread.h"
-
#include "debug.h"
+#include "mvm/VirtualMachine.h"
+#include "MMTkObject.h"
-using namespace j3;
-
-struct ReferenceProcessor {
- JavaObject obj;
- JavaObject* semantics;
- uint32_t ordinal;
-};
+namespace mmtk {
-extern "C" void Java_org_j3_mmtk_ReferenceProcessor_scan__Lorg_mmtk_plan_TraceLocal_2Z (ReferenceProcessor* RP, uintptr_t TL, uint8_t nursery) {
+extern "C" void Java_org_j3_mmtk_ReferenceProcessor_scan__Lorg_mmtk_plan_TraceLocal_2Z (MMTkReferenceProcessor* RP, uintptr_t TL, uint8_t nursery) {
mvm::Thread* th = mvm::Thread::get();
uint32_t val = RP->ordinal;
@@ -35,9 +26,10 @@
assert(val == 2);
th->MyVM->scanPhantomReferencesQueue(TL);
}
-
}
-extern "C" void Java_org_j3_mmtk_ReferenceProcessor_forward__Lorg_mmtk_plan_TraceLocal_2Z (ReferenceProcessor* RP, uintptr_t TL, uint8_t nursery) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_mmtk_ReferenceProcessor_clear__ (ReferenceProcessor* RP) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_mmtk_ReferenceProcessor_countWaitingReferences__ (ReferenceProcessor* RP) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_ReferenceProcessor_forward__Lorg_mmtk_plan_TraceLocal_2Z (MMTkReferenceProcessor* RP, uintptr_t TL, uint8_t nursery) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_ReferenceProcessor_clear__ (MMTkReferenceProcessor* RP) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_ReferenceProcessor_countWaitingReferences__ (MMTkReferenceProcessor* RP) { UNIMPLEMENTED(); }
+
+}
Modified: vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/RuntimeHelpers.cpp Sat Nov 27 08:01:20 2010
@@ -7,16 +7,18 @@
//
//===----------------------------------------------------------------------===//
-#include "JavaArray.h"
+#include "MMTkObject.h"
+#include "JavaObject.h"
#include "JavaClass.h"
-#include "JavaString.h"
-using namespace j3;
+namespace mmtk {
-extern "C" uint16_t MMTkCharAt(JavaString* str, uint32_t index) {
+extern "C" uint16_t MMTkCharAt(MMTkString* str, uint32_t index) {
return str->value->elements[index];
}
-extern "C" JavaObject* MMTkGetClass(JavaObject* obj) {
- return ((JavaVirtualTable*)obj->getVirtualTable())->cl->delegatee[0];
+extern "C" j3::JavaObject* MMTkGetClass(j3::JavaObject* obj) {
+ return ((j3::JavaVirtualTable*)obj->getVirtualTable())->cl->delegatee[0];
+}
+
}
Modified: vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp Sat Nov 27 08:01:20 2010
@@ -7,16 +7,14 @@
//
//===----------------------------------------------------------------------===//
-#include "mvm/VirtualMachine.h"
-
-#include "JavaObject.h"
-#include "JavaThread.h"
-
#include "debug.h"
+#include "mvm/VirtualMachine.h"
+#include "MMTkObject.h"
+#include "MvmGC.h"
-using namespace j3;
+namespace mmtk {
-extern "C" void Java_org_j3_mmtk_Scanning_computeThreadRoots__Lorg_mmtk_plan_TraceLocal_2 (JavaObject* Scanning, JavaObject* TL) {
+extern "C" void Java_org_j3_mmtk_Scanning_computeThreadRoots__Lorg_mmtk_plan_TraceLocal_2 (MMTkObject* Scanning, MMTkObject* TL) {
// When entering this function, all threads are waiting on the rendezvous to
// finish.
mvm::Thread* th = mvm::Thread::get();
@@ -28,7 +26,7 @@
} while (tcur != th);
}
-extern "C" void Java_org_j3_mmtk_Scanning_computeGlobalRoots__Lorg_mmtk_plan_TraceLocal_2 (JavaObject* Scanning, JavaObject* TL) {
+extern "C" void Java_org_j3_mmtk_Scanning_computeGlobalRoots__Lorg_mmtk_plan_TraceLocal_2 (MMTkObject* Scanning, MMTkObject* TL) {
mvm::Thread::get()->MyVM->tracer(reinterpret_cast<uintptr_t>(TL));
mvm::Thread* th = mvm::Thread::get();
@@ -40,29 +38,29 @@
} while (tcur != th);
}
-extern "C" void Java_org_j3_mmtk_Scanning_computeStaticRoots__Lorg_mmtk_plan_TraceLocal_2 (JavaObject* Scanning, JavaObject* TL) {
+extern "C" void Java_org_j3_mmtk_Scanning_computeStaticRoots__Lorg_mmtk_plan_TraceLocal_2 (MMTkObject* Scanning, MMTkObject* TL) {
// Nothing to do.
}
-extern "C" void Java_org_j3_mmtk_Scanning_resetThreadCounter__ (JavaObject* Scanning) {
+extern "C" void Java_org_j3_mmtk_Scanning_resetThreadCounter__ (MMTkObject* Scanning) {
// Nothing to do.
}
-extern "C" void Java_org_j3_mmtk_Scanning_specializedScanObject__ILorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* Scanning, uint32_t id, JavaObject* TC, JavaObject* obj) ALWAYS_INLINE;
+extern "C" void Java_org_j3_mmtk_Scanning_specializedScanObject__ILorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* Scanning, uint32_t id, MMTkObject* TC, gc* obj) ALWAYS_INLINE;
-extern "C" void Java_org_j3_mmtk_Scanning_specializedScanObject__ILorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* Scanning, uint32_t id, JavaObject* TC, JavaObject* obj) {
+extern "C" void Java_org_j3_mmtk_Scanning_specializedScanObject__ILorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* Scanning, uint32_t id, MMTkObject* TC, gc* obj) {
assert(obj && "No object to trace");
assert(obj->getVirtualTable() && "No virtual table");
assert(obj->getVirtualTable()->tracer && "No tracer in VT");
obj->tracer(reinterpret_cast<uintptr_t>(TC));
}
-extern "C" void Java_org_j3_mmtk_Scanning_preCopyGCInstances__Lorg_mmtk_plan_TraceLocal_2 (JavaObject* Scanning, JavaObject* TL) {
+extern "C" void Java_org_j3_mmtk_Scanning_preCopyGCInstances__Lorg_mmtk_plan_TraceLocal_2 (MMTkObject* Scanning, MMTkObject* TL) {
// Nothing to do, there are no GC objects on which the GC depends.
}
extern "C" void Java_org_j3_mmtk_Scanning_scanObject__Lorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* Scanning, uintptr_t TC, JavaObject* obj) {
+ MMTkObject* Scanning, uintptr_t TC, gc* obj) {
assert(obj && "No object to trace");
assert(obj->getVirtualTable() && "No virtual table");
assert(obj->getVirtualTable()->tracer && "No tracer in VT");
@@ -70,4 +68,6 @@
}
extern "C" void Java_org_j3_mmtk_Scanning_precopyChildren__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* Scanning, JavaObject TL, uintptr_t ref) { UNIMPLEMENTED(); }
+ MMTkObject* Scanning, MMTkObject TL, uintptr_t ref) { UNIMPLEMENTED(); }
+
+}
Modified: vmkit/trunk/mmtk/mmtk-j3/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Selected.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Selected.cpp Sat Nov 27 08:01:20 2010
@@ -7,14 +7,13 @@
//
//===----------------------------------------------------------------------===//
-#include "JavaArray.h"
-#include "JavaClass.h"
-#include "JavaObject.h"
-#include "JavaThread.h"
#include "MutatorThread.h"
+#include "MMTkObject.h"
-using namespace j3;
+namespace mmtk {
+
+extern "C" MMTkObject* Java_org_j3_config_Selected_00024Mutator_get__() {
+ return (MMTkObject*)mvm::MutatorThread::get()->MutatorContext;
+}
-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=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp Sat Nov 27 08:01:20 2010
@@ -7,19 +7,18 @@
//
//===----------------------------------------------------------------------===//
-#include "JavaObject.h"
-#include "JavaThread.h"
+#include "MMTkObject.h"
#include <sys/time.h>
#include <ctime>
-using namespace j3;
+namespace mmtk {
-extern "C" int64_t Java_org_j3_mmtk_Statistics_cycles__ (JavaObject* S) {
+extern "C" int64_t Java_org_j3_mmtk_Statistics_cycles__ (MMTkObject* S) {
return 0;
}
-extern "C" int64_t Java_org_j3_mmtk_Statistics_nanoTime__ (JavaObject* S) {
+extern "C" int64_t Java_org_j3_mmtk_Statistics_nanoTime__ (MMTkObject* S) {
int64_t result;
struct timeval tp;
@@ -35,12 +34,14 @@
}
-extern "C" int32_t Java_org_j3_mmtk_Statistics_getCollectionCount__ (JavaObject* S) {
+extern "C" int32_t Java_org_j3_mmtk_Statistics_getCollectionCount__ (MMTkObject* S) {
return 0;
}
-extern "C" void Java_org_j3_mmtk_Statistics_perfEventInit__Ljava_lang_String_2(JavaObject* S, JavaObject* Str) {
+extern "C" void Java_org_j3_mmtk_Statistics_perfEventInit__Ljava_lang_String_2(MMTkObject* S, MMTkObject* Str) {
}
-extern "C" void Java_org_j3_mmtk_Statistics_perfEventRead__I_3J(JavaObject* S, int id, int64_t* values) {
+extern "C" void Java_org_j3_mmtk_Statistics_perfEventRead__I_3J(MMTkObject* S, int id, int64_t* values) {
}
+
+} // namespace mmtk
Modified: vmkit/trunk/mmtk/mmtk-j3/Strings.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Strings.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Strings.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Strings.cpp Sat Nov 27 08:01:20 2010
@@ -7,25 +7,24 @@
//
//===----------------------------------------------------------------------===//
-#include "JavaArray.h"
-#include "JavaObject.h"
-#include "JavaString.h"
-#include "JavaThread.h"
+#include "mvm/Threads/Thread.h"
-using namespace j3;
+#include "MMTkObject.h"
-extern "C" void Java_org_j3_mmtk_Strings_write___3CI(JavaObject* str,
- ArrayUInt16* msg,
+namespace mmtk {
+
+extern "C" void Java_org_j3_mmtk_Strings_write___3CI(MMTkObject* str,
+ MMTkArray* msg,
sint32 len) {
for (sint32 i = 0; i < len; ++i) {
fprintf(stderr, "%c", msg->elements[i]);
}
}
-extern "C" void Java_org_j3_mmtk_Strings_writeThreadId___3CI(JavaObject* str,
- ArrayUInt16* msg,
+extern "C" void Java_org_j3_mmtk_Strings_writeThreadId___3CI(MMTkObject* str,
+ MMTkArray* msg,
sint32 len) {
- fprintf(stderr, "[%p] ", (void*)JavaThread::get());
+ fprintf(stderr, "[%p] ", (void*)mvm::Thread::get());
for (sint32 i = 0; i < len; ++i) {
fprintf(stderr, "%c", msg->elements[i]);
@@ -35,7 +34,7 @@
extern "C" sint32
Java_org_j3_mmtk_Strings_copyStringToChars__Ljava_lang_String_2_3CII(
- JavaObject* obj, JavaString* str, ArrayUInt16* dst, uint32 dstBegin,
+ MMTkObject* obj, MMTkString* str, MMTkArray* dst, uint32 dstBegin,
uint32 dstEnd) {
sint32 len = str->count;
@@ -49,3 +48,4 @@
}
+} // end namespace mmtk
Modified: vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/SynchronizedCounter.cpp Sat Nov 27 08:01:20 2010
@@ -8,13 +8,12 @@
//
//===----------------------------------------------------------------------===//
-#include "JavaObject.h"
-#include "JavaThread.h"
-
+#include "MMTkObject.h"
#include "debug.h"
-using namespace j3;
+namespace mmtk {
-extern "C" void Java_org_j3_mmtk_SynchronizedCounter_reset__ (JavaObject* self) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_mmtk_SynchronizedCounter_increment__ (JavaObject* self) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_SynchronizedCounter_reset__ (MMTkObject* self) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_SynchronizedCounter_increment__ (MMTkObject* self) { UNIMPLEMENTED(); }
+} // end namespace mmtk
Modified: vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp Sat Nov 27 08:01:20 2010
@@ -7,51 +7,50 @@
//
//===----------------------------------------------------------------------===//
-#include "JavaObject.h"
-#include "JavaThread.h"
-
#include "debug.h"
+#include "MMTkObject.h"
-using namespace j3;
+namespace mmtk {
-extern "C" bool Java_org_j3_mmtk_TraceInterface_gcEnabled__ (JavaObject* TI) { UNIMPLEMENTED(); }
+extern "C" bool Java_org_j3_mmtk_TraceInterface_gcEnabled__ (MMTkObject* TI) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_adjustSlotOffset__ZLorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2 (
- JavaObject* TI, bool scalar, uintptr_t src, uintptr_t slot) { UNIMPLEMENTED(); }
+ MMTkObject* TI, bool scalar, uintptr_t src, uintptr_t slot) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_skipOwnFramesAndDump__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* TI, uintptr_t typeRef) { UNIMPLEMENTED(); }
+ MMTkObject* TI, uintptr_t typeRef) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_updateDeathTime__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* TI, uintptr_t obj) { UNIMPLEMENTED(); }
+ MMTkObject* TI, uintptr_t obj) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_setDeathTime__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Word_2 (
- JavaObject* TI, uintptr_t ref, uintptr_t time) { UNIMPLEMENTED(); }
+ MMTkObject* TI, uintptr_t ref, uintptr_t time) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_setLink__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* TI, uintptr_t ref, uintptr_t link) { UNIMPLEMENTED(); }
+ MMTkObject* TI, uintptr_t ref, uintptr_t link) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_updateTime__Lorg_vmmagic_unboxed_Word_2 (
- JavaObject* TI, uintptr_t obj) { UNIMPLEMENTED(); }
+ MMTkObject* TI, uintptr_t obj) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_getOID__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* TI, uintptr_t ref) { UNIMPLEMENTED(); }
+ MMTkObject* TI, uintptr_t ref) { UNIMPLEMENTED(); }
extern "C" uintptr_t Java_org_j3_mmtk_TraceInterface_getDeathTime__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* TI, uintptr_t ref) { UNIMPLEMENTED(); }
+ MMTkObject* TI, uintptr_t ref) { UNIMPLEMENTED(); }
extern "C" uintptr_t Java_org_j3_mmtk_TraceInterface_getLink__Lorg_vmmagic_unboxed_ObjectReference_2 (
- JavaObject* TI, uintptr_t ref) { UNIMPLEMENTED(); }
+ MMTkObject* TI, uintptr_t ref) { UNIMPLEMENTED(); }
extern "C" uintptr_t Java_org_j3_mmtk_TraceInterface_getBootImageLink__ (
- JavaObject* TI) { UNIMPLEMENTED(); }
+ MMTkObject* TI) { UNIMPLEMENTED(); }
extern "C" uintptr_t Java_org_j3_mmtk_TraceInterface_getOID__ (
- JavaObject* TI) { UNIMPLEMENTED(); }
+ MMTkObject* TI) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_setOID__Lorg_vmmagic_unboxed_Word_2 (
- JavaObject* TI, uintptr_t oid) { UNIMPLEMENTED(); }
+ MMTkObject* TI, uintptr_t oid) { UNIMPLEMENTED(); }
-extern "C" sint32 Java_org_j3_mmtk_TraceInterface_getHeaderSize__ (JavaObject* TI) { UNIMPLEMENTED(); }
-extern "C" sint32 Java_org_j3_mmtk_TraceInterface_getHeaderEndOffset__ (JavaObject* TI) { UNIMPLEMENTED(); }
+extern "C" sint32 Java_org_j3_mmtk_TraceInterface_getHeaderSize__ (MMTkObject* TI) { UNIMPLEMENTED(); }
+extern "C" sint32 Java_org_j3_mmtk_TraceInterface_getHeaderEndOffset__ (MMTkObject* TI) { UNIMPLEMENTED(); }
+} // namespace mmtk
Modified: vmkit/trunk/mmtk/mmtk-j3/VM.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/VM.cpp?rev=120220&r1=120219&r2=120220&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/VM.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/VM.cpp Sat Nov 27 08:01:20 2010
@@ -7,23 +7,20 @@
//
//===----------------------------------------------------------------------===//
-#include "JavaObject.h"
-#include "JavaString.h"
-#include "JavaThread.h"
-
#include "debug.h"
+#include "MMTkObject.h"
-using namespace j3;
+namespace mmtk {
extern "C" void Java_org_j3_runtime_VM_sysWrite__Lorg_vmmagic_unboxed_Extent_2 (uintptr_t e) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_runtime_VM_sysWrite__Lorg_vmmagic_unboxed_Address_2 (uintptr_t a) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_runtime_VM_sysWrite__F (float f) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_runtime_VM_sysWrite__I (int i) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_runtime_VM_sysWrite__Ljava_lang_String_2 (JavaString* msg) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_runtime_VM_sysWrite__Ljava_lang_String_2 (MMTkString* msg) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_runtime_VM_sysWriteln__ () { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_runtime_VM_sysWriteln__Ljava_lang_String_2 (JavaString* msg) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_runtime_VM_sysWriteln__Ljava_lang_String_2 (MMTkString* msg) { UNIMPLEMENTED(); }
-extern "C" void Java_org_j3_runtime_VM__1assert__ZLjava_lang_String_2 (bool cond, JavaString* msg) {
+extern "C" void Java_org_j3_runtime_VM__1assert__ZLjava_lang_String_2 (bool cond, MMTkString* msg) {
ABORT();
}
@@ -31,7 +28,7 @@
ABORT();
}
-extern "C" void Java_org_j3_runtime_VM_sysFail__Ljava_lang_String_2 (JavaString* msg) {
+extern "C" void Java_org_j3_runtime_VM_sysFail__Ljava_lang_String_2 (MMTkString* msg) {
// Just call abort because gcmalloc calls this function. If it were to
// call printf, MMTkInline.inc could not be JIT-compiled.
abort();
@@ -68,3 +65,5 @@
return false;
#endif
}
+
+} // namespace mmtk
More information about the vmkit-commits
mailing list