X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=ffi%2Fnative.c;h=57a688e3e60c0dc28e5197298e1302b09ffa86a0;hb=54cd74d726b0e145c9c8880185f6dda92412381b;hp=2972a18a34e70aa1037ca4804a910896df8f27c4;hpb=1675296109f7d45f42b2100cb70a4edb314fe6d6;p=mate.git

diff --git a/ffi/native.c b/ffi/native.c
index 2972a18..57a688e 100644
--- a/ffi/native.c
+++ b/ffi/native.c
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 static char ascii(char s) {
 	if(s < 0x20) return '.';
@@ -44,43 +46,83 @@ void java_io_PrintStream__printf___I_V(int a)
 	printf("printstream: 0x%08x\n", a);
 }
 
-void java_io_PrintStream__println___Ljava_lang_String__V(const char *a)
-{
-	printf("%s\n", a);
-}
-
 struct integer {
 	unsigned int method_table_ptr;
 	int value;
 };
 
+struct string {
+	unsigned int method_table_ptr;
+	struct chararray *value;
+};
+
+struct chararray {
+	unsigned int length;
+	char *str;
+};
+
+void java_io_PrintStream__printf_0___Ljava_lang_String__V
+	(struct string *fmt)
+{
+	printf("%s", &fmt->value->str);
+}
+
 void java_io_PrintStream__printf_1___Ljava_lang_String_Ljava_lang_Object__V
-	(struct integer *a1, const char *fmt)
+	(struct integer *a1, struct string *fmt)
 {
-	printf(fmt, a1->value);
+#if 0
+	printf("fmt:        0x%08x\n", (unsigned int) fmt);
+	printf("fmt->value: 0x%08x\n", (unsigned int) fmt->value);
+	printf("fmt->val.len: 0x%08x\n", (unsigned int) (*fmt->value).length);
+	printf("first: %d\n", fmt->value->length);
+	printf("*fmt: %s\n", &fmt->value->str);
+#endif
+	printf(&fmt->value->str, a1->value);
 }
 
 void java_io_PrintStream__printf_2___Ljava_lang_String_Ljava_lang_Object_Ljava_lang_Object__V
-	(struct integer *a2, struct integer *a1, const char *fmt)
+	(struct integer *a2, struct integer *a1, struct string *fmt)
 {
-	printf(fmt, a1->value, a2->value);
+	printf(&fmt->value->str, a1->value, a2->value);
 }
 
 void
 java_io_PrintStream__printf_3___Ljava_lang_String_Ljava_lang_Object_Ljava_lang_Object_Ljava_lang_Object__V
-	(struct integer *a3, struct integer *a2, struct integer *a1, const char *fmt)
+	(struct integer *a3, struct integer *a2, struct integer *a1, struct string *fmt)
 {
-	printf(fmt, a1->value, a2->value, a3->value);
+	printf(&fmt->value->str, a1->value, a2->value, a3->value);
 }
 
 void java_io_PrintStream__printf_4___Ljava_lang_String_Ljava_lang_Object_Ljava_lang_Object_Ljava_lang_Object_Ljava_lang_Object__V
-	(struct integer *a4, struct integer *a3, struct integer *a2, struct integer *a1, const char *fmt)
+	(struct integer *a4, struct integer *a3, struct integer *a2, struct integer *a1, struct string *fmt)
 {
-	printf(fmt, a1->value, a2->value, a3->value, a4->value);
+	printf(&fmt->value->str, a1->value, a2->value, a3->value, a4->value);
 }
 
 void java_io_PrintStream__printf_5___Ljava_lang_String_Ljava_lang_Object_Ljava_lang_Object_Ljava_lang_Object_Ljava_lang_Object_Ljava_lang_Object__V
-	(struct integer *a5, struct integer *a4, struct integer *a3, struct integer *a2, struct integer *a1, const char *fmt)
+	(struct integer *a5, struct integer *a4, struct integer *a3, struct integer *a2, struct integer *a1, struct string *fmt)
+{
+	printf(&fmt->value->str, a1->value, a2->value, a3->value, a4->value, a5->value);
+}
+
+void gnu_classpath_VMSystemProperties__preInit___Ljava_util_Properties__V() {
+	return;
+}
+
+void java_lang_VMSystem__arraycopy___Ljava_lang_Object_ILjava_lang_Object_II_V(
+		int len, int dest_start, struct chararray *dest,
+		int src_start, struct chararray *src)
+#if 0
+		/* original */
+		struct chararray *src, int src_start,
+		struct chararray *dest, int dest_start, int len)
+#endif
 {
-	printf(fmt, a1->value, a2->value, a3->value, a4->value, a5->value);
+	/* TODO(bernhard): clean please... */
+	memcpy(((char *) dest) + 4, ((char *) src) + 4 + src_start, len);
+	dest->length = len;
+#if 0
+	hexdump(src, len + 4);
+	hexdump(dest, len + 4);
+#endif
 }