[kaffe] CVS kaffe (robilad): Shuffled PROMOTE_* and NO_HOLES for amd64 to make sure they get picked up

[Kaffe CVS]

PatchSet 5360 
Date: 2004/10/24 23:20:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Shuffled PROMOTE_* and NO_HOLES for amd64 to make sure they get picked up

2004-10-24  Eric Anholt  <eta at lclark.edu>

        * config/x86_64/common.h,
        config/x86_64/sysdepCallMethod.h: Move PROMOTE_* / NO_HOLES to common.h
        instead of sysdepCallMethod.h (sysdepCallMethod isn't always included by
        common.h)

Members: 
	ChangeLog:1.2912->1.2913 
	config/x86_64/common.h:1.2->1.3 
	config/x86_64/sysdepCallMethod.h:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2912 kaffe/ChangeLog:1.2913
--- kaffe/ChangeLog:1.2912	Sun Oct 24 20:59:47 2004
+++ kaffe/ChangeLog	Sun Oct 24 23:20:05 2004
@@ -1,5 +1,12 @@
 2004-10-24  Eric Anholt  <eta at lclark.edu>
 
+	* config/x86_64/common.h,
+	config/x86_64/sysdepCallMethod.h: Move PROMOTE_* / NO_HOLES to common.h
+	instead of sysdepCallMethod.h (sysdepCallMethod isn't always included by
+	common.h)
+
+2004-10-24  Eric Anholt  <eta at lclark.edu>
+
 	* kaffe/kaffevm/support.c: Fixup for the commit to avoid undefined
 	macro warnings for PROMOTE_* an NO_HOLES, because defined(MACRO) is true
 	even if MACRO is 0.  Set the macros to 0 when they're unset rather than
Index: kaffe/config/x86_64/common.h
diff -u kaffe/config/x86_64/common.h:1.2 kaffe/config/x86_64/common.h:1.3
--- kaffe/config/x86_64/common.h:1.2	Fri Jun 11 16:48:59 2004
+++ kaffe/config/x86_64/common.h	Sun Oct 24 23:20:09 2004
@@ -16,6 +16,24 @@
 #define NEED_STACK_ALIGN
 #define STACK_ALIGN(p)  ((((unsigned long)(p)) & 15) ^ (unsigned long)(p))
 
+/* This define will cause callMethodV and callMethodA to avoid
+   introducing unused slots after jlongs and jdoubles.  */
+#ifndef NO_HOLES
+# define NO_HOLES 1
+#endif
+
+/* This define will cause callMethodV and callMethodA to promote every
+   integer type to a 64bit word, and every float to double, so that
+   every value can be loaded as a single 64bit word.  It also causes
+   float arguments to be marked as 'D'.  */
+#ifndef PROMOTE_TO_64bits
+# define PROMOTE_TO_64bits 1
+#endif
+ 
+#ifndef PROMOTE_jfloat2jdouble
+# define PROMOTE_jfloat2jdouble 0
+#endif
+
 #if defined(NEED_sysdepCallMethod)
 #include "sysdepCallMethod.h"
 #endif /* defined(NEED_sysdepCallMethod) */
Index: kaffe/config/x86_64/sysdepCallMethod.h
diff -u kaffe/config/x86_64/sysdepCallMethod.h:1.3 kaffe/config/x86_64/sysdepCallMethod.h:1.4
--- kaffe/config/x86_64/sysdepCallMethod.h:1.3	Sun Aug 22 18:30:38 2004
+++ kaffe/config/x86_64/sysdepCallMethod.h	Sun Oct 24 23:20:09 2004
@@ -12,24 +12,6 @@
 /* Needed for callMethodInfo declaration */
 #include "support.h"
 
-/* This define will cause callMethodV and callMethodA to avoid
-   introducing unused slots after jlongs and jdoubles.  */
-#ifndef NO_HOLES
-# define NO_HOLES 1
-#endif
-
-/* This define will cause callMethodV and callMethodA to promote every
-   integer type to a 64bit word, and every float to double, so that
-   every value can be loaded as a single 64bit word.  It also causes
-   float arguments to be marked as 'D'.  */
-#ifndef PROMOTE_TO_64bits
-# define PROMOTE_TO_64bits 1
-#endif
- 
-#ifndef PROMOTE_jfloat2jdouble
-# define PROMOTE_jfloat2jdouble 0
-#endif
-
 /* ARG_TYPE is the type of a register used for passing arguments.  */
 #define ARG_TYPE        long