[kaffe] CVS kaffe (robilad): Simplified trampoline files

Kaffe CVS cvs-commits at kaffe.org
Wed Jun 29 10:29:05 PDT 2005


PatchSet 6671 
Date: 2005/06/29 17:23:32
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Simplified trampoline files

Members: 
	ChangeLog:1.4196->1.4197 
	config/alpha/trampolines.S:1.2->1.3 
	config/arm/trampolines.S:1.2->1.3 
	config/i386/trampolines.S:1.2->1.3 
	config/m68k/trampolines.S:1.2->1.3 
	config/mips/trampolines.S:1.3->1.4 
	config/powerpc/trampolines.S:1.2->1.3 
	config/sh/trampolines.S:1.3->1.4 
	config/sparc/trampolines.S:1.2->1.3 
	include/kaffe/trampoline.h:INITIAL->1.1 
	kaffe/kaffevm/jit/Makefile.am:INITIAL->1.20 
	kaffe/kaffevm/jit/Makefile.in:1.144->1.145 
	kaffe/kaffevm/jit3/Makefile.am:INITIAL->1.15 
	kaffe/kaffevm/jit3/Makefile.in:1.115->1.116 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4196 kaffe/ChangeLog:1.4197
--- kaffe/ChangeLog:1.4196	Wed Jun 29 11:37:45 2005
+++ kaffe/ChangeLog	Wed Jun 29 17:23:32 2005
@@ -1,3 +1,23 @@
+2005-06-29  Dalibor Topic  <robilad at kaffe.org>
+
+        * include/kaffe/trampoline.h: New file, with code shared
+	by all trampoline implementations.
+
+        * config/alpha/trampolines.S,
+        config/arm/trampolines.S,
+        config/i386/trampolines.S,
+        config/m68k/trampolines.S,
+        config/mips/trampolines.S,
+        config/powerpc/trampolines.S,
+        config/sh/trampolines.S,
+        config/sparc/trampolines.S:
+	Include kaffe/trampoline.h.
+
+        * kaffe/kaffevm/jit3/Makefile.am,
+        kaffe/kaffevm/jit/Makefile.am:
+	(AM_CCASFLAGS) Added ENGINE_DEFS and include
+	directory to includes.
+
 2005-06-29  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* config/alpha/trampolines.S,
@@ -17,9 +37,7 @@
 	* configure.ac (DLOPEN_JAVA_LIBS): Removed libclasspath and 
 	libfdlibm.
 
-	2005-05-19  Dalibor Topic  <robilad at kaffe.org>
-
-	libraries/clib/classpath/Makefile.am,
+	* libraries/clib/classpath/Makefile.am,
 	libraries/clib/fdlibm/Makefile.am,
 	replace/Makefile.am:
 	(AM_LDFLAGS) Removed -module. Build as convenience libraries.
Index: kaffe/config/alpha/trampolines.S
diff -u kaffe/config/alpha/trampolines.S:1.2 kaffe/config/alpha/trampolines.S:1.3
--- kaffe/config/alpha/trampolines.S:1.2	Wed Jun 29 11:37:48 2005
+++ kaffe/config/alpha/trampolines.S	Wed Jun 29 17:23:35 2005
@@ -12,9 +12,7 @@
  * of this file.
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif /* defined(HAVE_CONFIG_H) */
+#include "kaffe/trampoline.h"
 
 #if defined(TRAMPOLINE_FUNCTION)
 /*
@@ -26,13 +24,6 @@
 /*
  * Otherwise we'll try to construct one.
  */
-#if !defined(C_FUNC_NAME)
-#if defined(HAVE_UNDERSCORED_C_NAMES)
-#define C_FUNC_NAME(FUNC) _ ## FUNC
-#else
-#define C_FUNC_NAME(FUNC) FUNC
-#endif
-#endif
 
      .text
      .align 3
