Hi,
--- Dalibor Topic [EMAIL PROTECTED] wrote:
--- Tony Wyatt [EMAIL PROTECTED] wrote:
Hi all,
I thought this little gem should be shared with other M68k owners. There was
only one big problem that made the JIT3 crash on the Amiga and native m68k
Linux on my machine, and this patch fixes it.
thanks a lot for tracking down that one, I've checked it in.
I checked this mod with my patch attached, but still something is wrong.
Simple '$JAVA HelloWorldApp' does not output anything, and compiling
fails. I am wondering my gcc/glibc version is wrong, or linux version
specific...
I will check it next week more in detail.
Kiyo
-
diff -Naur kaffe-snap-030515.orig/config/config-mem.h
kaffe-snap-030515/config/config-mem.h
--- kaffe-snap-030515.orig/config/config-mem.h Tue May 6 11:33:42 2003
+++ kaffe-snap-030515/config/config-mem.h Sun Jun 1 13:32:22 2003
@@ -43,6 +43,9 @@
#endif
#if !defined(HAVE_DECLARED_SWAB)
+#if defined(HAVE_SYS_TYPES_H)
+#include sys/types.h
+#endif
/*
* Some systems (Linux) do not declare swab in any standard header file
*/
diff -Naur kaffe-snap-030515.orig/config/config.h.in
kaffe-snap-030515/config/config.h.in
--- kaffe-snap-030515.orig/config/config.h.in Wed May 21 20:10:47 2003
+++ kaffe-snap-030515/config/config.h.inSun Jun 1 13:34:33 2003
@@ -289,6 +289,9 @@
/* Define to 1 if you have the netinet/tcp.h header file. */
#undef HAVE_NETINET_TCP_H
+/* Define to 1 if you have the netpacket/packet.h header file. */
+#undef HAVE_NETPACKET_PACKET_H
+
/* Define to 1 if you have the `on_exit' function. */
#undef HAVE_ON_EXIT
diff -Naur kaffe-snap-030515.orig/config/m68k/linux/config.frag
kaffe-snap-030515/config/m68k/linux/config.frag
--- kaffe-snap-030515.orig/config/m68k/linux/config.fragSat Dec 18 14:09:34
1999
+++ kaffe-snap-030515/config/m68k/linux/config.frag Sun Jun 1 13:35:07 2003
@@ -3,8 +3,8 @@
#
Khost_cpu=m68k
Khost_os=linux
-CFLAGS=-g -fno-omit-frame-pointer
-#CFLAGS=-g -O -fno-omit-frame-pointer
+#CFLAGS=-g -fno-omit-frame-pointer
+CFLAGS=-g -O -fno-omit-frame-pointer
if [ $cross_compiling = yes ]; then
# if we use cross environment, following values may not be detected.
ac_cv_alignmentof_voidp=${ac_cv_alignmentof_voidp='2'}
diff -Naur kaffe-snap-030515.orig/config/m68k/linux/jit3-md.h
kaffe-snap-030515/config/m68k/linux/jit3-md.h
--- kaffe-snap-030515.orig/config/m68k/linux/jit3-md.h Thu Jan 1 09:00:00 1970
+++ kaffe-snap-030515/config/m68k/linux/jit3-md.h Sun Jun 1 15:54:20 2003
@@ -0,0 +1 @@
+#include m68k/linux/jit-md.h
diff -Naur kaffe-snap-030515.orig/configure kaffe-snap-030515/configure
--- kaffe-snap-030515.orig/configureWed May 21 20:18:20 2003
+++ kaffe-snap-030515/configure Sun Jun 1 13:33:43 2003
@@ -23914,6 +23914,7 @@
netinet/in.h \
netinet/in_systm.h \
netinet/tcp.h \
+netpacket/packet.h \
png.h \
poll.h \
pwd.h \
diff -Naur kaffe-snap-030515.orig/configure.in kaffe-snap-030515/configure.in
--- kaffe-snap-030515.orig/configure.in Wed May 21 20:18:22 2003
+++ kaffe-snap-030515/configure.in Sun Jun 1 13:34:02 2003
@@ -741,6 +741,7 @@
netinet/in.h \
netinet/in_systm.h \
netinet/tcp.h \
+netpacket/packet.h \
png.h \
poll.h \
pwd.h \
diff -Naur kaffe-snap-030515.orig/kaffe/kaffevm/stringParsing.c
kaffe-snap-030515/kaffe/kaffevm/stringParsing.c
--- kaffe-snap-030515.orig/kaffe/kaffevm/stringParsing.cSat Apr 26 06:35:34
2003
+++ kaffe-snap-030515/kaffe/kaffevm/stringParsing.c Sat May 31 17:19:34 2003
@@ -822,10 +822,14 @@
parseErrorInfo pe;
parsedString ps;
int retval;
+ va_list * args;
+
+ args = KCALLOC(1, sizeof(args));
ps.data = str;
ps.len = strlen(str);
- retval = parseString_private(pe, ps, ss, values, SPO_Noop, NULL);
+ retval = parseString_private(pe, ps, ss, values, SPO_Noop, *args);
+ KFREE(args);
return( retval );
}
@@ -838,541 +842,5 @@
strncpy(retval, ps-data, ps-len);
retval[ps-len] = '\0';
}
- return( retval );
-}
-
-static
-char *test1Strings[] = {
- [team:0x1:create],
- [a:0x100:b],
- [team:0x1:create,
- [team:1:create,
- [team:0x1:create]baddata,
- [],
- [:],
- [::],
- [a:b:c],
- 0
-};
-
-static
-parsedString test1Substrings[] = {
- { [team:0x1:create] ** This is junk ** },
- { [a:0x100:b] ** This is junk ** },
- { [team:0x1:create ** This is junk ** },
- { [team:1:create ** This is junk ** },
- { [team:0x1:create]baddata ** This is junk ** },
- { [] ** This is junk ** },
- { [:] ** This is junk ** },
- { [::] ** This is junk ** },
- { [a:b:c] ** This is junk ** },
- { 0 }
-};
-
-static
-struct {
- int result;
- parsedString name;
- int commands;
- parsedString usage;
-} test1Results[] =
