[kaffe] CVS kaffe (robilad): fixed check if words need to be switched on arm
PatchSet 7758
Date: 2008/02/16 17:11:39
Author: robilad
Branch: HEAD
Tag: (none)
Log:
fixed check if words need to be switched on arm
2008-02-16 Dalibor Topic [EMAIL PROTECTED]
* kaffe/kaffevm/constants.c (readConstantPool): Use
check_if_need_to_switch_words_in_jdouble instead of checking
if DOUBLE_ORDER_OPPOSITE is defined.
(check_if_need_to_switch_words_in_jdouble): New static helper function.
* config/config-hacks.h (DOUBLE_ORDER_OPPOSITE): Removed.
Members:
ChangeLog:1.5258-1.5259
config/config-hacks.h:1.18-1.19
kaffe/kaffevm/constants.c:1.21-1.22
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5258 kaffe/ChangeLog:1.5259
--- kaffe/ChangeLog:1.5258 Sat Feb 16 00:49:40 2008
+++ kaffe/ChangeLog Sat Feb 16 17:11:39 2008
@@ -1,5 +1,14 @@
2008-02-16 Dalibor Topic [EMAIL PROTECTED]
+ * kaffe/kaffevm/constants.c (readConstantPool): Use
+ check_if_need_to_switch_words_in_jdouble instead of checking
+ if DOUBLE_ORDER_OPPOSITE is defined.
+ (check_if_need_to_switch_words_in_jdouble): New static helper function.
+
+ * config/config-hacks.h (DOUBLE_ORDER_OPPOSITE): Removed.
+
+2008-02-16 Dalibor Topic [EMAIL PROTECTED]
+
* THIRDPARTY: Added license information for files imported
from GNU Classpath and GCC.
Index: kaffe/config/config-hacks.h
diff -u kaffe/config/config-hacks.h:1.18 kaffe/config/config-hacks.h:1.19
--- kaffe/config/config-hacks.h:1.18Tue Jun 21 16:41:36 2005
+++ kaffe/config/config-hacks.h Sat Feb 16 17:11:41 2008
@@ -65,18 +65,6 @@
#defineHAVE_UNALIGNEDACCESS
#endif
-/* On arm, word order of doubles is always big endian when
- * using FPA. When using VFP, word order of doubles follows
- * the word order of the memory system.
- *
- * Therefore, the word order of doubles is opposite to the
- * word order of jlongs when using a little endian arm
- * unless VFP is used.
- */
-#if defined(__ARMEL__) !defined(__VFP_FP__)
-#define DOUBLE_ORDER_OPPOSITE
-#endif
-
/*
* GCC before 3.0 does not support explicit branch optimization.
*/
Index: kaffe/kaffe/kaffevm/constants.c
diff -u kaffe/kaffe/kaffevm/constants.c:1.21
kaffe/kaffe/kaffevm/constants.c:1.22
--- kaffe/kaffe/kaffevm/constants.c:1.21Sat Apr 22 12:40:03 2006
+++ kaffe/kaffe/kaffevm/constants.c Sat Feb 16 17:11:41 2008
@@ -28,6 +28,21 @@
/*
* XXX move into readClass.c
*/
+/**
+ * Check if the words making up a jdouble need to be
+ * switched around. Necessary for some ARM systems.
+ */
+static
+jboolean check_if_need_to_switch_words_in_jdouble(void) {
+ jvalue val;
+
+ /* -0.0 as an IEEE754 double is 0x80LL, i.e. 0LL.
+ * If the words in the double are switched around, then the
+ * bit pattern will be 0x8000LL, i.e. 0LL.
+ */
+ val.d = -0.0;
+ return val.j 0;
+}
/*
* Read in constant pool from opened file.
@@ -168,23 +183,23 @@
readu4(d4b, fp);
#if SIZEOF_VOID_P == 8
-#if defined(DOUBLE_ORDER_OPPOSITE)
- pool[i] = WORDS_TO_LONG(d4b, d4);
-#else
- pool[i] = WORDS_TO_LONG(d4, d4b);
-#endif /* DOUBLE_ORDER_OPPOSITE */
+ if(check_if_need_toswitch_words_in_jdouble())
+ pool[i] = WORDS_TO_LONG(d4b, d4);
+ else
+ pool[i] = WORDS_TO_LONG(d4, d4b);
i++;
pool[i] = 0;
#else
-#if defined(DOUBLE_ORDER_OPPOSITE)
- pool[i] = d4b;
- i++;
- pool[i] = d4;
-#else
- pool[i] = d4;
- i++;
- pool[i] = d4b;
-#endif /* DOUBLE_ORDER_OPPOSITE */
+ if (check_if_need_to_switch_words_in_jdouble()) {
+ pool[i] = d4b;
+ i++;
+ pool[i] = d4;
+ }
+ else {
+ pool[i] = d4;
+ i++;
+ pool[i] = d4b;
+ }
#endif /* SIZEOF_VOID_P == 8 */
tags[i] = CONSTANT_Unknown;
break;
___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): cleaned up config hacks
PatchSet 7759 Date: 2008/02/16 17:20:07 Author: robilad Branch: HEAD Tag: (none) Log: cleaned up config hacks 008-02-16 Dalibor Topic [EMAIL PROTECTED] * config/config-hacks.h (HAVE_UNALIGNEDACCESS, MSG_PEEK) (HAVE_DYN_UNDERSTORE, DEFAULT_LIBRARYPATH): Removed unused definitions. Members: ChangeLog:1.5259-1.5260 config/config-hacks.h:1.19-1.20 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.5259 kaffe/ChangeLog:1.5260 --- kaffe/ChangeLog:1.5259 Sat Feb 16 17:11:39 2008 +++ kaffe/ChangeLog Sat Feb 16 17:20:07 2008 @@ -1,5 +1,10 @@ 2008-02-16 Dalibor Topic [EMAIL PROTECTED] + * config/config-hacks.h (HAVE_UNALIGNEDACCESS, MSG_PEEK) + (HAVE_DYN_UNDERSTORE, DEFAULT_LIBRARYPATH): Removed unused definitions. + +2008-02-16 Dalibor Topic [EMAIL PROTECTED] + * kaffe/kaffevm/constants.c (readConstantPool): Use check_if_need_to_switch_words_in_jdouble instead of checking if DOUBLE_ORDER_OPPOSITE is defined. Index: kaffe/config/config-hacks.h diff -u kaffe/config/config-hacks.h:1.19 kaffe/config/config-hacks.h:1.20 --- kaffe/config/config-hacks.h:1.19Sat Feb 16 17:11:41 2008 +++ kaffe/config/config-hacks.h Sat Feb 16 17:20:09 2008 @@ -13,15 +13,9 @@ /* Hacks to configure NeXT */ #if defined(NeXT) #undef HAVE_SYS_UTSNAME_H -#define HAVE_DYN_UNDERSTORE 1 #undef HAVE_SBRK #endif -/* Hack to configure AmigaOS */ -#if defined(__amigaos__) -#define HAVE_DYN_UNDERSTORE 1 -#endif - /* Hack for Windows */ #if defined(__WIN32__) || defined(WIN32) || defined(_WIN32) #undef __WIN32__ @@ -38,31 +32,9 @@ #endif #endif -/* Hack for NetBSD */ -#if defined(__NetBSD__) -#defineHAVE_DYN_UNDERSTORE 1 -#defineDEFAULT_LIBRARYPATH /usr/local/lib:/usr/lib -#endif - /* Hack to configure AIX */ #if defined(_AIX) #define HAVE_SYS_SELECT_H 1 -#endif - -/* Hack to configure BeOS R4 */ -#if defined(__BEOS__) -#include socket.h -#if defined(MSG_PEEK) -#error Looks like BeOS finally supports MSG_PEEK. -#error Please remove the MSG_PEEK hack in config-hacks.h and syscalls.c. -#else -#define MSG_PEEK 0x2 -#endif -#endif - -/* The 386 can do unaligned memory accesses */ -#if defined(__i386__) -#defineHAVE_UNALIGNEDACCESS #endif /* ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): updated TODO
PatchSet 7760 Date: 2008/02/16 17:40:10 Author: robilad Branch: HEAD Tag: (none) Log: updated TODO 2008-02-16 Dalibor Topic [EMAIL PROTECTED] * TODO: Updated. Members: ChangeLog:1.5260-1.5261 TODO:1.54-1.55 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.5260 kaffe/ChangeLog:1.5261 --- kaffe/ChangeLog:1.5260 Sat Feb 16 17:20:07 2008 +++ kaffe/ChangeLog Sat Feb 16 17:40:10 2008 @@ -1,5 +1,9 @@ 2008-02-16 Dalibor Topic [EMAIL PROTECTED] + * TODO: Updated. + +2008-02-16 Dalibor Topic [EMAIL PROTECTED] + * config/config-hacks.h (HAVE_UNALIGNEDACCESS, MSG_PEEK) (HAVE_DYN_UNDERSTORE, DEFAULT_LIBRARYPATH): Removed unused definitions. Index: kaffe/TODO diff -u kaffe/TODO:1.54 kaffe/TODO:1.55 --- kaffe/TODO:1.54 Fri Feb 15 01:51:37 2008 +++ kaffe/TODO Sat Feb 16 17:40:10 2008 @@ -23,6 +23,7 @@ * Look into removing the logging.properties file in libraries/javalib. * cleanup JNI library loading to use libltdl exclusively. * Remove unused instructions from jits (nop, unimplemented) + * Use CScout http://www.spinellis.gr/cscout/doc/indexw.html to weed out unused symbols. * Architectural changes: * Make threading model runtime selectable. ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
Re: [kaffe] Re: OutOfMemoryError while compiling GNU Classpath
From: Dalibor Topic [EMAIL PROTECTED] Subject: Re: [kaffe] Re: OutOfMemoryError while compiling GNU Classpath Date: Sat, 16 Feb 2008 00:39:12 +0100 I've committed a fix now. Thank you very much for spotting this embarassing bug, and I hope the fix will work for you, too. Yes, It worked for me too. Thank you, Dalibor. ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
Re: [kaffe] Re: OutOfMemoryError while compiling GNU Classpath
Ito Kazumitsu wrote: From: Dalibor Topic [EMAIL PROTECTED] Subject: Re: [kaffe] Re: OutOfMemoryError while compiling GNU Classpath Date: Sat, 16 Feb 2008 00:39:12 +0100 I've committed a fix now. Thank you very much for spotting this embarassing bug, and I hope the fix will work for you, too. Yes, It worked for me too. Thank you, Dalibor. Great. On to the next bug! cheers, dalibor topic ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