Index: kaffe/config/arm/trampolines.S
diff -u kaffe/config/arm/trampolines.S:1.2 kaffe/config/arm/trampolines.S:1.3
--- kaffe/config/arm/trampolines.S:1.2	Wed Jun 29 11:37:48 2005
+++ kaffe/config/arm/trampolines.S	Wed Jun 29 17:23:35 2005
@@ -9,9 +9,7 @@
  * of this file.
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
+#include "kaffe/trampoline.h"
 
 #if defined(TRAMPOLINE_FUNCTION)
 /*
@@ -23,11 +21,6 @@
 /*
  * Otherwise we'll try to construct one.
  */
-#if defined(HAVE_UNDERSCORED_C_NAMES)
-#define	C_FUNC_NAME(FUNC) _ ## FUNC
-#else
-#define	C_FUNC_NAME(FUNC) FUNC
-#endif
 
 #if defined(NO_SHARED_VMLIBRARY)
 
Index: kaffe/config/i386/trampolines.S
diff -u kaffe/config/i386/trampolines.S:1.2 kaffe/config/i386/trampolines.S:1.3
--- kaffe/config/i386/trampolines.S:1.2	Wed Jun 29 11:37:51 2005
+++ kaffe/config/i386/trampolines.S	Wed Jun 29 17:23:38 2005
@@ -9,9 +9,7 @@
  * of this file. 
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
+#include "kaffe/trampoline.h"
 	
 #if defined(TRAMPOLINE_FUNCTION)
 /*
@@ -23,11 +21,6 @@
 /*
  * Otherwise we'll try to construct one.
  */
-#if defined(HAVE_UNDERSCORED_C_NAMES)
-#define	C_FUNC_NAME(FUNC) _ ## FUNC
-#else
-#define	C_FUNC_NAME(FUNC) FUNC
-#endif
 
      .text
      .align 4
Index: kaffe/config/m68k/trampolines.S
diff -u kaffe/config/m68k/trampolines.S:1.2 kaffe/config/m68k/trampolines.S:1.3
--- kaffe/config/m68k/trampolines.S:1.2	Wed Jun 29 11:37:52 2005
+++ kaffe/config/m68k/trampolines.S	Wed Jun 29 17:23:38 2005
@@ -14,9 +14,7 @@
  *	to use linux's assembler syntax to support both linux/netbsd.
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
+#include "kaffe/trampoline.h"
 
 #if defined(TRAMPOLINE_FUNCTION)
 /*
@@ -28,11 +26,6 @@
 /*
  * Otherwise we'll try to construct one.
  */
-#if defined(HAVE_UNDERSCORED_C_NAMES)
-#define C_FUNC_NAME(FUNC) _ ## FUNC
-#else
-#define C_FUNC_NAME(FUNC) FUNC
-#endif
 
 #if defined(__ELF__)
 
Index: kaffe/config/mips/trampolines.S
diff -u kaffe/config/mips/trampolines.S:1.3 kaffe/config/mips/trampolines.S:1.4
--- kaffe/config/mips/trampolines.S:1.3	Wed Jun 29 11:37:52 2005
+++ kaffe/config/mips/trampolines.S	Wed Jun 29 17:23:38 2005
@@ -9,9 +9,7 @@
  * of this file. 
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
+#include "kaffe/trampoline.h"
 
 #if defined(TRAMPOLINE_FUNCTION)
 /*
@@ -23,11 +21,6 @@
 /*
  * Otherwise we'll try to construct one.
  */
-#if defined(HAVE_UNDERSCORED_C_NAMES)
-#define C_FUNC_NAME(FUNC) _ ## FUNC
-#else
-#define C_FUNC_NAME(FUNC) FUNC
-#endif
 
 	.text
 	.align	4
Index: kaffe/config/powerpc/trampolines.S
diff -u kaffe/config/powerpc/trampolines.S:1.2 kaffe/config/powerpc/trampolines.S:1.3
--- kaffe/config/powerpc/trampolines.S:1.2	Mon Mar 21 01:21:40 2005
+++ kaffe/config/powerpc/trampolines.S	Wed Jun 29 17:23:39 2005
@@ -3,11 +3,9 @@
  *
  */
 
