[kaffe] CVS kaffe (dalibor): Fixed xdebugging

Kaffe CVS cvs-commits at kaffe.org
Sat Sep 18 13:52:01 PDT 2004


PatchSet 5183 
Date: 2004/09/18 20:48:08
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed xdebugging

2004-09-18  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac: Use AC_DEFINE instead of messing
        with CFLAGS for xdebugging.

        * configure,
        config/config.h.in,
        kaffe/kaffe/Makefile.in:
        Regenerated.

        * kaffe/kaffe/Makefile.am:
        Cleaned up.

        * kaffe/xprof/callGraph.c,
        kaffe/xprof/debugFile.c,
        kaffe/xprof/feedback.c,
        kaffe/xprof/fileSections.c,
        kaffe/xprof/gmonFile.c,
        kaffe/xprof/mangle.c,
        kaffe/xprof/memorySamples.c,
        kaffe/xprof/sectionFile.c,
        kaffe/xprof/xprofiler.c:
        Include config.h.

        Reported by: Daniel Bonniot  <bonniot at users.sourceforge.net>

Members: 
	ChangeLog:1.2738->1.2739 
	configure:1.385->1.386 
	configure.ac:1.82->1.83 
	config/config.h.in:1.125->1.126 
	kaffe/kaffe/Makefile.am:1.27->1.28 
	kaffe/kaffe/Makefile.in:1.147->1.148 
	kaffe/xprof/callGraph.c:1.4->1.5 
	kaffe/xprof/debugFile.c:1.3->1.4 
	kaffe/xprof/feedback.c:1.3->1.4 
	kaffe/xprof/fileSections.c:1.5->1.6 
	kaffe/xprof/gmonFile.c:1.3->1.4 
	kaffe/xprof/mangle.c:1.6->1.7 
	kaffe/xprof/memorySamples.c:1.6->1.7 
	kaffe/xprof/sectionFile.c:1.5->1.6 
	kaffe/xprof/xprofiler.c:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2738 kaffe/ChangeLog:1.2739
--- kaffe/ChangeLog:1.2738	Sat Sep 18 12:11:24 2004
+++ kaffe/ChangeLog	Sat Sep 18 20:48:08 2004
@@ -1,3 +1,29 @@
+2004-09-18  Dalibor Topic  <robilad at kaffe.org>
+
+	* configure.ac: Use AC_DEFINE instead of messing
+	with CFLAGS for xdebugging.
+
+	* configure,
+	config/config.h.in,
+	kaffe/kaffe/Makefile.in:
+	Regenerated.
+
+	* kaffe/kaffe/Makefile.am:
+	Cleaned up.
+
+	* kaffe/xprof/callGraph.c,
+	kaffe/xprof/debugFile.c,
+	kaffe/xprof/feedback.c,
+	kaffe/xprof/fileSections.c,
+	kaffe/xprof/gmonFile.c,
+	kaffe/xprof/mangle.c,
+	kaffe/xprof/memorySamples.c,
+	kaffe/xprof/sectionFile.c,
+	kaffe/xprof/xprofiler.c:
+	Include config.h.
+
+	Reported by: Daniel Bonniot  <bonniot at users.sourceforge.net>
+
 2004-09-17  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/java/security/Permission.java:
Index: kaffe/configure
diff -u kaffe/configure:1.385 kaffe/configure:1.386
--- kaffe/configure:1.385	Fri Sep 17 23:19:37 2004
+++ kaffe/configure	Sat Sep 18 20:48:09 2004
@@ -26906,7 +26906,13 @@
 
 case "$enable_xdebugging" in
 no) ;;
-*) need_libxprof=yes; CPPFLAGS="$CPPFLAGS -DKAFFE_XDEBUGGING"; JAVAC_FLAGS="-g $JAVAC_FLAGS";;
+*) need_libxprof=yes;
+JAVAC_FLAGS="-g $JAVAC_FLAGS";
+
+cat >>confdefs.h <<\_ACEOF
+#define KAFFE_XDEBUGGING 1
+_ACEOF
+;;
 esac
 
 else
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.82 kaffe/configure.ac:1.83
--- kaffe/configure.ac:1.82	Fri Sep 17 23:19:44 2004
+++ kaffe/configure.ac	Sat Sep 18 20:48:14 2004
@@ -543,7 +543,9 @@
 [
 case "$enable_xdebugging" in
 no) ;;
