From: Christian Thalinger <twisti@complang.tuwien.ac.at>
Date: Thu, 14 Feb 2008 08:22:26 +0000 (+0100)
Subject: * Merged with fd492236e7ac.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=d7232ea078260f6e54f9a2ca706019e566eb2952;hp=dba5e132daca255ec44f67e31c8c718633a006e9;p=cacao.git

* Merged with fd492236e7ac.
---

diff --git a/src/vm/jit/m68k/md.c b/src/vm/jit/m68k/md.c
index b9b6e33bf..9fb12da0c 100644
--- a/src/vm/jit/m68k/md.c
+++ b/src/vm/jit/m68k/md.c
@@ -111,6 +111,35 @@ void *md_jit_method_patch_address(void *pv, void *ra, void *mptr)
 	return pa;
 }
 
+void *md_stacktrace_get_returnaddress(void *sp, int32_t stackframesize)
+{
+	void *ra;
+
+	/* return address is above stackpointer */
+
+	ra = *((void **) (((uintptr_t) sp) + stackframesize));
+	
+	/* XXX: This helps for now, but it's a ugly hack
+	 * the problem _may_ be: the link instruction is used
+	 * by some gcc generated code, and we get an additional word
+	 * on the stack, the old framepointer. Its address is somewhere
+	 * near sp, but that all depends the code generated by the compiler.
+	 * I'm unsure about a clean solution.
+	 */
+#if 0
+	if (!(ra > 0x40000000 && ra < 0x80000000))      {
+	        ra = *((u1**)(sp + framesize + 4));
+	}
+#endif
+
+	/* assert(ra > 0x40000000 && ra < 0x80000000);
+	printf("XXXXXX=%x\n", ra);
+	 */
+
+	return ra;
+}
+
+
 
 /*
  * These are local overrides for various environment variables in Emacs.
diff --git a/src/vm/jit/m68k/md.h b/src/vm/jit/m68k/md.h
index de87abbb1..3ef67014e 100644
--- a/src/vm/jit/m68k/md.h
+++ b/src/vm/jit/m68k/md.h
@@ -43,33 +43,7 @@
 
 *******************************************************************************/
 
-inline static void *md_stacktrace_get_returnaddress(void *sp, int32_t stackframesize)
-{
-	void *ra;
-
-	/* return address is above stackpointer */
-
-	ra = *((void **) (((uintptr_t) sp) + stackframesize));
-	
-	/* XXX: This helps for now, but it's a ugly hack
-	 * the problem _may_ be: the link instruction is used
-	 * by some gcc generated code, and we get an additional word
-	 * on the stack, the old framepointer. Its address is somewhere
-	 * near sp, but that all depends the code generated by the compiler.
-	 * I'm unsure about a clean solution.
-	 */
-#if 0
-	if (!(ra > 0x40000000 && ra < 0x80000000))      {
-	        ra = *((u1**)(sp + framesize + 4));
-	}
-#endif
-
-	/* assert(ra > 0x40000000 && ra < 0x80000000);
-	printf("XXXXXX=%x\n", ra);
-	 */
-
-	return ra;
-}
+void *md_stacktrace_get_returnaddress(void *sp, int32_t stackframesize);
 
 
 /* md_codegen_get_pv_from_pc ***************************************************
diff --git a/src/vm/vm.c b/src/vm/vm.c
index 6b79bedfd..cf483f1d4 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -620,22 +620,12 @@ static void XXusage(void)
 static void version(bool opt_exit)
 {
 	puts("java version \""JAVA_VERSION"\"");
-	puts("CACAO version "VERSION"");
-
-	puts("Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,");
-	puts("C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,");
-	puts("E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,");
-	puts("J. Wenninger, Institut f. Computersprachen - TU Wien\n");
-
-	puts("This program is free software; you can redistribute it and/or");
-	puts("modify it under the terms of the GNU General Public License as");
-	puts("published by the Free Software Foundation; either version 2, or (at");
-	puts("your option) any later version.\n");
-
-	puts("This program is distributed in the hope that it will be useful, but");
-	puts("WITHOUT ANY WARRANTY; without even the implied warranty of");
-	puts("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU");
-	puts("General Public License for more details.");
+	puts("CACAO version "VERSION"\n");
+
+	puts("Copyright (C) 1996-2005, 2006, 2007, 2008");
+	puts("CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO");
+	puts("This is free software; see the source for copying conditions.  There is NO");
+	puts("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 
 	/* exit normally, if requested */