Signed-off-by: Vegard Nossum <[email protected]>
---
Makefile | 6 +++++-
.../gnu/classpath/VMSystemProperties.java | 10 ++++++++++
vm/jato.c | 7 +++++++
3 files changed, 22 insertions(+), 1 deletions(-)
create mode 100644 runtime/classpath/gnu/classpath/VMSystemProperties.java
diff --git a/Makefile b/Makefile
index b7af01b..c1caabf 100644
--- a/Makefile
+++ b/Makefile
@@ -232,11 +232,14 @@ REGRESSION_TEST_SUITE_CLASSES = \
regression/jvm/ObjectStackTest.class \
regression/jvm/PrintTest.class
+RUNTIME_CLASSES = \
+ runtime/classpath/gnu/classpath/VMSystemProperties.class
+
lib: $(CLASSPATH_CONFIG)
make -C lib/ JAVAC=$(JAVAC) GLIBJ=$(GLIBJ)
.PHONY: lib
-regression: monoburg $(CLASSPATH_CONFIG) $(PROGRAM)
$(REGRESSION_TEST_SUITE_CLASSES)
+regression: monoburg $(CLASSPATH_CONFIG) $(PROGRAM)
$(REGRESSION_TEST_SUITE_CLASSES) $(RUNTIME_CLASSES)
$(E) " REGRESSION"
$(Q) cd regression && /bin/bash run-suite.sh $(JAVA_OPTS)
.PHONY: regression
@@ -256,6 +259,7 @@ clean:
$(Q) - rm -f test-suite.o
$(Q) - rm -f $(ARCH_TESTRUNNER)
$(Q) - rm -f $(REGRESSION_TEST_SUITE_CLASSES)
+ $(Q) - rm -f $(RUNTIME_CLASSES)
$(Q) - find regression/ -name "*.class" | xargs rm -f
$(Q) - rm -f tags
$(Q) - rm -f include/arch
diff --git a/runtime/classpath/gnu/classpath/VMSystemProperties.java
b/runtime/classpath/gnu/classpath/VMSystemProperties.java
new file mode 100644
index 0000000..ee1ae45
--- /dev/null
+++ b/runtime/classpath/gnu/classpath/VMSystemProperties.java
@@ -0,0 +1,10 @@
+package gnu.classpath;
+
+import java.util.Properties;
+
+public class VMSystemProperties {
+ static native void preInit(Properties p);
+
+ static void postInit(Properties p) {
+ }
+}
diff --git a/vm/jato.c b/vm/jato.c
index 37610d9..53f0f36 100644
--- a/vm/jato.c
+++ b/vm/jato.c
@@ -53,6 +53,10 @@
static bool perf_enabled;
char *exe_name;
+static void __vm_native native_vmsystemproperties_preinit(struct vm_object *p)
+{
+}
+
static void __vm_native native_vmruntime_exit(int status)
{
/* XXX: exit gracefully */
@@ -103,6 +107,9 @@ native_vmthrowable_fill_in_stack_trace(struct vm_object
*message)
static void jit_init_natives(void)
{
+ vm_register_native("gnu/classpath/VMSystemProperties", "preInit",
+ &native_vmsystemproperties_preinit);
+
vm_register_native("jato/internal/VM", "exit",
&native_vmruntime_exit);
vm_register_native("jato/internal/VM", "println",
--
1.6.0.4
------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