-/* include common ppc asm syntax header */
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
+#include "kaffe/trampoline.h"
 
+/* include common ppc asm syntax header */
 #if defined(HAVE_ASM_PPC_ASM_H)
 #include <asm/ppc_asm.h>
 #endif /* defined(HAVE_ASM_PPC_ASM_H) */
@@ -22,11 +20,6 @@
 /*
  * Otherwise we'll try to construct one.
  */
-#if defined(HAVE_UNDERSCORED_C_NAMES)
-#define	C_FUNC_NAME(FUNC) _FUNC
-#else
-#define	C_FUNC_NAME(FUNC) FUNC
-#endif
 
 .text
 .align 2
Index: kaffe/config/sh/trampolines.S
diff -u kaffe/config/sh/trampolines.S:1.3 kaffe/config/sh/trampolines.S:1.4
--- kaffe/config/sh/trampolines.S:1.3	Wed Jun 29 11:37:52 2005
+++ kaffe/config/sh/trampolines.S	Wed Jun 29 17:23:39 2005
@@ -9,9 +9,7 @@
  * of this file. 
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
+#include "kaffe/trampoline.h"
 
 #if defined(TRAMPOLINE_FUNCTION)
 /*
@@ -23,11 +21,6 @@
 /*
  * Otherwise we'll try to construct one.
  */
-#if defined(HAVE_UNDERSCORED_C_NAMES)
-#define C_FUNC_NAME(FUNC) _ ## FUNC
-#else
-#define C_FUNC_NAME(FUNC) FUNC
-#endif
 
     .text
     .align 4
Index: kaffe/config/sparc/trampolines.S
diff -u kaffe/config/sparc/trampolines.S:1.2 kaffe/config/sparc/trampolines.S:1.3
--- kaffe/config/sparc/trampolines.S:1.2	Wed Jun 29 11:37:53 2005
+++ kaffe/config/sparc/trampolines.S	Wed Jun 29 17:23:39 2005
@@ -9,9 +9,7 @@
  * of this file. 
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif /* defined(HAVE_CONFIG_H) */
+#include "kaffe/trampoline.h"
 
 #if defined(TRAMPOLINE_FUNCTION)
 /*
@@ -23,11 +21,6 @@
 /*
  * Otherwise we'll try to construct one.
  */
-#if defined(HAVE_UNDERSCORED_C_NAMES)
-#define C_FUNC_NAME(FUNC) _ ## FUNC
-#else
-#define C_FUNC_NAME(FUNC) FUNC
-#endif
 
     .text
     .align 4