-*) need_libxprof=yes; CPPFLAGS="$CPPFLAGS -DKAFFE_XDEBUGGING"; JAVAC_FLAGS="-g $JAVAC_FLAGS";;
+*) need_libxprof=yes; 
+JAVAC_FLAGS="-g $JAVAC_FLAGS";
+AC_DEFINE(KAFFE_XDEBUGGING, 1, [Enable debugging symbol generation for jitted code]);;
 esac
 ],
 [
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.125 kaffe/config/config.h.in:1.126
--- kaffe/config/config.h.in:1.125	Tue Aug 24 11:34:46 2004
+++ kaffe/config/config.h.in	Sat Sep 18 20:48:15 2004
@@ -714,6 +714,9 @@
 /* Do we enable stats in the vm? */
 #undef KAFFE_STATS
 
+/* Enable debugging symbol generation for jitted code */
+#undef KAFFE_XDEBUGGING
+
 /* If the vm is static or all libraries are static */
 #undef NO_SHARED_VMLIBRARY
 
Index: kaffe/kaffe/kaffe/Makefile.am
diff -u kaffe/kaffe/kaffe/Makefile.am:1.27 kaffe/kaffe/kaffe/Makefile.am:1.28
--- kaffe/kaffe/kaffe/Makefile.am:1.27	Fri Jul 30 11:06:20 2004
+++ kaffe/kaffe/kaffe/Makefile.am	Sat Sep 18 20:48:16 2004
@@ -31,9 +31,9 @@
 	version.h
 
 LIBKAFFEVM = \
-	../kaffevm/libkaffevm.la \
+	$(libxprof) \
 	$(libjvmpi) \
-	$(libxprof)
+	../kaffevm/libkaffevm.la
 
 kaffe_bin_LDFLAGS = \
 	$(KVMBINFLAGS) \
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.147 kaffe/kaffe/kaffe/Makefile.in:1.148
--- kaffe/kaffe/kaffe/Makefile.in:1.147	Thu Sep 16 21:02:00 2004
+++ kaffe/kaffe/kaffe/Makefile.in	Sat Sep 18 20:48:16 2004
@@ -80,10 +80,10 @@
 am_kaffe_bin_OBJECTS = main.$(OBJEXT) version.$(OBJEXT)
 kaffe_bin_OBJECTS = $(am_kaffe_bin_OBJECTS)
 am__DEPENDENCIES_1 =
- at ENABLE_JVMPI_TRUE@am__DEPENDENCIES_2 = ../jvmpi/libkaffejvmpi.la
- at NEED_LIBXPROF_TRUE@am__DEPENDENCIES_3 = ../xprof/libkaffexprof.la
-am__DEPENDENCIES_4 = ../kaffevm/libkaffevm.la $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_3)
+ at NEED_LIBXPROF_TRUE@am__DEPENDENCIES_2 = ../xprof/libkaffexprof.la
+ at ENABLE_JVMPI_TRUE@am__DEPENDENCIES_3 = ../jvmpi/libkaffejvmpi.la
+am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+	../kaffevm/libkaffevm.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
@@ -381,9 +381,9 @@
 	version.h
 
 LIBKAFFEVM = \
-	../kaffevm/libkaffevm.la \
+	$(libxprof) \
 	$(libjvmpi) \
-	$(libxprof)
+	../kaffevm/libkaffevm.la
 
 kaffe_bin_LDFLAGS = \
 	$(KVMBINFLAGS) \
Index: kaffe/kaffe/xprof/callGraph.c
diff -u kaffe/kaffe/xprof/callGraph.c:1.4 kaffe/kaffe/xprof/callGraph.c:1.5
--- kaffe/kaffe/xprof/callGraph.c:1.4	Sun Sep 21 18:18:19 2003
+++ kaffe/kaffe/xprof/callGraph.c	Sat Sep 18 20:48:16 2004
@@ -13,6 +13,8 @@
  * University of Utah, http://www.cs.utah.edu/flux/
  */
 
+#include "config.h"
+
 #if defined(KAFFE_XPROFILER)
 
 #include <stdlib.h>
Index: kaffe/kaffe/xprof/debugFile.c
diff -u kaffe/kaffe/xprof/debugFile.c:1.3 kaffe/kaffe/xprof/debugFile.c:1.4
--- kaffe/kaffe/xprof/debugFile.c:1.3	Mon Mar  8 21:21:21 2004
+++ kaffe/kaffe/xprof/debugFile.c	Sat Sep 18 20:48:16 2004
@@ -13,6 +13,8 @@
  * University of Utah, http://www.cs.utah.edu/flux/
  */
 
+#include "config.h"
+
 #if defined(KAFFE_XDEBUGGING) || defined(KAFFE_XPROFILER)
 
 #include <stdarg.h>
