AMD64:
1) kaffe-support-cpp-2.diff: 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
using defined().
2) kaffe-promote-holes.diff: Move PROMOTE_* / NO_HOLES to common.h
instead of sysdepCallMethod.h (sysdepCallMethod isn't always included by
common.h)
Warnings:
3) kaffe-stackTrace-proto.diff: kaffe/kaffevm/exception.c uses
printStackTrace, so prototype it publically.
4) kaffe-support.h-replacechar.diff: it's defined only statically, so
remove from public header
5) kaffe-verify3a.c.diff: Fixes some prototype-related warnings by
including relevant headers.
Cleanup:
6) kaffe-internalthreadsdefs.diff: USE_INTERNAL_THREADS appears to be
unused, so gc it from config/
With no patches or all but #2, I have 12/144 regression test failures.
With #2 thrown in the mix, I'm down to 4 errors and I can run my
classes. (no printf diffs were needed, since fixing arg passing means
printf doesn't get absurd arguments on a regular basis).
--
Eric Anholt [EMAIL PROTECTED]
http://people.freebsd.org/~anholt/ [EMAIL PROTECTED]
? config/callKaffeException.h
? config/x86_64/freebsd2-orig
Index: config/alpha/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/alpha/threads.h,v
retrieving revision 1.5
diff -u -r1.5 threads.h
--- config/alpha/threads.h 11 Jun 2004 18:38:34 -0000 1.5
+++ config/alpha/threads.h 22 Oct 2004 05:49:29 -0000
@@ -12,11 +12,6 @@
#ifndef __alpha_threads_h
#define __alpha_threads_h
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
#if defined(INTERPRETER)
#define THREADSTACKSIZE (128 * 1024)
#else
Index: config/arm/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/arm/threads.h,v
retrieving revision 1.4
diff -u -r1.4 threads.h
--- config/arm/threads.h 11 Jun 2004 18:38:35 -0000 1.4
+++ config/arm/threads.h 22 Oct 2004 05:49:29 -0000
@@ -12,11 +12,6 @@
#ifndef __arm32_threads_h
#define __arm32_threads_h
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
#define THREADSTACKSIZE (64 * 1024)
/*
Index: config/i386/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/i386/threads.h,v
retrieving revision 1.3
diff -u -r1.3 threads.h
--- config/i386/threads.h 11 Jun 2004 18:38:36 -0000 1.3
+++ config/i386/threads.h 22 Oct 2004 05:49:29 -0000
@@ -12,11 +12,6 @@
#ifndef __i386_threads_h
#define __i386_threads_h
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
/*
* Set a default size for the stack.
*/
Index: config/ia64/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/ia64/threads.h,v
retrieving revision 1.1
diff -u -r1.1 threads.h
--- config/ia64/threads.h 29 May 2002 19:49:58 -0000 1.1
+++ config/ia64/threads.h 22 Oct 2004 05:49:29 -0000
@@ -12,11 +12,6 @@
#ifndef __ia64_threads_h
#define __ia64_threads_h
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
/*
* Set a default size for the stack.
* Includes register stack size
Index: config/m68k/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/m68k/threads.h,v
retrieving revision 1.3
diff -u -r1.3 threads.h
--- config/m68k/threads.h 11 Jun 2004 18:38:37 -0000 1.3
+++ config/m68k/threads.h 22 Oct 2004 05:49:29 -0000
@@ -12,11 +12,6 @@
#ifndef __m68k_threads_h
#define __m68k_threads_h
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
/*
* Set a default size for the stack.
*/
Index: config/mips/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/mips/threads.h,v
retrieving revision 1.7
diff -u -r1.7 threads.h
--- config/mips/threads.h 7 Jul 2004 19:34:25 -0000 1.7
+++ config/mips/threads.h 22 Oct 2004 05:49:29 -0000
@@ -16,11 +16,6 @@
#include <sgidefs.h>
#endif /* defined(HAVE_SGIDEFS_H) */
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
#if defined(INTERPRETER)
#if !defined(_MIPS_SIM) || (_MIPS_SIM == _MIPS_SIM_ABI32)
#define THREADSTACKSIZE (64 * 1024)
Index: config/mips/ultrix4/md.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/mips/ultrix4/md.h,v
retrieving revision 1.2
diff -u -r1.2 md.h
--- config/mips/ultrix4/md.h 13 Dec 2003 19:31:29 -0000 1.2
+++ config/mips/ultrix4/md.h 22 Oct 2004 05:49:30 -0000
@@ -17,11 +17,6 @@
#include "mips/sysdepCallMethod.h"
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
#define THREADSTACKSIZE (32 * 1024)
/*
Index: config/parisc/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/parisc/threads.h,v
retrieving revision 1.4
diff -u -r1.4 threads.h
--- config/parisc/threads.h 11 Jun 2004 18:38:39 -0000 1.4
+++ config/parisc/threads.h 22 Oct 2004 05:49:30 -0000
@@ -15,11 +15,6 @@
/* Stacks grow up on the PARISC */
#define STACK_GROWS_UP 1
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
/* Not sure on this... */
#define THREADSTACKSIZE (64 * 1024)
Index: config/powerpc/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/powerpc/threads.h,v
retrieving revision 1.2
diff -u -r1.2 threads.h
--- config/powerpc/threads.h 25 Jul 2000 18:38:27 -0000 1.2
+++ config/powerpc/threads.h 22 Oct 2004 05:49:30 -0000
@@ -12,11 +12,6 @@
#ifndef __powerpc_threads_h
#define __powerpc_threads_h
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
#define THREADSTACKSIZE (128 * 1024)
/*
Index: config/s390/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/s390/threads.h,v
retrieving revision 1.2
diff -u -r1.2 threads.h
--- config/s390/threads.h 11 Jun 2004 18:38:40 -0000 1.2
+++ config/s390/threads.h 22 Oct 2004 05:49:30 -0000
@@ -12,11 +12,6 @@
#ifndef __s390_threads_h
#define __s390_threads_h
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
/*
* Set a default size for the stack.
*/
Index: config/sh/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/sh/threads.h,v
retrieving revision 1.1
diff -u -r1.1 threads.h
--- config/sh/threads.h 14 Jul 2004 14:37:34 -0000 1.1
+++ config/sh/threads.h 22 Oct 2004 05:49:30 -0000
@@ -12,11 +12,6 @@
#if ! defined(__sh_threads_h)
#define __sh_threads_h
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
/*
* Set a default size for the stack.
*/
Index: config/sparc/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/sparc/threads.h,v
retrieving revision 1.3
diff -u -r1.3 threads.h
--- config/sparc/threads.h 11 Jun 2004 18:38:40 -0000 1.3
+++ config/sparc/threads.h 22 Oct 2004 05:49:30 -0000
@@ -12,11 +12,6 @@
#ifndef __sparc_threads_h
#define __sparc_threads_h
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
#if defined(INTERPRETER)
#define THREADSTACKSIZE (96 * 1024)
#else
Index: config/x86_64/threads.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/x86_64/threads.h,v
retrieving revision 1.2
diff -u -r1.2 threads.h
--- config/x86_64/threads.h 11 Jun 2004 18:38:41 -0000 1.2
+++ config/x86_64/threads.h 22 Oct 2004 05:49:30 -0000
@@ -12,11 +12,6 @@
#ifndef __x86_64_threads_h
#define __x86_64_threads_h
-/**/
-/* Thread handling */
-/**/
-#define USE_INTERNAL_THREADS
-
/*
* Set a default size for the stack.
*/
Index: config/x86_64/common.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/x86_64/common.h,v
retrieving revision 1.2
diff -u -r1.2 common.h
--- config/x86_64/common.h 11 Jun 2004 16:48:59 -0000 1.2
+++ config/x86_64/common.h 22 Oct 2004 04:46:25 -0000
@@ -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: config/x86_64/sysdepCallMethod.h
===================================================================
RCS file: /cvs/kaffe/kaffe/config/x86_64/sysdepCallMethod.h,v
retrieving revision 1.3
diff -u -r1.3 sysdepCallMethod.h
--- config/x86_64/sysdepCallMethod.h 22 Aug 2004 18:30:38 -0000 1.3
+++ config/x86_64/sysdepCallMethod.h 22 Oct 2004 04:46:25 -0000
@@ -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
Index: kaffe/kaffevm/stackTrace.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/stackTrace.c,v
retrieving revision 1.37
diff -u -r1.37 stackTrace.c
--- kaffe/kaffevm/stackTrace.c 17 Jul 2004 07:57:14 -0000 1.37
+++ kaffe/kaffevm/stackTrace.c 22 Oct 2004 04:46:25 -0000
@@ -44,7 +44,6 @@
static Method*
stacktraceFindMethod (uintp fp, uintp pc);
HArrayOfObject* getStackTraceElements(struct Hjava_lang_VMThrowable*, struct Hjava_lang_Throwable*);
-void printStackTrace(struct Hjava_lang_Throwable*, struct Hjava_lang_Object*, int);
Hjava_lang_Object*
buildStackTrace(struct _exceptionFrame* base)
Index: kaffe/kaffevm/stackTrace.h
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/stackTrace.h,v
retrieving revision 1.13
diff -u -r1.13 stackTrace.h
--- kaffe/kaffevm/stackTrace.h 27 Jul 2003 16:53:47 -0000 1.13
+++ kaffe/kaffevm/stackTrace.h 22 Oct 2004 04:46:25 -0000
@@ -30,5 +30,6 @@
#define ENDOFSTACK ((struct _methods*)-1)
Hjava_lang_Object* buildStackTrace(struct _exceptionFrame*);
+void printStackTrace(struct Hjava_lang_Throwable*, struct Hjava_lang_Object*, int);
#endif
Index: kaffe/kaffevm/support.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/support.c,v
retrieving revision 1.74
diff -u -r1.74 support.c
--- kaffe/kaffevm/support.c 12 Oct 2004 17:00:10 -0000 1.74
+++ kaffe/kaffevm/support.c 22 Oct 2004 06:57:43 -0000
@@ -310,9 +310,22 @@
# endif
#endif
+/* Make sure that undefined macros are defined as 0 */
+#if !defined(PROMOTE_jfloat2jdouble)
+#define PROMOTE_jfloat2jdouble 0
+#endif
+
+#if !defined(PROMOTE_jint2jlong)
+#define PROMOTE_jint2jlong 0
+#endif
+
+#if !defined(NO_HOLES)
+#define NO_HOLES 0
+#endif
+
/* If PROMOTE_jint2jlong is enabled, all integer values are to be
passed as jlongs. It is only set by PROMOTE_TO_64bits. */
-#if defined(PROMOTE_jint2jlong)
+#if PROMOTE_jint2jlong
# define PROM_i j
#else
# define PROM_i i
@@ -323,7 +336,7 @@
be marked as 'D'. No known port uses this. In fact, alpha must
explicitly set it to 0, to prevent PROMOTE_TO_64bits from enabling
it. */
-#if defined(PROMOTE_jfloat2jdouble)
+#if PROMOTE_jfloat2jdouble
# define PROM_f d
#else
# define PROM_f f
@@ -334,7 +347,7 @@
padding integer argument. The argument DO is used to adjust the
input argument list. */
#if defined(ALIGN_AT_64bits)
-# if defined(NO_HOLES)
+# if NO_HOLES
# error "ALIGN_AT_64bits is incompatible with NO_HOLES"
# endif
# define ENSURE_ALIGN64(DO) do { \
@@ -351,15 +364,6 @@
#else
# define ENSURE_ALIGN64(DO) do {} while (0)
#endif
-
-/* Finally, make sure that undefined symbols are defined as 0 */
-#if ! defined(PROMOTE_jfloat2jdouble)
-#define PROMOTE_jfloat2jdouble 0
-#endif /* ! defined(PROMOTE_jfloat2jdouble) */
-
-#if ! defined(NO_HOLES)
-#define NO_HOLES 0
-#endif /* ! defined(NO_HOLES) */
/**
* Generic routine to call a native or Java method (array style).
Index: kaffe/kaffevm/support.h
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/support.h,v
retrieving revision 1.33
diff -u -r1.33 support.h
--- kaffe/kaffevm/support.h 19 Aug 2004 19:29:02 -0000 1.33
+++ kaffe/kaffevm/support.h 22 Oct 2004 04:46:25 -0000
@@ -131,7 +131,6 @@
extern int addClasspath(const char*);
extern int prependClasspath(const char*);
-void replacechar(const char* from, char* to, char old, char newch);
void classname2pathname(const char* from, char* to);
void pathname2classname(const char* from, char* to);
int bitCount(int bits);
Index: kaffe/kaffevm/verifier/verify3a.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/verifier/verify3a.c,v
retrieving revision 1.2
diff -u -r1.2 verify3a.c
--- kaffe/kaffevm/verifier/verify3a.c 17 Jul 2004 07:57:36 -0000 1.2
+++ kaffe/kaffevm/verifier/verify3a.c 22 Oct 2004 04:46:25 -0000
@@ -21,6 +21,8 @@
#include "errors.h"
#include "debug.h"
#include "gc.h"
+#include "lookup.h"
+#include "soft.h"
#include "verify.h"
#include "verify-block.h"
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