===================================================================
Checking out kaffe/include/kaffe/trampoline.h
RCS:  /home/cvs/kaffe/kaffe/include/kaffe/trampoline.h,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/include/kaffe/trampoline.h	Wed Jun 29 17:29:04 2005
@@ -0,0 +1,30 @@
+/*
+ * kaffe/trampoline.h
+ * Common trampoline macros.
+ *
+ * Copyright (c) 1996, 1997
+ *	Transvirtual Technologies, Inc.  All rights reserved.
+ * 
+ * Copyright (c) 2005
+ *      Kaffe.org developers. See ChangeLog for details.
+ *
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file. 
+ */
+
+#if !defined(KAFFE_TRAMPOLINE_H)
+#define KAFFE_TRAMPOLINE_H
+
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
+#if !defined(C_FUNC_NAME)	
+#if defined(HAVE_UNDERSCORED_C_NAMES)
+#define	C_FUNC_NAME(FUNC) _ ## FUNC
+#else
+#define	C_FUNC_NAME(FUNC) FUNC
+#endif
+#endif 
+
+#endif /* !defined(KAFFE_TRAMPOLINE_H) */
===================================================================
Checking out kaffe/kaffe/kaffevm/jit/Makefile.am
RCS:  /home/cvs/kaffe/kaffe/kaffe/kaffevm/jit/Makefile.am,v
VERS: 1.20
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/kaffe/kaffevm/jit/Makefile.am	Wed Jun 29 17:29:05 2005
@@ -0,0 +1,87 @@
+# Makefile.in for kaffevm JIT compiler
+#
+# Copyright (c) 1996, 1997, 1998, 1999
+#	Transvirtual Technologies, Inc.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution 
+# of this file. 
+
+ at engine_frag@
+
+AM_CPPFLAGS = \
+	      -I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \
+	      -I$(top_srcdir)/kaffe/kaffevm/jni \
+	      -I.. \
+	      -I$(srcdir)/.. \
+	      $(ENGINE_DEFS) \
+	      -I$(top_builddir)/include
+
+AM_CCASFLAGS = \
+	$(DEFS) \
+	$(ENGINE_DEFS)
+	$(DEFAULT_INCLUDES) \
+	$(INCLUDES) \
+	-I$(top_srcdir)/include
+
+noinst_LTLIBRARIES = libengine.la
+
+libengine_la_LDFLAGS = \
+	$(KVMLIBFLAGS)
+
+libengine_la_SOURCES = \
+	basecode.c \
+	constpool.c \
+	funcs.c \
+	icode.c \
+	labels.c \
+	registers.c \
+	slots.c \
+	machine.c \
+	seq.c \
+	native-wrapper.c \
+	methodcalls.c
+
+BUILT_SOURCES = \
+	trampolines.S
+
+nodist_libengine_la_SOURCES = \
+	trampolines.S
+
+EXTRA_DIST = \
+	Makefile.frag \
+	basecode.h \
+	checks.h \
+	codeproto.h \
+	constpool.h \
+	icode_internal.h \
+	labels.h \
+	machine.h \
+	registers.h \
+	seq.h \
+	slots.h \
+	stackTrace-impl.h \
+	native-wrapper.h \
+	methodcalls.h
+
+DISTCLEANFILES = icode.h jit.def trampolines.S
+
+basecode.lo icode.lo machine.lo registers.lo: icode.h
+funcs.lo: jit.def trampolines.S
+
+icode.h: stamp-h01
+	@if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
+	else :; fi
+stamp-h01: $(top_builddir)/config.status
+	$(SHELL) $(REGEN_FORWARD) $(KAFFEVM_ICODE_H) icode.h $@
+
+jit.def: stamp-h02
+	@if test ! -f $@; then rm -f stamp-h02; $(MAKE) stamp-h02; \
+	else :; fi
+stamp-h02: $(top_builddir)/config.status
+	$(SHELL) $(REGEN_FORWARD) $(KAFFEVM_JIT_DEF) jit.def $@
+
+trampolines.S: stamp-h03
+	@if test ! -f $@; then rm -f stamp-h03; $(MAKE) stamp-h03; \
+	else :; fi
+stamp-h03: $(top_builddir)/config.status
+	$(SHELL) $(REGEN_FORWARD) $(KAFFEVM_TRAMPOLINES_S) trampolines.S $@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.144 kaffe/kaffe/kaffevm/jit/Makefile.in:1.145
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.144	Sat May 14 21:46:34 2005
+++ kaffe/kaffe/kaffevm/jit/Makefile.in	Wed Jun 29 17:23:40 2005
@@ -387,8 +387,7 @@
 
 AM_CCASFLAGS = \
 	$(DEFS) \
-	$(DEFAULT_INCLUDES) \
-	$(INCLUDES)
+	$(ENGINE_DEFS)
 
 noinst_LTLIBRARIES = libengine.la
 libengine_la_LDFLAGS = \
@@ -706,6 +705,9 @@
 
 
 @engine_frag@
+	$(DEFAULT_INCLUDES) \
+	$(INCLUDES) \
+	-I$(top_srcdir)/include
 
 basecode.lo icode.lo machine.lo registers.lo: icode.h
 funcs.lo: jit.def trampolines.S
