[vmkit-commits] [vmkit] r84095 - in /vmkit/trunk/mmtk: java/src/org/j3/config/Selected.java java/src/org/j3/mmtk/BuildTimeConfig.java mmtk-j3/ActivePlan.cpp mmtk-j3/Collection.cpp mmtk-j3/FinalizableProcessor.cpp mmtk-j3/ObjectModel.cpp mmtk-j3/ReferenceProcessor.cpp mmtk-j3/Scanning.cpp mmtk-j3/Selected.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Wed Oct 14 04:52:14 PDT 2009
Author: geoffray
Date: Wed Oct 14 06:52:13 2009
New Revision: 84095
URL: http://llvm.org/viewvc/llvm-project?rev=84095&view=rev
Log:
Update MMTk interface.
Modified:
vmkit/trunk/mmtk/java/src/org/j3/config/Selected.java
vmkit/trunk/mmtk/java/src/org/j3/mmtk/BuildTimeConfig.java
vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp
vmkit/trunk/mmtk/mmtk-j3/Collection.cpp
vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp
vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp
vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
vmkit/trunk/mmtk/mmtk-j3/Selected.cpp
Modified: vmkit/trunk/mmtk/java/src/org/j3/config/Selected.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/java/src/org/j3/config/Selected.java?rev=84095&r1=84094&r2=84095&view=diff
==============================================================================
--- vmkit/trunk/mmtk/java/src/org/j3/config/Selected.java (original)
+++ vmkit/trunk/mmtk/java/src/org/j3/config/Selected.java Wed Oct 14 06:52:13 2009
@@ -52,6 +52,8 @@
{
private static final Mutator bootstrapThread = new Mutator();
+ public Mutator() {}
+
@Inline
public static native Mutator get();
}
Modified: vmkit/trunk/mmtk/java/src/org/j3/mmtk/BuildTimeConfig.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/java/src/org/j3/mmtk/BuildTimeConfig.java?rev=84095&r1=84094&r2=84095&view=diff
==============================================================================
--- vmkit/trunk/mmtk/java/src/org/j3/mmtk/BuildTimeConfig.java (original)
+++ vmkit/trunk/mmtk/java/src/org/j3/mmtk/BuildTimeConfig.java Wed Oct 14 06:52:13 2009
@@ -49,17 +49,16 @@
*/
private Properties getProperties(String property_file_property, String default_property_file) {
Properties props = new Properties();
- return props;
- /*String propFileName;
+ String propFileName;
if (default_property_file == null) {
propFileName = System.getProperty(property_file_property);
if (propFileName == null) {
System.err.println(property_file_property+" must specify a properties file");
VM.sysExit(1);
- }
+ }
} else {
propFileName = System.getProperty(property_file_property, default_property_file);
- }
+ }
File propFile = new File(propFileName);
try {
@@ -70,12 +69,12 @@
if (!propFileName.equals(default_property_file)) {
System.err.println(propFileName+" not found.");
VM.sysExit(1);
- }
+ }
} catch (IOException e) {
e.printStackTrace();
VM.sysExit(1);
- }
- return props;*/
+ }
+ return props;
}
@Override
Modified: vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp?rev=84095&r1=84094&r2=84095&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ActivePlan.cpp Wed Oct 14 06:52:13 2009
@@ -12,11 +12,11 @@
using namespace jnjvm;
extern "C" JavaObject* Java_org_j3_mmtk_ActivePlan_getNextMutator__ (JavaObject* A) {
- return 0;
+ abort();
}
extern "C" void Java_org_j3_mmtk_ActivePlan_resetMutatorIterator__ (JavaObject* A) {
- return;
+ abort();
}
extern "C" void Java_org_j3_mmtk_ActivePlan_collectorCount__ () { abort(); }
Modified: vmkit/trunk/mmtk/mmtk-j3/Collection.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Collection.cpp?rev=84095&r1=84094&r2=84095&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Collection.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Collection.cpp Wed Oct 14 06:52:13 2009
@@ -19,28 +19,31 @@
extern "C" bool Java_org_j3_mmtk_Collection_isEmergencyAllocation__ (JavaObject* C) {
- return false;
+ abort();
}
extern "C" void Java_org_j3_mmtk_Collection_reportAllocationSuccess__ (JavaObject* C) {
+ abort();
}
extern "C" void Java_org_j3_mmtk_Collection_triggerCollection__I (JavaObject* C, int why) {
+ abort();
JnJVM_org_mmtk_plan_Plan_setCollectionTriggered__();
JnJVM_org_j3_config_Selected_00024Collector_staticCollect__();
JnJVM_org_mmtk_plan_Plan_collectionComplete__();
}
extern "C" int Java_org_j3_mmtk_Collection_rendezvous__I (JavaObject* C, int where) {
- return 1;
+ abort();
}
extern "C" int Java_org_j3_mmtk_Collection_maximumCollectionAttempt__ (JavaObject* C) {
- return 1;
+ abort();
}
extern "C" void Java_org_j3_mmtk_Collection_prepareCollector__Lorg_mmtk_plan_CollectorContext_2 (JavaObject* C, JavaObject* CC) {
+ abort();
}
Modified: vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp?rev=84095&r1=84094&r2=84095&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp Wed Oct 14 06:52:13 2009
@@ -23,4 +23,5 @@
extern "C" void
Java_org_j3_mmtk_FinalizableProcessor_scan__Lorg_mmtk_plan_TraceLocal_2Z () {
+ abort();
}
Modified: vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp?rev=84095&r1=84094&r2=84095&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp Wed Oct 14 06:52:13 2009
@@ -20,10 +20,12 @@
}
extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_readAvailableBitsWord__Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* OM, JavaObject* obj) {
+ abort();
return ((uintptr_t*)obj)[1];
}
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) {
+ abort();
((uintptr_t*)obj)[1] = val;
}
Modified: vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp?rev=84095&r1=84094&r2=84095&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp Wed Oct 14 06:52:13 2009
@@ -13,6 +13,7 @@
using namespace jnjvm;
extern "C" void Java_org_j3_mmtk_ReferenceProcessor_scan__Lorg_mmtk_plan_TraceLocal_2Z () {
+ abort();
}
extern "C" void Java_org_j3_mmtk_ReferenceProcessor_forward__Lorg_mmtk_plan_TraceLocal_2Z () { abort(); }
Modified: vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp?rev=84095&r1=84094&r2=84095&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp Wed Oct 14 06:52:13 2009
@@ -12,15 +12,19 @@
using namespace jnjvm;
extern "C" void Java_org_j3_mmtk_Scanning_computeThreadRoots__Lorg_mmtk_plan_TraceLocal_2 () {
+ abort();
}
extern "C" void Java_org_j3_mmtk_Scanning_computeGlobalRoots__Lorg_mmtk_plan_TraceLocal_2 () {
+ abort();
}
extern "C" void Java_org_j3_mmtk_Scanning_computeStaticRoots__Lorg_mmtk_plan_TraceLocal_2 () {
+ abort();
}
extern "C" void Java_org_j3_mmtk_Scanning_resetThreadCounter__ () {
+ abort();
}
extern "C" void Java_org_j3_mmtk_Scanning_scanObject__Lorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2 () { abort(); }
Modified: vmkit/trunk/mmtk/mmtk-j3/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Selected.cpp?rev=84095&r1=84094&r2=84095&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Selected.cpp Wed Oct 14 06:52:13 2009
@@ -14,29 +14,12 @@
using namespace jnjvm;
-#if 1
-
-extern "C" JavaObject* org_j3_config_Selected_4Mutator_static;
-extern "C" JavaObject* org_j3_config_Selected_4Collector_static;
-
-
-extern "C" JavaObject* Java_org_j3_config_Selected_00024Collector_get__() {
- JavaObject* obj = org_j3_config_Selected_4Collector_static;
- return obj;
-}
-
-extern "C" JavaObject* Java_org_j3_config_Selected_00024Mutator_get__() {
- JavaObject* obj = org_j3_config_Selected_4Mutator_static;
- return obj;
-}
-
-
-#else
extern "C" JavaObject* Java_org_j3_config_Selected_00024Collector_get__() {
+ abort();
return 0;
}
extern "C" JavaObject* Java_org_j3_config_Selected_00024Mutator_get__() {
+ abort();
return 0;
}
-#endif
More information about the vmkit-commits
mailing list