Index: kaffe/kaffe/xprof/feedback.c
diff -u kaffe/kaffe/xprof/feedback.c:1.3 kaffe/kaffe/xprof/feedback.c:1.4
--- kaffe/kaffe/xprof/feedback.c:1.3	Mon May  7 10:04:03 2001
+++ kaffe/kaffe/xprof/feedback.c	Sat Sep 18 20:48:17 2004
@@ -14,6 +14,8 @@
  * University of Utah, http://www.cs.utah.edu/flux/
  */
 
+#include "config.h"
+
 #if defined(KAFFE_FEEDBACK)
 
 #include <stdlib.h>
Index: kaffe/kaffe/xprof/fileSections.c
diff -u kaffe/kaffe/xprof/fileSections.c:1.5 kaffe/kaffe/xprof/fileSections.c:1.6
--- kaffe/kaffe/xprof/fileSections.c:1.5	Thu Jul 31 22:46:52 2003
+++ kaffe/kaffe/xprof/fileSections.c	Sat Sep 18 20:48:17 2004
@@ -13,6 +13,8 @@
  * University of Utah, http://www.cs.utah.edu/flux/
  */
 
+#include "config.h"
+
 #if defined(KAFFE_FEEDBACK)
 
 #include <stdio.h>
Index: kaffe/kaffe/xprof/gmonFile.c
diff -u kaffe/kaffe/xprof/gmonFile.c:1.3 kaffe/kaffe/xprof/gmonFile.c:1.4
--- kaffe/kaffe/xprof/gmonFile.c:1.3	Thu Jul 31 22:46:52 2003
+++ kaffe/kaffe/xprof/gmonFile.c	Sat Sep 18 20:48:17 2004
@@ -13,6 +13,8 @@
  * University of Utah, http://www.cs.utah.edu/flux/
  */
 
+#include "config.h"
+
 #if defined(KAFFE_XPROFILER)
 
 #include <string.h>
Index: kaffe/kaffe/xprof/mangle.c
diff -u kaffe/kaffe/xprof/mangle.c:1.6 kaffe/kaffe/xprof/mangle.c:1.7
--- kaffe/kaffe/xprof/mangle.c:1.6	Mon Mar  8 21:21:21 2004
+++ kaffe/kaffe/xprof/mangle.c	Sat Sep 18 20:48:17 2004
@@ -13,6 +13,8 @@
  * University of Utah, http://www.cs.utah.edu/flux/
  */
 
+#include "config.h"
+
 #if defined(KAFFE_XDEBUGGING) || defined(KAFFE_XPROFILER)
 
 #include <stdlib.h>
Index: kaffe/kaffe/xprof/memorySamples.c
diff -u kaffe/kaffe/xprof/memorySamples.c:1.6 kaffe/kaffe/xprof/memorySamples.c:1.7
--- kaffe/kaffe/xprof/memorySamples.c:1.6	Fri Jul 30 11:06:33 2004
+++ kaffe/kaffe/xprof/memorySamples.c	Sat Sep 18 20:48:17 2004
@@ -13,6 +13,8 @@
  * University of Utah, http://www.cs.utah.edu/flux/
  */
 
+#include "config.h"
+
 #if defined(KAFFE_XPROFILER)
 
 #include <stdlib.h>
Index: kaffe/kaffe/xprof/sectionFile.c
diff -u kaffe/kaffe/xprof/sectionFile.c:1.5 kaffe/kaffe/xprof/sectionFile.c:1.6
--- kaffe/kaffe/xprof/sectionFile.c:1.5	Thu Jul 31 22:46:52 2003
+++ kaffe/kaffe/xprof/sectionFile.c	Sat Sep 18 20:48:17 2004
@@ -13,6 +13,8 @@
  * University of Utah, http://www.cs.utah.edu/flux/
  */
 
+#include "config.h"
+
 #if defined(KAFFE_FEEDBACK)
 
 #include <stdio.h>
Index: kaffe/kaffe/xprof/xprofiler.c
diff -u kaffe/kaffe/xprof/xprofiler.c:1.5 kaffe/kaffe/xprof/xprofiler.c:1.6
--- kaffe/kaffe/xprof/xprofiler.c:1.5	Thu Jul 31 22:46:52 2003
+++ kaffe/kaffe/xprof/xprofiler.c	Sat Sep 18 20:48:17 2004
@@ -13,6 +13,8 @@
  * University of Utah, http://www.cs.utah.edu/flux/
  */
 
+#include "config.h"
+
 #if defined(KAFFE_XPROFILER)
 
 #include <string.h>




More information about the kaffe mailing list