===================================================================
Checking out kaffe/kaffe/kaffevm/jit3/Makefile.am
RCS:  /home/cvs/kaffe/kaffe/kaffe/kaffevm/jit3/Makefile.am,v
VERS: 1.15
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/kaffe/kaffevm/jit3/Makefile.am	Wed Jun 29 17:29:05 2005
@@ -0,0 +1,94 @@
+# Makefile.in for kaffevm JIT3 compiler
+#
+# Copyright (c) 1996, 1997, 1998, 1999
+#	Transvirtual Technologies, Inc.  All rights reserved.
+#
+# See the file "license.terms" for information on usage and redistribution 
+# of this file. 
+
+ at engine_frag@
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \
+	-I$(top_srcdir)/kaffe/kaffevm/jni \
+	-I.. \
+	-I$(srcdir)/.. \
+	$(ENGINE_DEFS) \
+	-I$(top_srcdir)/kaffe/xprof \
+	-I$(top_srcdir)/kaffe/jvmpi \
+	-I$(top_builddir)/include
+
+AM_CCASFLAGS = \
+	$(DEFS) \
+	$(ENGINE_DEFS) \
+	$(DEFAULT_INCLUDES) \
+	$(INCLUDES) \
+	-I$(top_srcdir)/include
+
+noinst_LTLIBRARIES = libengine.la
+
+libengine_la_LDFLAGS = \
+	$(KVMLIBFLAGS)
+
+libengine_la_SOURCES = \
+	basecode.c \
+	basecode.h \
+	checks.h \
+	codeproto.h \
+	constpool.c \
+	constpool.h \
+	funcs.c \
+	funcs.h \
+	icode.c \
+	labels.c \
+	labels.h \
+	machine.c \
+	machine.h \
+	registers.c \
+	registers.h \
+	seq.c \
+	seq.h \
+	slots.c \
+	slots.h \
+	stackTrace-impl.h \
+	native-wrapper.c \
+	native-wrapper.h \
+	methodcalls.c \
+	methodcalls.h
+
+BUILT_SOURCES = \
+	trampolines.S
+
+nodist_libengine_la_SOURCES = \
+	trampolines.S
+
+EXTRA_DIST = \
+	Makefile.frag
+
+DISTCLEANFILES = icode.h jit.def trampolines.S stamp-h01 stamp-h02 stamp-h03
+
+basecode.lo icode.lo machine.lo registers.lo: icode.h
+funcs.lo: jit.def trampolines.S
+
+icode.h: stamp-h01
+	@if test ! -f $@; then rm -f stamp-h01; $(MAKE) stamp-h01; \
+	else :; fi
+stamp-h01: $(top_builddir)/config.status
+	$(SHELL) $(REGEN_FORWARD) $(KAFFEVM_ICODE_H) icode.h $@
+
+jit.def: stamp-h02
+	@if test ! -f $@; then rm -f stamp-h02; $(MAKE) stamp-h02; \
+	else :; fi
+stamp-h02: $(top_builddir)/config.status
+	$(SHELL) $(REGEN_FORWARD) $(KAFFEVM_JIT_DEF) jit.def $@
+
+trampolines.S: stamp-h03
+	@if test ! -f $@; then rm -f stamp-h03; $(MAKE) stamp-h03; \
+	else :; fi
+stamp-h03: $(top_builddir)/config.status
+	$(SHELL) $(REGEN_FORWARD) $(KAFFEVM_TRAMPOLINES_S) trampolines.S $@
+
+dist-hook:
+	@for file in $(DISTCLEANFILES); do \
+	  rm -f $(distdir)/$$file; \
+	done
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.115 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.116
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.115	Sat May 14 21:46:35 2005
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in	Wed Jun 29 17:23:40 2005
@@ -389,8 +389,10 @@
 
 AM_CCASFLAGS = \
 	$(DEFS) \
+	$(ENGINE_DEFS) \
 	$(DEFAULT_INCLUDES) \
-	$(INCLUDES)
+	$(INCLUDES) \
+	-I$(top_srcdir)/include
 
 noinst_LTLIBRARIES = libengine.la
 libengine_la_LDFLAGS = \




More information about the kaffe mailing list