[kaffe] CVS kaffe (robilad): removed OPT_DLOPEN_JAVA_LIBS

[Kaffe CVS]

PatchSet 7786 
Date: 2008/03/09 18:59:49
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed OPT_DLOPEN_JAVA_LIBS

2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffe/Makefile.am (kaffe_bin_LDADD):
Removed OPT_DLOPEN_JAVA_LIBS.

* configure.ac (OPT_JAVA_LIBS, OPT_DLOPEN_JAVA_LIBS): Removed.

Members: 
ChangeLog:1.5286->1.5287 
Makefile.in:1.319->1.320 
configure:1.647->1.648 
configure:1.646->1.647 
configure.ac:1.317->1.318 
configure.ac:1.316->1.317 
config/Makefile.in:1.262->1.263 
include/Makefile.in:1.327->1.328 
kaffe/Makefile.in:1.210->1.211 
kaffe/jvmpi/Makefile.in:1.136->1.137 
kaffe/kaffe/Makefile.am:1.42->1.43 
kaffe/kaffe/Makefile.in:1.236->1.237 
kaffe/kaffe/Makefile.in:1.235->1.236 
kaffe/kaffeh/Makefile.in:1.218->1.219 
kaffe/kaffevm/Makefile.in:1.291->1.292 
kaffe/kaffevm/boehm-gc/Makefile.in:1.101->1.102 
kaffe/kaffevm/gcj/Makefile.in:1.190->1.191 
kaffe/kaffevm/intrp/Makefile.in:1.199->1.200 
kaffe/kaffevm/jit/Makefile.in:1.209->1.210 
kaffe/kaffevm/jit3/Makefile.in:1.179->1.180 
kaffe/kaffevm/kaffe-gc/Makefile.in:1.99->1.100 
kaffe/kaffevm/systems/Makefile.in:1.199->1.200 
kaffe/kaffevm/systems/beos-native/Makefile.in:1.190->1.191 
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.54->1.55 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.196->1.197 
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.200->1.201 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.177->1.178 
kaffe/man/Makefile.in:1.197->1.198 
kaffe/scripts/Makefile.in:1.243->1.244 
kaffe/scripts/bat/Makefile.in:1.190->1.191 
kaffe/scripts/compat/Makefile.in:1.218->1.219 
kaffe/xprof/Makefile.in:1.166->1.167 
libraries/Makefile.in:1.193->1.194 
libraries/clib/Makefile.in:1.215->1.216 
libraries/clib/zip/Makefile.in:1.213->1.214 
libraries/javalib/Makefile.in:1.607->1.608 
libraries/javalib/vmspecific/Makefile.in:1.39->1.40 
libraries/javalib/zlib-zip/Makefile.in:1.37->1.38 
replace/Makefile.in:1.153->1.154 
test/Makefile.in:1.202->1.203 
test/internal/Makefile.in:1.178->1.179 
test/jni/Makefile.in:1.110->1.111 
test/regression/Makefile.in:1.281->1.282 
test/regression/compile_time/Makefile.in:1.130->1.131 
test/regression/compiler/Makefile.in:1.114->1.115 
test/regression/run_time/Makefile.in:1.129->1.130 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5286 kaffe/ChangeLog:1.5287
--- kaffe/ChangeLog:1.5286  Sun Mar  9 18:46:53 2008
+++ kaffe/ChangeLog Sun Mar  9 18:59:49 2008
@@ -1,5 +1,12 @@
 2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffe/Makefile.am (kaffe_bin_LDADD): 
+   Removed OPT_DLOPEN_JAVA_LIBS.
+
+   * configure.ac (OPT_JAVA_LIBS, OPT_DLOPEN_JAVA_LIBS): Removed.
+
+2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
+
* m4/gwqt.m4: Removed.
 
 2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.319 kaffe/Makefile.in:1.320
--- kaffe/Makefile.in:1.319 Sun Mar  9 18:39:25 2008
+++ kaffe/Makefile.in   Sun Mar  9 19:01:10 2008
@@ -194,7 +194,6 @@
 M_LIBS = @M_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OPT_DLOPEN_JAVA_LIBS = @OPT_DLOPEN_JAVA_LIBS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
Index: kaffe/configure
diff -u kaffe/configure:1.647 kaffe/configure:1.648
--- kaffe/configure:1.647   Sun Mar  9 18:59:50 2008
+++ kaffe/configure Sun Mar  9 19:01:11 2008
@@ -984,7 +984,6 @@
 COND_ZLIB_ZIP_TRUE
 COND_ZLIB_ZIP_FALSE
 DLOPEN_JAVA_LIBS
-OPT_DLOPEN_JAVA_LIBS
 KLIBFLAGS
 KVMBINFLAGS
 KVMLIBFLAGS
@@ -7185,7 +7184,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7188 "configure"' > conftest.$ac_ext
+  echo '#line 7187 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9745,11 +9744,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9748: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9747: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-   echo "$as_me:9752: \$? = $ac_status" >&5
+   echo "$as_me:9751: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
  # The compiler can only warn and ignore the option if not recognized
  # So say no if there are warnings other than the usual output.
@@ -10035,11 +10034,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"

[kaffe] CVS kaffe (robilad): removed OPT_DLOPEN_JAVA_LIBS

[Kaffe CVS]

PatchSet 7786 
Date: 2008/03/09 18:59:49
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed OPT_DLOPEN_JAVA_LIBS

2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffe/Makefile.am (kaffe_bin_LDADD):
Removed OPT_DLOPEN_JAVA_LIBS.

* configure.ac (OPT_JAVA_LIBS, OPT_DLOPEN_JAVA_LIBS): Removed.

Members: 
ChangeLog:1.5286->1.5287 
configure:1.646->1.647 
configure.ac:1.316->1.317 
kaffe/kaffe/Makefile.am:1.42->1.43 
kaffe/kaffe/Makefile.in:1.235->1.236 
libraries/javalib/vmspecific/Makefile.in:1.39->1.40 
libraries/javalib/zlib-zip/Makefile.in:1.37->1.38 
replace/Makefile.in:1.153->1.154 
test/Makefile.in:1.202->1.203 
test/internal/Makefile.in:1.178->1.179 
test/jni/Makefile.in:1.110->1.111 
test/regression/Makefile.in:1.281->1.282 
test/regression/compile_time/Makefile.in:1.130->1.131 
test/regression/compiler/Makefile.in:1.114->1.115 
test/regression/run_time/Makefile.in:1.129->1.130 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5286 kaffe/ChangeLog:1.5287
--- kaffe/ChangeLog:1.5286  Sun Mar  9 18:46:53 2008
+++ kaffe/ChangeLog Sun Mar  9 18:59:49 2008
@@ -1,5 +1,12 @@
 2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffe/Makefile.am (kaffe_bin_LDADD): 
+   Removed OPT_DLOPEN_JAVA_LIBS.
+
+   * configure.ac (OPT_JAVA_LIBS, OPT_DLOPEN_JAVA_LIBS): Removed.
+
+2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
+
* m4/gwqt.m4: Removed.
 
 2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/configure
diff -u kaffe/configure:1.646 kaffe/configure:1.647
--- kaffe/configure:1.646   Sun Mar  9 18:39:26 2008
+++ kaffe/configure Sun Mar  9 18:59:50 2008
@@ -36087,11 +36087,6 @@
 
 
 
-OPT_JAVA_LIBS=" \
-$ALSA_LIB \
-$ESD_LIB \
-"
-
 OPT_DLOPEN_JAVA_LIBS=
 for lib in $OPT_JAVA_LIBS; do
   OPT_DLOPEN_JAVA_LIBS="$OPT_DLOPEN_JAVA_LIBS -dlopen $lib"
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.316 kaffe/configure.ac:1.317
--- kaffe/configure.ac:1.316Sun Mar  9 18:39:26 2008
+++ kaffe/configure.ac  Sun Mar  9 18:59:51 2008
@@ -1350,11 +1350,6 @@
 AC_SUBST(DLOPEN_JAVA_LIBS)
 
 
-OPT_JAVA_LIBS=" \
-$ALSA_LIB \
-$ESD_LIB \
-"
-
 OPT_DLOPEN_JAVA_LIBS=
 for lib in $OPT_JAVA_LIBS; do
   OPT_DLOPEN_JAVA_LIBS="$OPT_DLOPEN_JAVA_LIBS -dlopen $lib"
Index: kaffe/kaffe/kaffe/Makefile.am
diff -u kaffe/kaffe/kaffe/Makefile.am:1.42 kaffe/kaffe/kaffe/Makefile.am:1.43
--- kaffe/kaffe/kaffe/Makefile.am:1.42  Sun Mar  9 18:39:30 2008
+++ kaffe/kaffe/kaffe/Makefile.am   Sun Mar  9 18:59:53 2008
@@ -42,7 +42,6 @@
 
 kaffe_bin_LDADD = \
$(DLOPEN_JAVA_LIBS) \
-   $(OPT_DLOPEN_JAVA_LIBS) \
$(LIBKAFFEVM) \
$(KAFFE_LIBS) \
$(top_builddir)/replace/libreplace.la \
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.235 kaffe/kaffe/kaffe/Makefile.in:1.236
--- kaffe/kaffe/kaffe/Makefile.in:1.235 Sun Mar  9 18:39:30 2008
+++ kaffe/kaffe/kaffe/Makefile.in   Sun Mar  9 18:59:54 2008
@@ -304,7 +304,6 @@
 
 kaffe_bin_LDADD = \
$(DLOPEN_JAVA_LIBS) \
-   $(OPT_DLOPEN_JAVA_LIBS) \
$(LIBKAFFEVM) \
$(KAFFE_LIBS) \
$(top_builddir)/replace/libreplace.la \
Index: kaffe/libraries/javalib/vmspecific/Makefile.in
diff -u kaffe/libraries/javalib/vmspecific/Makefile.in:1.39 
kaffe/libraries/javalib/vmspecific/Makefile.in:1.40
--- kaffe/libraries/javalib/vmspecific/Makefile.in:1.39 Sun Mar  9 18:40:04 2008
+++ kaffe/libraries/javalib/vmspecific/Makefile.in  Sun Mar  9 19:01:43 2008
@@ -165,7 +165,6 @@
 M_LIBS = @M_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OPT_DLOPEN_JAVA_LIBS = @OPT_DLOPEN_JAVA_LIBS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
Index: kaffe/libraries/javalib/zlib-zip/Makefile.in
diff -u kaffe/libraries/javalib/zlib-zip/Makefile.in:1.37 
kaffe/libraries/javalib/zlib-zip/Makefile.in:1.38
--- kaffe/libraries/javalib/zlib-zip/Makefile.in:1.37   Sun Mar  9 18:40:04 2008
+++ kaffe/libraries/javalib/zlib-zip/Makefile.inSun Mar  9 19:01:43 2008
@@ -164,7 +164,6 @@
 M_LIBS = @M_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OPT_DLOPEN_JAVA_LIBS = @OPT_DLOPEN_JAVA_LIBS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
Index: kaffe/replace/Makefile.in
diff -u kaffe/replace/Makefile.in:1.153 kaffe/replace/Makefile.in:1.154
--- kaffe/replace/Makefile.in:1.153 Sun Mar  9 18:40:04 2008
+++ kaffe/replace/Makefile.in   Sun Mar  9 19:01:43 2008
@@ -186,7 +186,6 @@
 M_LIBS = @M_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OPT_DLOPEN_JAVA_LIBS = @OPT_DLOPEN_JAVA_LIBS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
Index: kaffe/test/Makefile.in
diff -u kaffe/test/Makefile.in:1.202 kaffe/test/Makefile.in:1.203
--- kaffe/test/Makefile.in:1.202Sun Mar  9 18:40:05 2008
+++ kaffe/test/Makefile.in  Sun Mar  9

[kaffe] CVS kaffe (robilad): removed unused m4 macro

[Kaffe CVS]

PatchSet 7785 
Date: 2008/03/09 18:46:53
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed unused m4 macro

2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>

* m4/gwqt.m4: Removed.

Members: 
ChangeLog:1.5285->1.5286 
m4/gwqt.m4:1.5->1.6(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5285 kaffe/ChangeLog:1.5286
--- kaffe/ChangeLog:1.5285  Sun Mar  9 18:44:24 2008
+++ kaffe/ChangeLog Sun Mar  9 18:46:53 2008
@@ -1,5 +1,9 @@
 2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * m4/gwqt.m4: Removed.
+
+2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
+
* WHATSNEW, TODO: Updated.
 
 2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
===
Checking out kaffe/m4/gwqt.m4
RCS:  /home/cvs/kaffe/kaffe/m4/Attic/gwqt.m4,v
VERS: 1.5
***
--- kaffe/m4/gwqt.m4Sun Mar  9 18:49:45 2008
+++ /dev/null   Sun Aug  4 19:57:58 2002
@@ -1,266 +0,0 @@
-# Check for Qt compiler flags, linker flags, and binary packages
-AC_DEFUN([gw_CHECK_QT],
-[
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PATH_X])
-
-
-AC_MSG_CHECKING([QTLIBDIR])
-AC_ARG_WITH([qt-libraries],
-  [  --with-qt-libraries=DIR Qt library installation directory (default = 
$QTDIR/lib)],
-  [QTLIBDIR=$withval]
-)
-if test x"$QTLIBDIR" = x"" ; then
-  QTLIBDIR=$QTDIR/lib
-fi
-AC_MSG_RESULT([$QTLIBDIR])
-
-
-AC_MSG_CHECKING([QTBINDIR])
-AC_ARG_WITH([qt-binaries],
-  [  --with-qt-binaries=DIR  Qt binary installation directory (default = 
$QTDIR/bin)],
-  [QTBINDIR=$withval]
-)
-if test x"$QTBINDIR" = x"" ; then
-  QTBINDIR=$QTDIR/bin
-fi
-AC_MSG_RESULT([$QTBINDIR])
-
-
-AC_MSG_CHECKING([QTINCDIR])
-AC_ARG_WITH([qt-headers],
-  [  --with-qt-headers=DIR  Qt include directory (default = $QTDIR/include)],
-  [QTINCDIR=$withval]
-)
-if test x"$QTINCDIR" = x"" ; then
-  QTINCDIR=$QTDIR/include
-fi
-AC_MSG_RESULT([$QTINCDIR])
-
-
-AC_MSG_CHECKING([QTDIR])
-AC_ARG_WITH([qtdir], [  --with-qtdir=DIRQt installation directory 
(default=$QTDIR)], QTDIR=$withval)
-# Check that QTDIR is defined or that --with-qtdir given
-if test x"$QTDIR" = x ; then
-QT_SEARCH="/usr/lib/qt31 /usr/local/qt31 /usr/lib/qt3 /usr/local/qt3 
/usr/lib/qt2 /usr/local/qt2 /usr/lib/qt /usr/local/qt /usr/share/qt  
/usr/share/qt3"
-for i in $QT_SEARCH; do
-if test -f $i/include/qglobal.h -a x$QTDIR = x; then QTDIR=$i; fi
-done
-fi
-if test x"$QTDIR" = x ; then
-AC_MSG_ERROR([*** QTDIR must be defined, or --with-qtdir option given])
-fi
-AC_MSG_RESULT([$QTDIR])
-
-# Change backslashes in QTDIR to forward slashes to prevent escaping
-# problems later on in the build process, mainly for Cygwin build
-# environment using MSVC as the compiler
-# TODO: Use sed instead of perl
-QTDIR=`echo $QTDIR | perl -p -e 's//\\//g'`
-
-# Figure out which version of Qt we are using
-AC_MSG_CHECKING([Qt version])
-QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTINCDIR/qglobal.h | perl -p -e 
's/\D//g'`
-case "${QT_VER}" in
-2*)
-QT_MAJOR="2"
-;;
-3*)
-QT_MAJOR="3"
-;;
-*)
-AC_MSG_ERROR([*** Don't know how to handle this Qt major version])
-;;
-esac
-AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])
-
-# Check that moc is in path
-AC_PATH_PROG(MOC, moc,,[$QTBINDIR:$PATH])
-if test x$MOC = x ; then
-AC_MSG_ERROR([*** moc must be in path])
-fi
-
-# uic is the Qt user interface compiler
-AC_PATH_PROG(UIC, uic,,[$QTBINDIR:$PATH])
-#if test x$UIC = x ; then
-#AC_MSG_ERROR([*** uic must be in path])
-#fi
-
-# qembed is the Qt data embedding utility.
-# It is located in $QTDIR/tools/qembed, and must be compiled and installed
-# manually, we'll let it slide if it isn't present
-AC_CHECK_PROG(QEMBED, qembed, qembed)
-
-
-# Calculate Qt include path
-QT_CXXFLAGS="-I$QTINCDIR"
-
-QT_IS_EMBEDDED="no"
-# On unix, figure out if we're doing a static or dynamic link
-case "${host}" in
-*-cygwin)
-   AC_DEFINE_UNQUOTED(WIN32, "", Defined if on Win32 platform)
-if test -f "$QTLIBDIR/qt.lib" ; then
-QT_LIB="qt.lib"
-QT_IS_STATIC="yes"
-QT_IS_MT="no"
-elif test -f "$QTLIBDIR/qt-mt.lib" ; then
-QT_LIB="qt-mt.lib" 
-QT_IS_STATIC="yes"
-QT_IS_MT="yes"
-elif test -f "$QTLIBDIR/qt$QT_VER.lib" ; then
-QT_LIB="qt$QT_VER.lib"
-QT_IS_STATIC="no"
-QT_IS_MT="no"
-elif test -f "$QTLIBDIR/qt-mt$QT_VER.lib" ; then
-QT_LIB="qt-mt$QT_VER.lib"
-QT_IS_STATIC="no"
-QT_IS_MT="yes"
-fi
-;;
-
-*)
-QT_IS_STATIC=`ls $QTLIBDIR/libqt*.a 2>/dev/null`
-if test "x$QT_IS_STATIC" = x; then
-QT_IS_STATIC="no"
-else
-QT_IS_STATIC="yes"
-fi
-if test x$QT_IS_STATIC = xno ; then
-QT_IS_DYNAMIC=`ls $QTLIBDIR/*.so 2> /dev/null` 
-if test "x$QT_IS_DYNAMIC" = x;  then
-AC_MSG_ERROR([*** Co

[kaffe] CVS kaffe (robilad): documented old AWT purge

[Kaffe CVS]

PatchSet 7784 
Date: 2008/03/09 18:44:24
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
documented old AWT purge

2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>

* WHATSNEW, TODO: Updated.

Members: 
ChangeLog:1.5284->1.5285 
TODO:1.59->1.60 
WHATSNEW:1.78->1.79 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5284 kaffe/ChangeLog:1.5285
--- kaffe/ChangeLog:1.5284  Sun Mar  9 18:39:25 2008
+++ kaffe/ChangeLog Sun Mar  9 18:44:24 2008
@@ -1,5 +1,9 @@
 2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * WHATSNEW, TODO: Updated.
+
+2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
+
* configure.ac: Removed old kaffe AWT configuration mechanism.
 
* Makefile.am (EXTRA_DIST): Removed FAQ.awt.
Index: kaffe/TODO
diff -u kaffe/TODO:1.59 kaffe/TODO:1.60
--- kaffe/TODO:1.59 Sun Mar  9 16:53:39 2008
+++ kaffe/TODO  Sun Mar  9 18:44:24 2008
@@ -60,9 +60,6 @@
  * Switch over to GNU Classpath's javah and remove kaffeh
   * Replace native library code using KNI with code using JNI
 
-* Unmerging work
-  * Remove old Kaffe AWT implementations
-
 * Merging work:
   * verifier from gcj (rob gonzalez)
   * SkyOS port
Index: kaffe/WHATSNEW
diff -u kaffe/WHATSNEW:1.78 kaffe/WHATSNEW:1.79
--- kaffe/WHATSNEW:1.78 Wed Feb 27 00:20:55 2008
+++ kaffe/WHATSNEW  Sun Mar  9 18:44:24 2008
@@ -1,6 +1,7 @@
 What's New Since Kaffe 1.1.9
 
 
+* Removed kaffe-specific AWT implementations.
 
 What's New In Kaffe 1.1.9
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7783 
Date: 2008/03/09 16:53:39
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

Members: 
ChangeLog:1.5282->1.5283 
TODO:1.58->1.59 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5282 kaffe/ChangeLog:1.5283
--- kaffe/ChangeLog:1.5282  Sat Mar  8 18:12:05 2008
+++ kaffe/ChangeLog Sun Mar  9 16:53:39 2008
@@ -1,3 +1,7 @@
+2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * TODO: Updated.
+
 2008-03-08  Dalibor Topic  <[EMAIL PROTECTED]>
 
* libraries/clib/native/java_lang_Object.c: Don't include inttypes.h,
Index: kaffe/TODO
diff -u kaffe/TODO:1.58 kaffe/TODO:1.59
--- kaffe/TODO:1.58 Sat Mar  8 18:12:05 2008
+++ kaffe/TODO  Sun Mar  9 16:53:39 2008
@@ -13,7 +13,11 @@
* libjit could use a vmgenned interpreter, too.
 
 * Cleanup
- * Remove kaffe's copies of jni.h, jni-md.h, etc. Use GNU Classpath's headers 
instead.
+ * Remove kaffe's copies of jni.h, jni-md.h, kaffe-jni.h etc. Use GNU 
Classpath's headers 
+   instead.
+   - Implement KaffeVM_Arguments as JDK1_1InitArgs, or do without them
+   - Implement GetObjectRefType
+   - Symlink jni.h, jawt.h, etc. from classpath's installation on install.
  * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
  * Use CScout http://www.spinellis.gr/cscout/doc/indexw.html to weed out 
unused symbols.
@@ -23,7 +27,6 @@
  * Make runtime engine runtime selectable
  * Make gc backend runtime selectable
  * Make boehm-gc the default engine on platforms that support it
- * Use libltdl directly for JNI, remove wrappers.
  * Swich to glib for data structures, command line option parsing, etc.
   * debug logging (alternative would be GNU nana)
   * command line option parsing (our manual code in main.c is rather ugly)
@@ -61,7 +64,6 @@
   * Remove old Kaffe AWT implementations
 
 * Merging work:
-  * sun.misc.Unsafe native implementation from openjdk/cacao for full jsr166 
support.
   * verifier from gcj (rob gonzalez)
   * SkyOS port
 
@@ -74,7 +76,5 @@
   * Switch to autotest for the test suites
 
 * Pending patches
-  classpath's doubleToLongBits (dalibor)
-  jit fixes for arm-linux (dalibor)
   amd64 jit from Eric Anholt (guilhem)
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7783 
Date: 2008/03/09 16:53:39
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

Members: 
ChangeLog:1.5282->1.5283 
TODO:1.58->1.59 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5282 kaffe/ChangeLog:1.5283
--- kaffe/ChangeLog:1.5282  Sat Mar  8 18:12:05 2008
+++ kaffe/ChangeLog Sun Mar  9 16:53:39 2008
@@ -1,3 +1,7 @@
+2008-03-09  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * TODO: Updated.
+
 2008-03-08  Dalibor Topic  <[EMAIL PROTECTED]>
 
* libraries/clib/native/java_lang_Object.c: Don't include inttypes.h,
Index: kaffe/TODO
diff -u kaffe/TODO:1.58 kaffe/TODO:1.59
--- kaffe/TODO:1.58 Sat Mar  8 18:12:05 2008
+++ kaffe/TODO  Sun Mar  9 16:53:39 2008
@@ -13,7 +13,11 @@
* libjit could use a vmgenned interpreter, too.
 
 * Cleanup
- * Remove kaffe's copies of jni.h, jni-md.h, etc. Use GNU Classpath's headers 
instead.
+ * Remove kaffe's copies of jni.h, jni-md.h, kaffe-jni.h etc. Use GNU 
Classpath's headers 
+   instead.
+   - Implement KaffeVM_Arguments as JDK1_1InitArgs, or do without them
+   - Implement GetObjectRefType
+   - Symlink jni.h, jawt.h, etc. from classpath's installation on install.
  * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
  * Use CScout http://www.spinellis.gr/cscout/doc/indexw.html to weed out 
unused symbols.
@@ -23,7 +27,6 @@
  * Make runtime engine runtime selectable
  * Make gc backend runtime selectable
  * Make boehm-gc the default engine on platforms that support it
- * Use libltdl directly for JNI, remove wrappers.
  * Swich to glib for data structures, command line option parsing, etc.
   * debug logging (alternative would be GNU nana)
   * command line option parsing (our manual code in main.c is rather ugly)
@@ -61,7 +64,6 @@
   * Remove old Kaffe AWT implementations
 
 * Merging work:
-  * sun.misc.Unsafe native implementation from openjdk/cacao for full jsr166 
support.
   * verifier from gcj (rob gonzalez)
   * SkyOS port
 
@@ -74,7 +76,5 @@
   * Switch to autotest for the test suites
 
 * Pending patches
-  classpath's doubleToLongBits (dalibor)
-  jit fixes for arm-linux (dalibor)
   amd64 jit from Eric Anholt (guilhem)
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed use of inttypes.h

[Kaffe CVS]

PatchSet 7782 
Date: 2008/03/08 18:12:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed use of inttypes.h

2008-03-08  Dalibor Topic  <[EMAIL PROTECTED]>

* libraries/clib/native/java_lang_Object.c: Don't include inttypes.h,
we already include stdint.h.

Members: 
ChangeLog:1.5281->1.5282 
TODO:1.57->1.58 
libraries/clib/native/java_lang_Object.c:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5281 kaffe/ChangeLog:1.5282
--- kaffe/ChangeLog:1.5281  Sat Mar  8 18:08:44 2008
+++ kaffe/ChangeLog Sat Mar  8 18:12:05 2008
@@ -1,5 +1,12 @@
 2008-03-08  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * libraries/clib/native/java_lang_Object.c: Don't include inttypes.h,
+   we already include stdint.h.
+
+   * TODO: Updated.
+
+2008-03-08  Dalibor Topic  <[EMAIL PROTECTED]>
+
* m4/ax_create_stdint_h.m4: Removed.
 
 2008-03-06  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/TODO
diff -u kaffe/TODO:1.57 kaffe/TODO:1.58
--- kaffe/TODO:1.57 Sat Mar  1 22:19:02 2008
+++ kaffe/TODO  Sat Mar  8 18:12:05 2008
@@ -14,7 +14,6 @@
 
 * Cleanup
  * Remove kaffe's copies of jni.h, jni-md.h, etc. Use GNU Classpath's headers 
instead.
-Also remove the inttypes.h checks and use now that we are using c99.
  * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
  * Use CScout http://www.spinellis.gr/cscout/doc/indexw.html to weed out 
unused symbols.
Index: kaffe/libraries/clib/native/java_lang_Object.c
diff -u kaffe/libraries/clib/native/java_lang_Object.c:1.3 
kaffe/libraries/clib/native/java_lang_Object.c:1.4
--- kaffe/libraries/clib/native/java_lang_Object.c:1.3  Sat Mar  1 22:15:39 2008
+++ kaffe/libraries/clib/native/java_lang_Object.c  Sat Mar  8 18:12:07 2008
@@ -31,10 +31,6 @@
 #include "jvmpi_kaffe.h"
 #include "debug.h"
 
-#if defined(HAVE_INTTYPES_H)
-#include 
-#endif
-
 /*
  * Return class object for this object.
  */

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed unused m4 file

[Kaffe CVS]

PatchSet 7781 
Date: 2008/03/08 18:08:44
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed unused m4 file

2008-03-08  Dalibor Topic  <[EMAIL PROTECTED]>

* m4/ax_create_stdint_h.m4: Removed.

Members: 
ChangeLog:1.5280->1.5281 
m4/ax_create_stdint_h.m4:1.5->1.6(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5280 kaffe/ChangeLog:1.5281
--- kaffe/ChangeLog:1.5280  Thu Mar  6 18:25:21 2008
+++ kaffe/ChangeLog Sat Mar  8 18:08:44 2008
@@ -1,3 +1,7 @@
+2008-03-08  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * m4/ax_create_stdint_h.m4: Removed.
+
 2008-03-06  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffevm/systems/unix-pthreads/Makefile.am 
(libkthread_la_CFLAGS): 
===
Checking out kaffe/m4/ax_create_stdint_h.m4
RCS:  /home/cvs/kaffe/kaffe/m4/Attic/ax_create_stdint_h.m4,v
VERS: 1.5
***
--- kaffe/m4/ax_create_stdint_h.m4  Sat Mar  8 18:10:26 2008
+++ /dev/null   Sun Aug  4 19:57:58 2002
@@ -1,688 +0,0 @@
-dnl @synopsis AX_CREATE_STDINT_H [( HEADER-TO-GENERATE [, HEDERS-TO-CHECK])]
-dnl
-dnl the "ISO C9X: 7.18 Integer types " section requires the
-dnl existence of an include file  that defines a set of 
-dnl typedefs, especially uint8_t,int32_t,uintptr_t.
-dnl Many older installations will not provide this file, but some will
-dnl have the very same definitions in . In other enviroments
-dnl we can use the inet-types in  which would define the
-dnl typedefs int8_t and u_int8_t respectivly.
-dnl
-dnl This macros will create a local "_stdint.h" or the headerfile given as 
-dnl an argument. In many cases that file will just "#include " 
-dnl or "#include ", while in other environments it will provide 
-dnl the set of basic 'stdint's definitions/typedefs: 
-dnl   int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t
-dnl   int_least32_t.. int_fast32_t.. intmax_t
-dnl which may or may not rely on the definitions of other files,
-dnl or using the AC_CHECK_SIZEOF macro to determine the actual
-dnl sizeof each type.
-dnl
-dnl if your header files require the stdint-types you will want to create an
-dnl installable file mylib-int.h that all your other installable header
-dnl may include. So if you have a library package named "mylib", just use
-dnl  AX_CREATE_STDINT_H(mylib-int.h) 
-dnl in configure.ac and go to install that very header file in Makefile.am
-dnl along with the other headers (mylib.h) - and the mylib-specific headers
-dnl can simply use "#include " to obtain the stdint-types.
-dnl
-dnl Remember, if the system already had a valid , the generated
-dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things...
-dnl
-dnl @, (status: used on new platforms) (see http://ac-archive.sf.net/gstdint/)
-dnl @version $Id: ax_create_stdint_h.m4,v 1.5 2005/07/22 11:36:26 guilhem Exp $
-dnl @author  Guido Draheim <[EMAIL PROTECTED]> 
-
-AC_DEFUN([AX_CHECK_DATA_MODEL],[
-   AC_CHECK_SIZEOF(char)
-   AC_CHECK_SIZEOF(short)
-   AC_CHECK_SIZEOF(int)
-   AC_CHECK_SIZEOF(long)
-   AC_CHECK_SIZEOF(void*)
-   ac_cv_char_data_model=""
-   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char"
-   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short"
-   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int"
-   ac_cv_long_data_model=""
-   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int"
-   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long"
-   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp"
-   AC_MSG_CHECKING([data model])
-   case "$ac_cv_char_data_model/$ac_cv_long_data_model" in
-122/242) ac_cv_data_model="IP16"  ; n="standard 16bit machine" ;;
-122/244) ac_cv_data_model="LP32"  ; n="standard 32bit machine" ;;
-122/*)   ac_cv_data_model="i16"   ; n="unusual int16 model" ;;
-124/444) ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;;
-124/488) ac_cv_data_model="LP64"  ; n="standard 64bit unixish" ;;
-124/448) ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;;
-124/*)   ac_cv_data_model="i32"   ; n="unusual int32 model" ;;
-128/888) ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;;
-128/*)   ac_cv_data_model="i64"   ; n="unusual int64 model" ;; 
-222/*2)  ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;;
-333/*3)  ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;;
-444/*4)  ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;;
-666/*6)  ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;;
-888/*8)  ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;;
-222/*|333/*|444/*|666/*|888/*) :
- ac_cv_data_model="iDSP"  ; n="unusual dsptype" ;;
- *)  ac_cv_data_model="none"  ; n="very unusual model" ;;
-   esac
-   AC_MSG_RESULT([$ac_cv_data_model ($ac_cv_long_data_model, $n)])
-])
-
-dnl AX_CHECK_HEADER_STDINT_

[kaffe] CVS kaffe (robilad): _GNU_SOURCE cleanup

[Kaffe CVS]

PatchSet 7780 
Date: 2008/03/06 18:25:21
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
_GNU_SOURCE cleanup

2008-03-06  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/systems/unix-pthreads/Makefile.am (libkthread_la_CFLAGS):
Define _GNU_SOURCE.

* kaffe/kaffevm/systems/unix-pthreads/signal.c,
kaffe/kaffevm/systems/unix-pthreads/thread-impl.c: Removed
the _GNU_SOURCE define.

Members: 
ChangeLog:1.5279->1.5280 
kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.19->1.20 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.175->1.176 
kaffe/kaffevm/systems/unix-pthreads/signal.c:1.31->1.32 
kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.100->1.101 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5279 kaffe/ChangeLog:1.5280
--- kaffe/ChangeLog:1.5279  Sat Mar  1 22:18:55 2008
+++ kaffe/ChangeLog Thu Mar  6 18:25:21 2008
@@ -1,3 +1,12 @@
+2008-03-06  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/kaffevm/systems/unix-pthreads/Makefile.am 
(libkthread_la_CFLAGS): 
+   Define _GNU_SOURCE.
+
+   * kaffe/kaffevm/systems/unix-pthreads/signal.c,
+   kaffe/kaffevm/systems/unix-pthreads/thread-impl.c: Removed
+   the _GNU_SOURCE define.
+
 2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
 
* TODO: Updated.
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.19 
kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.20
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.19  Sat Mar  1 
21:22:10 2008
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.am   Thu Mar  6 
18:25:24 2008
@@ -19,7 +19,8 @@
 
 libkthread_la_CFLAGS = \
$(AM_CFLAGS) \
-   $(PTHREAD_CFLAGS)
+   $(PTHREAD_CFLAGS) \
+   -D_GNU_SOURCE
 
 libkthread_la_SOURCES = \
lock-impl.c \
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.175 
kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.176
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.175 Sat Mar  1 
22:15:32 2008
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in   Thu Mar  6 
18:25:24 2008
@@ -302,7 +302,8 @@
 
 libkthread_la_CFLAGS = \
$(AM_CFLAGS) \
-   $(PTHREAD_CFLAGS)
+   $(PTHREAD_CFLAGS) \
+   -D_GNU_SOURCE
 
 libkthread_la_SOURCES = \
lock-impl.c \
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c:1.31 
kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c:1.32
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c:1.31 Thu Jan 17 
01:59:17 2008
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c  Thu Mar  6 18:25:24 2008
@@ -9,7 +9,6 @@
  * of this file. 
  */
 
-#define _GNU_SOURCE
 #include "config.h"
 #include "debug.h"
 #include "config-std.h"
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.100 
kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.101
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.100   Sat Feb 
 2 16:25:52 2008
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c Thu Mar  6 
18:25:24 2008
@@ -47,10 +47,6 @@
 #include 
 #endif
 
-/* define _GNU_SOURCE for pthread_yield on linux */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include 
 
 #if !defined(HAVE_PTHREAD_YIELD) && defined(HAVE_SCHED_YIELD)

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7779 
Date: 2008/03/01 22:18:55
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO
#
2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

Members: 
ChangeLog:1.5278->1.5279 
TODO:1.56->1.57 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5278 kaffe/ChangeLog:1.5279
--- kaffe/ChangeLog:1.5278  Sat Mar  1 22:15:14 2008
+++ kaffe/ChangeLog Sat Mar  1 22:18:55 2008
@@ -1,5 +1,9 @@
 2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * TODO: Updated.
+
+2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
+
* config/x86_64/atomic.h,
config/s390/atomic.h,
config/config-std.h, 
Index: kaffe/TODO
diff -u kaffe/TODO:1.56 kaffe/TODO:1.57
--- kaffe/TODO:1.56 Wed Feb 20 14:29:07 2008
+++ kaffe/TODO  Sat Mar  1 22:19:02 2008
@@ -13,10 +13,8 @@
* libjit could use a vmgenned interpreter, too.
 
 * Cleanup
- * Remove KAFFE_CFLAGS
  * Remove kaffe's copies of jni.h, jni-md.h, etc. Use GNU Classpath's headers 
instead.
-Also remove the config-int.h generation now that we are using C99.
- * Look into removing the logging.properties file in libraries/javalib.
+Also remove the inttypes.h checks and use now that we are using c99.
  * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
  * Use CScout http://www.spinellis.gr/cscout/doc/indexw.html to weed out 
unused symbols.

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): the kaffeh KAFFE_CFLAGs emoval

[Kaffe CVS]

PatchSet 7778 
Date: 2008/03/01 22:16:58
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
the kaffeh KAFFE_CFLAGs emoval

Members: 
kaffe/kaffeh/Makefile.am:1.33->1.34 
kaffe/kaffeh/Makefile.in:1.216->1.217 

Index: kaffe/kaffe/kaffeh/Makefile.am
diff -u kaffe/kaffe/kaffeh/Makefile.am:1.33 kaffe/kaffe/kaffeh/Makefile.am:1.34
--- kaffe/kaffe/kaffeh/Makefile.am:1.33 Tue Jan 22 23:21:27 2008
+++ kaffe/kaffe/kaffeh/Makefile.am  Sat Mar  1 22:16:58 2008
@@ -7,7 +7,6 @@
 # of this file. 
 
 AM_CFLAGS= \
-   $(KAFFE_CFLAGS) \
$(CFLAGS_PG)
 
 AM_CPPFLAGS = \
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.216 
kaffe/kaffe/kaffeh/Makefile.in:1.217
--- kaffe/kaffe/kaffeh/Makefile.in:1.216Sat Mar  1 22:15:24 2008
+++ kaffe/kaffe/kaffeh/Makefile.in  Sat Mar  1 22:16:58 2008
@@ -293,7 +293,6 @@
 top_srcdir = @top_srcdir@
 with_engine = @with_engine@
 AM_CFLAGS = \
-   $(KAFFE_CFLAGS) \
$(CFLAGS_PG)
 
 AM_CPPFLAGS = \

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed config-int.h

[Kaffe CVS]

PatchSet  
Date: 2008/03/01 22:15:14
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed config-int.h

2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>

* config/x86_64/atomic.h,
config/s390/atomic.h,
config/config-std.h,
config/powerpc/bits/atomic.h,
config/mips/atomic.h,
config/generic/gentypes.h,
config/ia64/atomic.h,
config/m68k/atomic.h,
config/alpha/atomic.h,
config/sparc/atomic-sparc64.h,
config/sparc/atomic-sparc32v9.h,
libraries/clib/native/java_lang_Object.c,
libraries/clib/awt/qt/fnt.cc,
include/jni_md.h,
include/jsyscall.h,
kaffe/kaffevm/intrp/icode.h,
kaffe/kaffevm/gc.h: Include stdint.h rather than config-int.h.

* include/Makefile.am (include_HEADERS, DISTCLEANFILES): Removed
config-int-h.

* config/config-hacks.h: (HAVE_BOOL) Removed.

* libraries/clib/awt/qt/toolkit.h [HAVE_BOOL]: Removed.

* kaffe/kaffevm/gtypes.h: (HAVE_BOOL): Removed. Include stdint.h
and stdbool.h.

* configure.ac: Don't check for stdint.h, or having a bool type,
those are standard c99 features.

Members: 
ChangeLog:1.5277->1.5278 
Makefile.in:1.317->1.318 
aclocal.m4:1.144->1.145 
configure:1.644->1.645 
configure.ac:1.314->1.315 
config/Makefile.in:1.260->1.261 
config/config-hacks.h:1.20->1.21 
config/config-std.h:1.18->1.19 
config/config.h.in:1.183->1.184 
config/alpha/atomic.h:1.3->1.4 
config/generic/gentypes.h:1.2->1.3 
config/ia64/atomic.h:1.4->1.5 
config/m68k/atomic.h:1.3->1.4 
config/mips/atomic.h:1.7->1.8 
config/powerpc/bits/atomic.h:1.2->1.3 
config/s390/atomic.h:1.3->1.4 
config/sparc/atomic-sparc32v9.h:1.3->1.4 
config/sparc/atomic-sparc64.h:1.5->1.6 
config/x86_64/atomic.h:1.3->1.4 
include/Makefile.am:1.148->1.149 
include/Makefile.in:1.325->1.326 
include/jni_md.h:1.2->1.3 
include/jsyscall.h:1.34->1.35 
kaffe/Makefile.in:1.208->1.209 
kaffe/jvmpi/Makefile.in:1.134->1.135 
kaffe/kaffe/Makefile.in:1.233->1.234 
kaffe/kaffeh/Makefile.in:1.215->1.216 
kaffe/kaffevm/Makefile.in:1.289->1.290 
kaffe/kaffevm/gc.h:1.39->1.40 
kaffe/kaffevm/gtypes.h:1.20->1.21 
kaffe/kaffevm/boehm-gc/Makefile.in:1.99->1.100 
kaffe/kaffevm/gcj/Makefile.in:1.188->1.189 
kaffe/kaffevm/intrp/Makefile.in:1.197->1.198 
kaffe/kaffevm/intrp/icode.h:1.29->1.30 
kaffe/kaffevm/jit/Makefile.in:1.207->1.208 
kaffe/kaffevm/jit3/Makefile.in:1.177->1.178 
kaffe/kaffevm/kaffe-gc/Makefile.in:1.97->1.98 
kaffe/kaffevm/systems/Makefile.in:1.197->1.198 
kaffe/kaffevm/systems/beos-native/Makefile.in:1.188->1.189 
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.52->1.53 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.194->1.195 
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.198->1.199 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.174->1.175 
kaffe/man/Makefile.in:1.195->1.196 
kaffe/scripts/Makefile.in:1.241->1.242 
kaffe/scripts/bat/Makefile.in:1.188->1.189 
kaffe/scripts/compat/Makefile.in:1.216->1.217 
kaffe/xprof/Makefile.in:1.164->1.165 
libraries/Makefile.in:1.191->1.192 
libraries/clib/Makefile.in:1.213->1.214 
libraries/clib/awt/Makefile.in:1.206->1.207 
libraries/clib/awt/X/Makefile.in:1.202->1.203 
libraries/clib/awt/nano-X/Makefile.in:1.73->1.74 
libraries/clib/awt/qt/Makefile.in:1.154->1.155 
libraries/clib/awt/qt/fnt.cc:1.9->1.10 
libraries/clib/awt/qt/toolkit.h:1.7->1.8 
libraries/clib/awt/xynth/Makefile.in:1.29->1.30 
libraries/clib/native/java_lang_Object.c:1.2->1.3 
libraries/clib/zip/Makefile.in:1.211->1.212 
libraries/javalib/Makefile.in:1.605->1.606 
libraries/javalib/awt-implementations/Makefile.in:1.85->1.86 
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.108->1.109 
libraries/javalib/vmspecific/Makefile.in:1.37->1.38 
libraries/javalib/zlib-zip/Makefile.in:1.35->1.36 
replace/Makefile.in:1.151->1.152 
test/Makefile.in:1.200->1.201 
test/internal/Makefile.in:1.176->1.177 
test/jni/Makefile.in:1.108->1.109 
test/regression/Makefile.in:1.279->1.280 
test/regression/compile_time/Makefile.in:1.128->1.129 
test/regression/compiler/Makefile.in:1.112->1.113 
test/regression/run_time/Makefile.in:1.127->1.128 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5277 kaffe/ChangeLog:1.5278
--- kaffe/ChangeLog:1.5277  Sat Mar  1 21:37:09 2008
+++ kaffe/ChangeLog Sat Mar  1 22:15:14 2008
@@ -1,5 +1,38 @@
 2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * config/x86_64/atomic.h,
+   config/s390/atomic.h,
+   config/config-std.h, 
+   config/powerpc/bits/atomic.h, 
+   config/mips/atomic.h,
+   config/generi

[kaffe] CVS kaffe (robilad): removed stale logging.properties file

[Kaffe CVS]

PatchSet 7776 
Date: 2008/03/01 21:37:09
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed stale logging.properties file

008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>

* libraries/javalib/logging.properties: Removed.

* libraries/javalib/Makefile.am (jrelib_DATA, EXTRA_DIST): Removed.

Members: 
ChangeLog:1.5276->1.5277 
libraries/javalib/Makefile.am:1.468->1.469 
libraries/javalib/Makefile.in:1.604->1.605 
libraries/javalib/logging.properties:1.1->1.2(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5276 kaffe/ChangeLog:1.5277
--- kaffe/ChangeLog:1.5276  Sat Mar  1 21:26:13 2008
+++ kaffe/ChangeLog Sat Mar  1 21:37:09 2008
@@ -1,5 +1,11 @@
 2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * libraries/javalib/logging.properties: Removed.
+   
+   * libraries/javalib/Makefile.am (jrelib_DATA, EXTRA_DIST): Removed.
+
+2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffeh/Makefile.am (AM_CFLAGS): Removed KAFFE_CFLAGS.
 
 2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.468 
kaffe/libraries/javalib/Makefile.am:1.469
--- kaffe/libraries/javalib/Makefile.am:1.468   Sat Feb  2 15:58:38 2008
+++ kaffe/libraries/javalib/Makefile.am Sat Mar  1 21:37:11 2008
@@ -25,14 +25,8 @@
$(MAYBE_PEERLESS_KAFFE_AWT) \
$(MAYBE_ZLIB_ZIP)
 
-jrelib_DATA= \
-logging.properties
-
 install-data-local: installdirs
$(LN_S) -f $(TARGET_CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar
 
 uninstall-local:
$(RM) $(DESTDIR)${jrelibdir}/rt.jar
-
-EXTRA_DIST= \
-   logging.properties 
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.604 
kaffe/libraries/javalib/Makefile.in:1.605
--- kaffe/libraries/javalib/Makefile.in:1.604   Sat Mar  1 21:22:19 2008
+++ kaffe/libraries/javalib/Makefile.in Sat Mar  1 21:37:12 2008
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -68,15 +67,6 @@
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-*) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(jrelibdir)"
-jrelibDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(jrelib_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -295,12 +285,6 @@
$(MAYBE_PEERLESS_KAFFE_AWT) \
$(MAYBE_ZLIB_ZIP)
 
-jrelib_DATA = \
-logging.properties
-
-EXTRA_DIST = \
-   logging.properties 
-
 all: all-recursive
 
 .SUFFIXES:
@@ -339,23 +323,6 @@
 
 clean-libtool:
-rm -rf .libs _libs
-install-jrelibDATA: $(jrelib_DATA)
-   @$(NORMAL_INSTALL)
-   test -z "$(jrelibdir)" || $(MKDIR_P) "$(DESTDIR)$(jrelibdir)"
-   @list='$(jrelib_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(jrelibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(jrelibdir)/$$f'"; \
- $(jrelibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(jrelibdir)/$$f"; \
-   done
-
-uninstall-jrelibDATA:
-   @$(NORMAL_UNINSTALL)
-   @list='$(jrelib_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(jrelibdir)/$$f'"; \
- rm -f "$(DESTDIR)$(jrelibdir)/$$f"; \
-   done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -533,12 +500,9 @@
done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA)
+all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-   for dir in "$(DESTDIR)$(jrelibdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-   done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -581,7 +545,7 @@
 
 info-am:
 
-install-data-am: install-data-local install-jrelibDATA
+install-data-am: install-data-local
 
 install-dvi: install-dvi-recursive
 
@@ -615,7 +579,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-jrelibDATA uninstall-local
+uninstall-am: uninstall-local
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
install-strip
@@ -627,13 +591,12 @@
html-am info info-am install install-am install-data \
install-data-am install-data-local install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
-   install-info install-info-am install-jrelibDATA install-man \
-   

[kaffe] CVS kaffe (robilad): removed last KAFFE_CFLAGS use

[Kaffe CVS]

PatchSet 7775 
Date: 2008/03/01 21:26:13
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed last KAFFE_CFLAGS use

2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffeh/Makefile.am (AM_CFLAGS): Removed KAFFE_CFLAGS.

Members: 
ChangeLog:1.5275->1.5276 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5275 kaffe/ChangeLog:1.5276
--- kaffe/ChangeLog:1.5275  Sat Mar  1 21:21:51 2008
+++ kaffe/ChangeLog Sat Mar  1 21:26:13 2008
@@ -1,5 +1,9 @@
 2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffeh/Makefile.am (AM_CFLAGS): Removed KAFFE_CFLAGS.
+
+2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
+
* configure.ac (KAFFE_CFLAGS): Removed 
 
* kaffe/jvmpi/Makefile.am,

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed KAFFE_CFLAGS

[Kaffe CVS]

PatchSet 7774 
Date: 2008/03/01 21:21:51
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed KAFFE_CFLAGS

2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>

* configure.ac (KAFFE_CFLAGS): Removed

* kaffe/jvmpi/Makefile.am,
kaffe/kaffe/Makefile.am,
kaffe/kaffevm/Makefile.am,
kaffe/kaffevm/boehm-gc/Makefile.am,
kaffe/kaffevm/gcj/Makefile.am,
kaffe/kaffevm/intrp/Makefile.am,
kaffe/kaffevm/jit/Makefile.am,
kaffe/kaffevm/jit3/Makefile.am,
kaffe/kaffevm/kaffe-gc/Makefile.am,
kaffe/kaffevm/systems/beos-native/Makefile.am,
kaffe/kaffevm/systems/drops-l4threads/Makefile.am,
kaffe/kaffevm/systems/oskit-pthreads/Makefile.am,
kaffe/kaffevm/systems/unix-jthreads/Makefile.am,
kaffe/kaffevm/systems/unix-pthreads/Makefile.am,
kaffe/xprof/Makefile.am,
libraries/clib/awt/Makefile.am,
libraries/clib/awt/X/Makefile.am,
libraries/clib/zip/Makefile.am,
replace/Makefile.am,
test/internal/Makefile.am,
test/jni/Makefile.am: Removed KAFFE_CFLAGS.

Reported by:  Kiyo Inaba  <[EMAIL PROTECTED]>

Members: 
ChangeLog:1.5274->1.5275 
Makefile.in:1.316->1.317 
configure:1.643->1.644 
configure.ac:1.313->1.314 
config/Makefile.in:1.259->1.260 
include/Makefile.in:1.324->1.325 
kaffe/Makefile.in:1.207->1.208 
kaffe/jvmpi/Makefile.am:1.14->1.15 
kaffe/jvmpi/Makefile.in:1.133->1.134 
kaffe/kaffe/Makefile.am:1.40->1.41 
kaffe/kaffe/Makefile.in:1.232->1.233 
kaffe/kaffeh/Makefile.in:1.214->1.215 
kaffe/kaffevm/Makefile.am:1.113->1.114 
kaffe/kaffevm/Makefile.in:1.288->1.289 
kaffe/kaffevm/boehm-gc/Makefile.am:1.15->1.16 
kaffe/kaffevm/boehm-gc/Makefile.in:1.98->1.99 
kaffe/kaffevm/gcj/Makefile.am:1.10->1.11 
kaffe/kaffevm/gcj/Makefile.in:1.187->1.188 
kaffe/kaffevm/intrp/Makefile.am:1.14->1.15 
kaffe/kaffevm/intrp/Makefile.in:1.196->1.197 
kaffe/kaffevm/jit/Makefile.am:1.27->1.28 
kaffe/kaffevm/jit/Makefile.in:1.206->1.207 
kaffe/kaffevm/jit3/Makefile.am:1.21->1.22 
kaffe/kaffevm/jit3/Makefile.in:1.176->1.177 
kaffe/kaffevm/kaffe-gc/Makefile.am:1.11->1.12 
kaffe/kaffevm/kaffe-gc/Makefile.in:1.96->1.97 
kaffe/kaffevm/systems/Makefile.in:1.196->1.197 
kaffe/kaffevm/systems/beos-native/Makefile.am:1.11->1.12 
kaffe/kaffevm/systems/beos-native/Makefile.in:1.187->1.188 
kaffe/kaffevm/systems/drops-l4threads/Makefile.am:1.4->1.5 
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.51->1.52 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.am:1.12->1.13 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.193->1.194 
kaffe/kaffevm/systems/unix-jthreads/Makefile.am:1.17->1.18 
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.197->1.198 
kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.18->1.19 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.173->1.174 
kaffe/man/Makefile.in:1.194->1.195 
kaffe/scripts/Makefile.in:1.240->1.241 
kaffe/scripts/bat/Makefile.in:1.187->1.188 
kaffe/scripts/compat/Makefile.in:1.215->1.216 
kaffe/xprof/Makefile.am:1.17->1.18 
kaffe/xprof/Makefile.in:1.163->1.164 
libraries/Makefile.in:1.190->1.191 
libraries/clib/Makefile.in:1.212->1.213 
libraries/clib/awt/Makefile.am:1.15->1.16 
libraries/clib/awt/Makefile.in:1.205->1.206 
libraries/clib/awt/X/Makefile.am:1.23->1.24 
libraries/clib/awt/X/Makefile.in:1.201->1.202 
libraries/clib/awt/nano-X/Makefile.in:1.72->1.73 
libraries/clib/awt/qt/Makefile.in:1.153->1.154 
libraries/clib/awt/xynth/Makefile.in:1.28->1.29 
libraries/clib/zip/Makefile.am:1.23->1.24 
libraries/clib/zip/Makefile.in:1.210->1.211 
libraries/javalib/Makefile.in:1.603->1.604 
libraries/javalib/awt-implementations/Makefile.in:1.84->1.85 
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.107->1.108 
libraries/javalib/vmspecific/Makefile.in:1.36->1.37 
libraries/javalib/zlib-zip/Makefile.in:1.34->1.35 
replace/Makefile.am:1.21->1.22 
replace/Makefile.in:1.150->1.151 
test/Makefile.in:1.199->1.200 
test/internal/Makefile.am:1.38->1.39 
test/internal/Makefile.in:1.175->1.176 
test/jni/Makefile.am:1.23->1.24 
test/jni/Makefile.in:1.107->1.108 
test/regression/Makefile.in:1.278->1.279 
test/regression/compile_time/Makefile.in:1.127->1.128 
test/regression/compiler/Makefile.in:1.111->1.112 
test/regression/run_time/Makefile.in:1.126->1.127 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5274 kaffe/ChangeLog:1.5275
--- kaffe/ChangeLog:1.5274  Sat Mar  1 20:55:27 2008
+++ kaffe/ChangeLog Sat Mar

[kaffe] CVS kaffe (robilad): fixed build for jvmpi

[Kaffe CVS]

PatchSet 7773 
Date: 2008/03/01 20:55:27
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
fixed build for jvmpi

2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>

* include/Makefile.am (NOINSTALL_DERIVED_HDRS): Added
java_lang_ThreadGroup.h.

* kaffe/jvmpi/jvmpi_kaffe.c: Include java_lang_ThreadGroup.h
for the declaration of fields.

Reported by:  Michael Koch  <[EMAIL PROTECTED]>

Members: 
ChangeLog:1.5273->1.5274 
include/Makefile.am:1.147->1.148 
include/Makefile.in:1.323->1.324 
kaffe/jvmpi/jvmpi_kaffe.c:1.21->1.22 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5273 kaffe/ChangeLog:1.5274
--- kaffe/ChangeLog:1.5273  Sat Mar  1 20:49:35 2008
+++ kaffe/ChangeLog Sat Mar  1 20:55:27 2008
@@ -1,5 +1,15 @@
 2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * include/Makefile.am (NOINSTALL_DERIVED_HDRS): Added 
+   java_lang_ThreadGroup.h.
+
+   * kaffe/jvmpi/jvmpi_kaffe.c: Include java_lang_ThreadGroup.h
+   for the declaration of fields.
+
+   Reported by:  Michael Koch  <[EMAIL PROTECTED]>
+
+2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/constants.c (readConstantPool): Fixed typo.
 
Reported by:  Michael Koch  <[EMAIL PROTECTED]>
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.147 kaffe/include/Makefile.am:1.148
--- kaffe/include/Makefile.am:1.147 Fri Feb 22 07:00:45 2008
+++ kaffe/include/Makefile.am   Sat Mar  1 20:55:31 2008
@@ -44,6 +44,7 @@
java_lang_String.h \
java_lang_StackTraceElement.h \
java_lang_Thread.h \
+   java_lang_ThreadGroup.h \
java_lang_VMThread.h \
java_lang_Throwable.h \
java_lang_VMThrowable.h \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.323 kaffe/include/Makefile.in:1.324
--- kaffe/include/Makefile.in:1.323 Fri Feb 22 07:00:46 2008
+++ kaffe/include/Makefile.in   Sat Mar  1 20:55:32 2008
@@ -322,6 +322,7 @@
java_lang_String.h \
java_lang_StackTraceElement.h \
java_lang_Thread.h \
+   java_lang_ThreadGroup.h \
java_lang_VMThread.h \
java_lang_Throwable.h \
java_lang_VMThrowable.h \
Index: kaffe/kaffe/jvmpi/jvmpi_kaffe.c
diff -u kaffe/kaffe/jvmpi/jvmpi_kaffe.c:1.21 
kaffe/kaffe/jvmpi/jvmpi_kaffe.c:1.22
--- kaffe/kaffe/jvmpi/jvmpi_kaffe.c:1.21Sun Jun 11 23:12:09 2006
+++ kaffe/kaffe/jvmpi/jvmpi_kaffe.c Sat Mar  1 20:55:32 2008
@@ -32,6 +32,7 @@
 #include "code.h"
 #include "classMethod.h"
 #include "java_lang_Thread.h"
+#include "java_lang_ThreadGroup.h"
 #include "thread.h"
 #include "stackTrace.h"
 #include "stringSupport.h"

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): fixed typo on amd64

[Kaffe CVS]

PatchSet 7772 
Date: 2008/03/01 20:49:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
fixed typo on amd64

2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/constants.c (readConstantPool): Fixed typo.

Reported by:  Michael Koch  <[EMAIL PROTECTED]>

Members: 
ChangeLog:1.5272->1.5273 
kaffe/kaffevm/constants.c:1.22->1.23 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5272 kaffe/ChangeLog:1.5273
--- kaffe/ChangeLog:1.5272  Wed Feb 27 00:32:14 2008
+++ kaffe/ChangeLog Sat Mar  1 20:49:35 2008
@@ -1,3 +1,9 @@
+2008-03-01  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/kaffevm/constants.c (readConstantPool): Fixed typo.
+
+   Reported by:  Michael Koch  <[EMAIL PROTECTED]>
+
 2008-02-27  Dalibor Topic  <[EMAIL PROTECTED]>
 
* Makefile.am (EXTRA_DIST): Added ChangeLog.20. 
Index: kaffe/kaffe/kaffevm/constants.c
diff -u kaffe/kaffe/kaffevm/constants.c:1.22 
kaffe/kaffe/kaffevm/constants.c:1.23
--- kaffe/kaffe/kaffevm/constants.c:1.22Sat Feb 16 17:11:41 2008
+++ kaffe/kaffe/kaffevm/constants.c Sat Mar  1 20:49:37 2008
@@ -183,7 +183,7 @@
readu4(&d4b, fp);
 
 #if SIZEOF_VOID_P == 8
-   if(check_if_need_toswitch_words_in_jdouble())
+   if(check_if_need_to_switch_words_in_jdouble())
  pool[i] = WORDS_TO_LONG(d4b, d4);
else
  pool[i] = WORDS_TO_LONG(d4, d4b);

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): moved 1.1.9 changelog over to ChangeLog.20

[Kaffe CVS]

PatchSet 7771 
Date: 2008/02/27 00:32:14
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
moved 1.1.9 changelog over to ChangeLog.20

2008-02-27  Dalibor Topic  <[EMAIL PROTECTED]>

* Makefile.am (EXTRA_DIST): Added ChangeLog.20.

* ChangeLog.20: New file for the 1.1.9 change log.

Members: 
ChangeLog:1.5271->1.5272 
ChangeLog.20:INITIAL->1.1 
Makefile.am:1.151->1.152 
Makefile.in:1.315->1.316 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5271 kaffe/ChangeLog:1.5272
--- kaffe/ChangeLog:1.5271  Wed Feb 27 00:20:55 2008
+++ kaffe/ChangeLog Wed Feb 27 00:32:14 2008
@@ -1,2852 +1,12 @@
 2008-02-27  Dalibor Topic  <[EMAIL PROTECTED]>
 
-   * configure.ac, RELEASE-NOTES, README, WHATSNEW: Updated.
+   * Makefile.am (EXTRA_DIST): Added ChangeLog.20. 
 
-2008-02-22  Dalibor Topic  <[EMAIL PROTECTED]>
+   * ChangeLog.20: New file for the 1.1.9 change log.
 
-   * configure.ac, RELEASE-NOTES, README: Updated.
+2008-02-27  Dalibor Topic  <[EMAIL PROTECTED]>
 
-2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
+* configure.ac, RELEASE-NOTES, README, WHATSNEW: Updated.
 
-   * FAQ/FAQ.cross-compiling: Documented that dependencies need to be
-   cross compiled first.
-
-2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * FAQ/FAQ.requiredlibraries: Added glib.
-
-2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * libraries/clib/native/Unsafe.c: New file.
-
-2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * configure.ac : Check for glib.
-
-   * kaffe/kaffevm/Makefile.am (AM_CPPFLAGS): Added GLIB_CFLAGS.
-   (libkaffe_la_LIBADD) Added GLIB_LIBS.
-   (libkaffevm_la_SOURCES) Added libraries/clib/native/Unsafe.c.
-
-   * kaffe/kaffevm/jit/Makefile.am (AM_CPPFLAGS): Added GLIB_CFLAGS.
-(libengine_la_LDFLAGS) Added GLIB_LIBS.
-
-   * kaffe/kaffevm/jit3/Makefile.am (AM_CPPFLAGS): Added GLIB_CFLAGS.
-(libengine_la_LDFLAGS) Added GLIB_LIBS.
-
-   * kaffe/kaffevm/jit/methodcalls.c (soft_fixup_trampoline) Use glib 
atomic functions.
-
-   * kaffe/kaffevm/support.h (KaffeVM_GetFieldAddress): Added declaration.
-
-   * kaffe/kaffevm/support.c (KaffeVM_GetFieldAddress): New helper 
function,
-   created from getFieldAddress.
-
-   * libraries/clib/native/Field.c (getFieldAddress): Factored out into 
-   KaffeVM_GetFieldAddress.
-
-   * include/Makefile.am (NOINSTALL_JNI_DERIVED_HDRS): Added 
sun_misc_Unsafe.h.
-
-2008-02-20  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * kaffe/kaffevm/debug.c (kaffe_dprintf): Added missing casts to n.
-
-2008-02-20  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * TODO: Updated.
-
-   * include/Makefile.am (MAYBE_ZLIB_ZIP_HDRS): Removed unused headers.
-
-2008-02-18  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   JIT fixes for ARM.
-
-   * kaffe/kaffevm/exception.c (vmExcept_setJNIFrame): Removed unnecessary 
assert.
-
-   * kaffe/kaffevm/stackTrace.c (buildStackTrace): Check if a frame shows 
up twice
-   on the stack and abort when it does.
-
-2008-02-17  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * kaffe/kaffevm/fp.c (doubleDivide): Follow the spec more closely.
-
-   * kaffe/kaffevm/soft.c, kaffe/kaffevm/soft.h (soft_fdivl): 
-   Make the function available to the interpreter.
-
-   * kaffe/kaffevm/intrp/icode.h (div_double): Use soft_fdivl.
-
-2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * TODO: Updated.
-
-2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * config/config-hacks.h (HAVE_UNALIGNEDACCESS, MSG_PEEK)
-   (HAVE_DYN_UNDERSTORE, DEFAULT_LIBRARYPATH): Removed unused definitions.
-
-2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * kaffe/kaffevm/constants.c (readConstantPool): Use 
-   check_if_need_to_switch_words_in_jdouble instead of checking 
-   if DOUBLE_ORDER_OPPOSITE is defined.
-   (check_if_need_to_switch_words_in_jdouble): New static helper function.
-
-   * config/config-hacks.h (DOUBLE_ORDER_OPPOSITE): Removed.
-
-2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * THIRDPARTY: Added license information for files imported 
-   from GNU Classpath and GCC.
-
-2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_getZipData0)
-   (java_util_zip_ZipFile_getZipEntries0): Only close entries we've 
-   opened successfully.
-
-2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_getZipEntry0)
-   (java_util_zip_ZipFile_getZipData0)
-   (java_util_zip_ZipFile_getZipEntries0),
-   kaffe/kaffevm/findInJar.c (findClassInJar)
-   (getManifestMainAttribute),
-   * kaffe/kaffeh/support.c (kaffeh_findClass): Close opened zip entries
-   after use.
-
-   Reported by:  Ito Kazumitsu  <[EMAIL PROTECTED]>
-
-2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
-
-   * kaffe/kaffevm/jar.h, kaffe/

[kaffe] CVS kaffe (robilad): updated version to 1.1.10-pre

[Kaffe CVS]

PatchSet 7770 
Date: 2008/02/27 00:20:55
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated version to 1.1.10-pre

2008-02-27  Dalibor Topic  <[EMAIL PROTECTED]>

* configure.ac, RELEASE-NOTES, README, WHATSNEW: Updated.

Members: 
ChangeLog:1.5270->1.5271 
README:1.50->1.51 
RELEASE-NOTES:1.18->1.19 
WHATSNEW:1.77->1.78 
configure:1.642->1.643 
configure.ac:1.312->1.313 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5270 kaffe/ChangeLog:1.5271
--- kaffe/ChangeLog:1.5270  Fri Feb 22 07:27:36 2008
+++ kaffe/ChangeLog Wed Feb 27 00:20:55 2008
@@ -1,3 +1,7 @@
+2008-02-27  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * configure.ac, RELEASE-NOTES, README, WHATSNEW: Updated.
+
 2008-02-22  Dalibor Topic  <[EMAIL PROTECTED]>
 
* configure.ac, RELEASE-NOTES, README: Updated.
Index: kaffe/README
diff -u kaffe/README:1.50 kaffe/README:1.51
--- kaffe/README:1.50   Fri Feb 22 07:27:37 2008
+++ kaffe/READMEWed Feb 27 00:20:55 2008
@@ -1,7 +1,7 @@
  
 ===
 
-  Kaffe 1.1.9
+  Kaffe 1.1.10-pre
 
 ===
 
Index: kaffe/RELEASE-NOTES
diff -u kaffe/RELEASE-NOTES:1.18 kaffe/RELEASE-NOTES:1.19
--- kaffe/RELEASE-NOTES:1.18Fri Feb 22 07:27:37 2008
+++ kaffe/RELEASE-NOTES Wed Feb 27 00:20:55 2008
@@ -1,11 +1,11 @@
-Release Notes for 1.1.9
-===
+Release Notes for 1.1.10-pre
+
 
-Release 1.1.9 of Kaffe is a "development" release.
+Release 1.1.10-pre of Kaffe is a "development" release.
 
 It has been tested, but not as thoroughly as a
 production release would be. It contains major 
-improvements over 1.1.8, which was released 5 
+improvements over 1.1.9, which was released X 
 months ago. I anticipate that most people will have 
 less trouble with this release, and more fun.
 
Index: kaffe/WHATSNEW
diff -u kaffe/WHATSNEW:1.77 kaffe/WHATSNEW:1.78
--- kaffe/WHATSNEW:1.77 Fri Feb 22 07:27:37 2008
+++ kaffe/WHATSNEW  Wed Feb 27 00:20:55 2008
@@ -1,3 +1,7 @@
+What's New Since Kaffe 1.1.9
+
+
+
 What's New In Kaffe 1.1.9
 
 
Index: kaffe/configure
diff -u kaffe/configure:1.642 kaffe/configure:1.643
--- kaffe/configure:1.642   Fri Feb 22 07:27:37 2008
+++ kaffe/configure Wed Feb 27 00:20:55 2008
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Kaffe Virtual Machine 1.1.9.
+# Generated by GNU Autoconf 2.61 for Kaffe Virtual Machine 1.1.10-pre.
 #
 # Report bugs to .
 #
@@ -751,8 +751,8 @@
 # Identity of this package.
 PACKAGE_NAME='Kaffe Virtual Machine'
 PACKAGE_TARNAME='kaffe'
-PACKAGE_VERSION='1.1.9'
-PACKAGE_STRING='Kaffe Virtual Machine 1.1.9'
+PACKAGE_VERSION='1.1.10-pre'
+PACKAGE_STRING='Kaffe Virtual Machine 1.1.10-pre'
 PACKAGE_BUGREPORT='kaffe@kaffe.org'
 
 ac_unique_file="kaffe"
@@ -1563,7 +1563,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Kaffe Virtual Machine 1.1.9 to adapt to many kinds of 
systems.
+\`configure' configures Kaffe Virtual Machine 1.1.10-pre to adapt to many 
kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1637,7 +1637,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of Kaffe Virtual Machine 1.1.9:";;
+ short | recursive ) echo "Configuration of Kaffe Virtual Machine 
1.1.10-pre:";;
esac
   cat <<\_ACEOF
 
@@ -1830,7 +1830,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Kaffe Virtual Machine configure 1.1.9
+Kaffe Virtual Machine configure 1.1.10-pre
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1867,7 +1867,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Kaffe Virtual Machine $as_me 1.1.9, which was
+It was created by Kaffe Virtual Machine $as_me 1.1.10-pre, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2652,7 +2652,7 @@
 
 # Define the identity of the package.
  PACKAGE='kaffe'
- VERSION='1.1.9'
+ VERSION='1.1.10-pre'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -43322,7 +43322,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Kaffe Virtual Machine $as_me 1.1.9, which was
+This file was extended by Kaffe Virtual Machine $as_me 1.1.10-pre, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -43379,7 +43379,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Kaffe Virtua

[kaffe] CVS kaffe (robilad): updated docs for 1.1.9

[Kaffe CVS]

PatchSet 7769 
Date: 2008/02/22 07:27:36
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated docs for 1.1.9

2008-02-22  Dalibor Topic  <[EMAIL PROTECTED]>

* configure.ac, RELEASE-NOTES, README: Updated.

Members: 
ChangeLog:1.5269->1.5270 
README:1.49->1.50 
RELEASE-NOTES:1.17->1.18 
WHATSNEW:1.76->1.77 
configure:1.641->1.642 
configure.ac:1.311->1.312 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5269 kaffe/ChangeLog:1.5270
--- kaffe/ChangeLog:1.5269  Fri Feb 22 07:13:23 2008
+++ kaffe/ChangeLog Fri Feb 22 07:27:36 2008
@@ -1,3 +1,7 @@
+2008-02-22  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * configure.ac, RELEASE-NOTES, README: Updated.
+
 2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
 
* FAQ/FAQ.cross-compiling: Documented that dependencies need to be
Index: kaffe/README
diff -u kaffe/README:1.49 kaffe/README:1.50
--- kaffe/README:1.49   Sat Dec 22 08:30:44 2007
+++ kaffe/READMEFri Feb 22 07:27:37 2008
@@ -1,7 +1,7 @@
  
 ===
 
-  Kaffe 1.1.9-pre
+  Kaffe 1.1.9
 
 ===
 
Index: kaffe/RELEASE-NOTES
diff -u kaffe/RELEASE-NOTES:1.17 kaffe/RELEASE-NOTES:1.18
--- kaffe/RELEASE-NOTES:1.17Sun Sep 30 11:37:57 2007
+++ kaffe/RELEASE-NOTES Fri Feb 22 07:27:37 2008
@@ -1,11 +1,11 @@
-Release Notes for 1.1.9-pre
+Release Notes for 1.1.9
 ===
 
-Release 1.1.9-pre of Kaffe is a "development" release.
+Release 1.1.9 of Kaffe is a "development" release.
 
 It has been tested, but not as thoroughly as a
 production release would be. It contains major 
-improvements over 1.1.8, which was released X 
+improvements over 1.1.8, which was released 5 
 months ago. I anticipate that most people will have 
 less trouble with this release, and more fun.
 
@@ -101,25 +101,16 @@
 The following platforms have been tested for this release:
 (Please check FAQ/FAQ.platform-status for a more extensive result series)
 
-  arch |   os | engine | threads |  gc   | passed
+  arch |   os   | engine | threads |  gc   | passed
 ==
- arm9hf | linux| intrp  | pthread | kaffe | 137/150 * hf: Hard Float
- arm9hf | linux| jit| pthread | kaffe | 136/150
- arm9hf | linux| jit3   | pthread | kaffe | 124/150
- arm9sf | netbsd   | intrp  | pthread | kaffe | 146/150 * sf: Soft Float
-  i386  | cygwin   | intrp  | jthread | kaffe | 142/150
-  i386  | cygwin   | jit| jthread | kaffe | 131/150
-  i386  | cygwin   | intrp  | pthread | kaffe | 139/150
-  i386  | cygwin   | jit| pthread | kaffe | 126/150
-  i386  | netbsd   | intrp  | jthread | kaffe | 144/150
-  i386  | netbsd   | jit| jthread | kaffe | 144/150
-  i386  | netbsd   | jit3   | jthread | kaffe | 146/150
-  m68k  | linux| intrp  | pthread | kaffe | ~138/150
-  m68k  | linux| jit| pthread | kaffe | ~122/150
-  m68k  | linux| jit3   | pthread | kaffe | ~128/150
-  m68k  | netbsd   | jit3   | jthread | kaffe | ~123/150
-  m68k  | netbsd   | intrp  | jthread | kaffe | ~105/150
- sparc  | linux| jit| pthread | kaffe | 150/150
+ armel  | linux-oabi | intrp  | pthread | kaffe | 149/149
+ armel  | linux-oabi | jit3   | pthread | kaffe | 123/149
+ armel  | linux-eabi | intrp  | pthread | kaffe | 149/149
+  i386  | linux  | intrp  | pthread | kaffe | 149/149
+  i386  | linux  | jit| pthread | kaffe | 148/149
+  i386  | linux  | jit3   | pthread | kaffe | 149/149
+  i386  | darwin | intrp  | pthread | kaffe | 120/149
+  i386  | darwin | jit| pthread | kaffe | 120/149
 
 Platform Specific Notes
 ===
@@ -137,9 +128,12 @@
 
 * ARM
 
-Kiyo Inaba has made jit3 work on ARM. Current status:
-http://article.gmane.org/gmane.comp.java.vm.kaffe.general/11664/match=kaffe+arm
+Kiyo Inaba has made jit3 work on ARM.
 
+On armel linux, the interpreter works without regressions 
+with both oabi and eabi. The jit engine needs more work,
+though.
+ 
 * MIPS(EL)
 
 The jit3 implementation needs some more work. Casey 
Index: kaffe/WHATSNEW
diff -u kaffe/WHATSNEW:1.76 kaffe/WHATSNEW:1.77
--- kaffe/WHATSNEW:1.76 Sat Feb  2 16:07:23 2008
+++ kaffe/WHATSNEW  Fri Feb 22 07:27:37 2008
@@ -1,7 +1,11 @@
-What's New Since Kaffe 1.1.8
+What's New In Kaffe 1.1.9
 
 
+* Depend on glib for atomic operations
+* Support for JSR 166.
 * Depend on zziplib instead of zlib for JAR reading.
+* Many build system improvements.
+* Simplified threading subsystem interface.
 * Removed support for native big math.
 * Removed libltdl. Kaffe uses an existing installation 
   exclusively now.
Index: kaffe/configure
diff -u kaffe/configure:1.641 kaffe/configure:1.642
--- kaffe/configure:1.641   Fri Feb 22 07:00:39 2008
+++ kaffe/configure Fri Feb 22 07:27:37 2008
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-de

[kaffe] CVS kaffe (robilad): added the Unsafe.c file

[Kaffe CVS]

PatchSet 7766 
Date: 2008/02/22 07:02:32
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
added the Unsafe.c file

2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>

* libraries/clib/native/Unsafe.c: New file.

Members: 
ChangeLog:1.5266->1.5267 
libraries/clib/native/Unsafe.c:INITIAL->1.1 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5266 kaffe/ChangeLog:1.5267
--- kaffe/ChangeLog:1.5266  Fri Feb 22 07:00:35 2008
+++ kaffe/ChangeLog Fri Feb 22 07:02:32 2008
@@ -1,5 +1,9 @@
 2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * libraries/clib/native/Unsafe.c: New file.
+
+2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
+
* configure.ac : Check for glib.
 
* kaffe/kaffevm/Makefile.am (AM_CPPFLAGS): Added GLIB_CFLAGS.
===
Checking out kaffe/libraries/clib/native/Unsafe.c
RCS:  /home/cvs/kaffe/kaffe/libraries/clib/native/Unsafe.c,v
VERS: 1.1
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/clib/native/Unsafe.cFri Feb 22 07:15:20 2008
@@ -0,0 +1,188 @@
+/* Unsafe.c - Unsafe operations needed for concurrency
+   Copyright (C) 2008 Dalibor Topic  <[EMAIL PROTECTED]>
+
+This file is part of Kaffe.
+
+Kaffe is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+Kaffe is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Kaffe; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+#include 
+#include 
+
+#include "object.h"
+#include "support.h"
+
+/**
+ * Get the offset of a field.
+ *
+ * @param env JNI interface pointer
+ * @param unsafe unused
+ * @param field an java.lang.reflect.Field instance 
+ *
+ * @return offset of the field.
+ */
+JNIEXPORT jlong JNICALL Java_sun_misc_Unsafe_objectFieldOffset(JNIEnv* env, 
jobject unsafe UNUSED, jobject field)
+{
+  const jlong FAILED = -1;
+
+  /* First get the Field class. */
+  jclass fieldClass = (*env)->FindClass (env, "java/reflect/Field");
+  if (NULL != fieldClass) {
+/* Then get the slot field ID */
+jfieldID slotID = (*env)->GetFieldID(env, fieldClass, "slot", "I");
+if (NULL != slotID)
+  /* Return the slot for the given field. */
+  return (*env)->GetIntField(env, field, slotID);
+  
+  }
+  /* If for some reason I we can get the Field class or the ID of the slot 
field,
+ return and let the exception handling deal with the reason.
+  */
+  return FAILED;
+}
+
+/**
+ * Find the address of a field.
+ *
+ * @param env pointer to the JNI environment.
+ * @param obj object containing the field.
+ * @param offset slot of the field
+ *
+ * @return field's address.
+ */
+static volatile void * getFieldAddress(JNIEnv *env, jobject obj, jlong offset)
+{
+  jclass clazz = (*env)->GetObjectClass(env, obj);
+  return KaffeVM_GetFieldAddress(clazz, obj, offset);
+}
+
+
+/**
+ * Helper macro, defining a sun.misc.Unsafe compare and swap function 
+ * with a given NAME tail and TYPE of arguments.
+ */
+#define KAFFE_UNSAFE_COMPARE_AND_SWAP(NAME, TYPE)  
\
+JNIEXPORT jboolean JNICALL Java_sun_misc_Unsafe_compareAndSwap ## NAME(JNIEnv* 
env, jobject unsafe UNUSED, jobject obj, jlong offset, TYPE expect, TYPE 
update) \
+{ \
+  volatile TYPE * address = getFieldAddress(env, obj, offset); \
+  if (sizeof(TYPE) == sizeof(gint)) \
+return g_atomic_int_compare_and_exchange((volatile gint *) address, (gint) 
expect, (gint) update); \
+  else if (sizeof(TYPE) == sizeof(gpointer)) \
+return g_atomic_pointer_compare_and_exchange((volatile gpointe

[kaffe] CVS kaffe (robilad): updated cross compilation docs

[Kaffe CVS]

PatchSet 7768 
Date: 2008/02/22 07:13:23
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated cross compilation docs

2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>

* FAQ/FAQ.cross-compiling: Documented that dependencies need to be
cross compiled first.

Members: 
ChangeLog:1.5268->1.5269 
FAQ/FAQ.cross-compiling:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5268 kaffe/ChangeLog:1.5269
--- kaffe/ChangeLog:1.5268  Fri Feb 22 07:05:38 2008
+++ kaffe/ChangeLog Fri Feb 22 07:13:23 2008
@@ -1,5 +1,10 @@
 2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * FAQ/FAQ.cross-compiling: Documented that dependencies need to be
+   cross compiled first.
+
+2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
+
* FAQ/FAQ.requiredlibraries: Added glib.
 
 2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/FAQ/FAQ.cross-compiling
diff -u kaffe/FAQ/FAQ.cross-compiling:1.3 kaffe/FAQ/FAQ.cross-compiling:1.4
--- kaffe/FAQ/FAQ.cross-compiling:1.3   Thu Jan 19 01:07:57 2006
+++ kaffe/FAQ/FAQ.cross-compiling   Fri Feb 22 07:13:30 2008
@@ -44,6 +44,24 @@
 directory from source directory is a good practice. This is really
 needed for cross compiling.
 
+Dependencies are needed for cross compilation
+=
+
+In order to successfully cross-compile Kaffe, you will need to 
+start with the dependencies listed in FAQ.requiredlibraries, and
+cross-compile them first.
+
+It's easiest to cross compile all dependencies using the same
+--prefix to configure their builds, so that all the dependencies
+end up being installed in the same directory hierachy.
+
+When configuring kaffe for cross-compilation, you'll need to
+tell Kaffe's configure script where to look for the cross-compiled
+libraries using --with-includes and --with-libs options to point 
+Kaffe to the include and library files, respectively. You'll also
+need to set the environment variable PKG_CONFIG_PATH to point to 
+the location of the .pc files for the cross-compiled libraries.
+
 'kaffeh' is needed for cross compilation
 
 The way how to supply options to configure is roughly ok, but it is

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): Documented glib dependency

[Kaffe CVS]

PatchSet 7767 
Date: 2008/02/22 07:05:38
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Documented glib dependency

2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>

* FAQ/FAQ.requiredlibraries: Added glib.

Members: 
ChangeLog:1.5267->1.5268 
FAQ/FAQ.requiredlibraries:1.17->1.18 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5267 kaffe/ChangeLog:1.5268
--- kaffe/ChangeLog:1.5267  Fri Feb 22 07:02:32 2008
+++ kaffe/ChangeLog Fri Feb 22 07:05:38 2008
@@ -1,5 +1,9 @@
 2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * FAQ/FAQ.requiredlibraries: Added glib.
+
+2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
+
* libraries/clib/native/Unsafe.c: New file.
 
 2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/FAQ/FAQ.requiredlibraries
diff -u kaffe/FAQ/FAQ.requiredlibraries:1.17 
kaffe/FAQ/FAQ.requiredlibraries:1.18
--- kaffe/FAQ/FAQ.requiredlibraries:1.17Sat Feb  2 16:17:49 2008
+++ kaffe/FAQ/FAQ.requiredlibraries Fri Feb 22 07:05:55 2008
@@ -18,6 +18,12 @@
 distributor uses the RPM packaging format, you should check out
 http://www.rpmfind.net.
 
+glib
+
+
+You'll need glib for Kaffe's atomic operations support. It is available 
+from http://www.gtk.org/ .
+
 zziplib
 ---
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): added sun.misc.Unsafe implementation

[Kaffe CVS]

PatchSet 7765 
Date: 2008/02/22 07:00:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
added sun.misc.Unsafe implementation

2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>

* configure.ac : Check for glib.

* kaffe/kaffevm/Makefile.am (AM_CPPFLAGS): Added GLIB_CFLAGS.
(libkaffe_la_LIBADD) Added GLIB_LIBS.
(libkaffevm_la_SOURCES) Added libraries/clib/native/Unsafe.c.

* kaffe/kaffevm/jit/Makefile.am (AM_CPPFLAGS): Added GLIB_CFLAGS.
(libengine_la_LDFLAGS) Added GLIB_LIBS.

* kaffe/kaffevm/jit3/Makefile.am (AM_CPPFLAGS): Added GLIB_CFLAGS.
(libengine_la_LDFLAGS) Added GLIB_LIBS.

* kaffe/kaffevm/jit/methodcalls.c (soft_fixup_trampoline) Use glib 
atomic functions.

* kaffe/kaffevm/support.h (KaffeVM_GetFieldAddress): Added declaration.

* kaffe/kaffevm/support.c (KaffeVM_GetFieldAddress): New helper 
function,
created from getFieldAddress.

* libraries/clib/native/Field.c (getFieldAddress): Factored out into
KaffeVM_GetFieldAddress.

* include/Makefile.am (NOINSTALL_JNI_DERIVED_HDRS): Added 
sun_misc_Unsafe.h.

Members: 
ChangeLog:1.5265->1.5266 
Makefile.in:1.314->1.315 
configure:1.640->1.641 
configure.ac:1.310->1.311 
config/Makefile.in:1.258->1.259 
include/Makefile.am:1.146->1.147 
include/Makefile.in:1.322->1.323 
kaffe/Makefile.in:1.206->1.207 
kaffe/jvmpi/Makefile.in:1.132->1.133 
kaffe/kaffe/Makefile.in:1.231->1.232 
kaffe/kaffeh/Makefile.in:1.213->1.214 
kaffe/kaffevm/Makefile.am:1.112->1.113 
kaffe/kaffevm/Makefile.in:1.287->1.288 
kaffe/kaffevm/support.c:1.93->1.94 
kaffe/kaffevm/support.h:1.46->1.47 
kaffe/kaffevm/boehm-gc/Makefile.in:1.97->1.98 
kaffe/kaffevm/gcj/Makefile.in:1.186->1.187 
kaffe/kaffevm/intrp/Makefile.in:1.195->1.196 
kaffe/kaffevm/jit/Makefile.am:1.26->1.27 
kaffe/kaffevm/jit/Makefile.in:1.205->1.206 
kaffe/kaffevm/jit/methodcalls.c:1.15->1.16 
kaffe/kaffevm/jit3/Makefile.am:1.20->1.21 
kaffe/kaffevm/jit3/Makefile.in:1.175->1.176 
kaffe/kaffevm/kaffe-gc/Makefile.in:1.95->1.96 
kaffe/kaffevm/systems/Makefile.in:1.195->1.196 
kaffe/kaffevm/systems/beos-native/Makefile.in:1.186->1.187 
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.50->1.51 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.192->1.193 
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.196->1.197 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.172->1.173 
kaffe/man/Makefile.in:1.193->1.194 
kaffe/scripts/Makefile.in:1.239->1.240 
kaffe/scripts/bat/Makefile.in:1.186->1.187 
kaffe/scripts/compat/Makefile.in:1.214->1.215 
kaffe/xprof/Makefile.in:1.162->1.163 
libraries/Makefile.in:1.189->1.190 
libraries/clib/Makefile.in:1.211->1.212 
libraries/clib/awt/Makefile.in:1.204->1.205 
libraries/clib/awt/X/Makefile.in:1.200->1.201 
libraries/clib/awt/nano-X/Makefile.in:1.71->1.72 
libraries/clib/awt/qt/Makefile.in:1.152->1.153 
libraries/clib/awt/xynth/Makefile.in:1.27->1.28 
libraries/clib/native/Field.c:1.23->1.24 
libraries/clib/zip/Makefile.in:1.209->1.210 
libraries/javalib/Makefile.in:1.602->1.603 
libraries/javalib/awt-implementations/Makefile.in:1.83->1.84 
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.106->1.107 
libraries/javalib/vmspecific/Makefile.in:1.35->1.36 
libraries/javalib/zlib-zip/Makefile.in:1.33->1.34 
replace/Makefile.in:1.149->1.150 
test/Makefile.in:1.198->1.199 
test/internal/Makefile.in:1.174->1.175 
test/jni/Makefile.in:1.106->1.107 
test/regression/Makefile.in:1.277->1.278 
test/regression/compile_time/Makefile.in:1.126->1.127 
test/regression/compiler/Makefile.in:1.110->1.111 
test/regression/run_time/Makefile.in:1.125->1.126 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5265 kaffe/ChangeLog:1.5266
--- kaffe/ChangeLog:1.5265  Wed Feb 20 22:17:55 2008
+++ kaffe/ChangeLog Fri Feb 22 07:00:35 2008
@@ -1,3 +1,29 @@
+2008-02-21  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * configure.ac : Check for glib.
+
+   * kaffe/kaffevm/Makefile.am (AM_CPPFLAGS): Added GLIB_CFLAGS.
+   (libkaffe_la_LIBADD) Added GLIB_LIBS.
+   (libkaffevm_la_SOURCES) Added libraries/clib/native/Unsafe.c.
+
+   * kaffe/kaffevm/jit/Makefile.am (AM_CPPFLAGS): Added GLIB_CFLAGS.
+(libengine_la_LDFLAGS) Added GLIB_LIBS.
+
+   * kaffe/kaffevm/jit3/Makefile.am (AM_CPPFLAGS): Added GLIB_CFLAGS.
+(libengine_la_LDFLAGS) Added GLIB_LIBS.
+
+   * kaffe/kaffevm/jit/methodcalls.c (soft_fixup_trampoline) Use glib 
atomic functions.
+
+   * kaffe/kaffevm/support.h (KaffeVM_GetFieldAddress): Added de

[kaffe] CVS kaffe (robilad): fixed compiler warnings

[Kaffe CVS]

PatchSet 7764 
Date: 2008/02/20 22:17:55
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
fixed compiler warnings

2008-02-20  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/debug.c (kaffe_dprintf): Added missing casts to n.

Members: 
ChangeLog:1.5264->1.5265 
kaffe/kaffevm/debug.c:1.68->1.69 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5264 kaffe/ChangeLog:1.5265
--- kaffe/ChangeLog:1.5264  Wed Feb 20 14:29:07 2008
+++ kaffe/ChangeLog Wed Feb 20 22:17:55 2008
@@ -1,5 +1,9 @@
 2008-02-20  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/debug.c (kaffe_dprintf): Added missing casts to n.
+
+2008-02-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
* TODO: Updated.
 
* include/Makefile.am (MAYBE_ZLIB_ZIP_HDRS): Removed unused headers.
Index: kaffe/kaffe/kaffevm/debug.c
diff -u kaffe/kaffe/kaffevm/debug.c:1.68 kaffe/kaffe/kaffevm/debug.c:1.69
--- kaffe/kaffe/kaffevm/debug.c:1.68Thu Jan 31 20:49:47 2008
+++ kaffe/kaffe/kaffevm/debug.c Wed Feb 20 22:17:59 2008
@@ -444,7 +444,7 @@
n = vsnprintf(debugBuffer + bufferBegin, max, fmt, args);
 
/* The return value is bytes *needed* not bytes *used* */
-   if (n > max)
+   if (n > 0 && (size_t )n > max)
n = max;
 #else
n = vsprintf(debugBuffer + bufferBegin, fmt, args);
@@ -461,7 +461,7 @@
 * defintions?
 */
max = 0;
-   while (max < n) {
+   while (max < (size_t) n) {
 w = write(kaffe_dprintf_fd,
debugBuffer + max,
(size_t)n - max);

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): don't generate unused zip headers

[Kaffe CVS]

PatchSet 7763 
Date: 2008/02/20 14:29:07
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
don't generate unused zip headers

2008-02-20  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

* include/Makefile.am (MAYBE_ZLIB_ZIP_HDRS): Removed unused headers.

Members: 
ChangeLog:1.5263->1.5264 
TODO:1.55->1.56 
include/Makefile.am:1.145->1.146 
include/Makefile.in:1.321->1.322 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5263 kaffe/ChangeLog:1.5264
--- kaffe/ChangeLog:1.5263  Tue Feb 19 03:33:30 2008
+++ kaffe/ChangeLog Wed Feb 20 14:29:07 2008
@@ -1,3 +1,9 @@
+2008-02-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * TODO: Updated.
+
+   * include/Makefile.am (MAYBE_ZLIB_ZIP_HDRS): Removed unused headers.
+
 2008-02-18  Dalibor Topic  <[EMAIL PROTECTED]>
 
JIT fixes for ARM.
Index: kaffe/TODO
diff -u kaffe/TODO:1.55 kaffe/TODO:1.56
--- kaffe/TODO:1.55 Sat Feb 16 17:40:10 2008
+++ kaffe/TODO  Wed Feb 20 14:29:07 2008
@@ -14,10 +14,6 @@
 
 * Cleanup
  * Remove KAFFE_CFLAGS
- * In config/config-hacks.h: Remove DOUBLE_ORDER_OPPOSITE.
-In kaffe/kaffevm/constants.c: Instead of it, check if 
-NEGATIVE_INFINITY (0xfff0L) as jdouble is
-< 0.0 as a static bool, and only swap in that case.
  * Remove kaffe's copies of jni.h, jni-md.h, etc. Use GNU Classpath's headers 
instead.
 Also remove the config-int.h generation now that we are using C99.
  * Look into removing the logging.properties file in libraries/javalib.
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.145 kaffe/include/Makefile.am:1.146
--- kaffe/include/Makefile.am:1.145 Wed Jan  2 23:48:24 2008
+++ kaffe/include/Makefile.am   Wed Feb 20 14:29:09 2008
@@ -31,10 +31,6 @@
 
 if COND_ZLIB_ZIP
 MAYBE_ZLIB_ZIP_HDRS = \
-   java_util_zip_Adler32.h \
-   java_util_zip_CRC32.h \
-   java_util_zip_Deflater.h \
-   java_util_zip_Inflater.h \
java_util_zip_ZipEntry.h \
java_util_zip_ZipFile.h 
 endif
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.321 kaffe/include/Makefile.in:1.322
--- kaffe/include/Makefile.in:1.321 Sat Feb  2 15:58:14 2008
+++ kaffe/include/Makefile.in   Wed Feb 20 14:29:10 2008
@@ -308,10 +308,6 @@
 # otherwise it goes into the other one.
 INSTALL_DERIVED_HDRS = 
 @[EMAIL PROTECTED] = \
[EMAIL PROTECTED]@  java_util_zip_Adler32.h \
[EMAIL PROTECTED]@  java_util_zip_CRC32.h \
[EMAIL PROTECTED]@  java_util_zip_Deflater.h \
[EMAIL PROTECTED]@  java_util_zip_Inflater.h \
 @COND_ZLIB_ZIP_TRUE@   java_util_zip_ZipEntry.h \
 @COND_ZLIB_ZIP_TRUE@   java_util_zip_ZipFile.h 
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): jit fixes for arm linux

[Kaffe CVS]

PatchSet 7762 
Date: 2008/02/19 03:33:30
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
jit fixes for arm linux

2008-02-18  Dalibor Topic  <[EMAIL PROTECTED]>

JIT fixes for ARM.

* kaffe/kaffevm/exception.c (vmExcept_setJNIFrame): Removed unnecessary 
assert.

* kaffe/kaffevm/stackTrace.c (buildStackTrace): Check if a frame shows 
up twice
on the stack and abort when it does.

Members: 
ChangeLog:1.5262->1.5263 
kaffe/kaffevm/exception.c:1.110->1.111 
kaffe/kaffevm/stackTrace.c:1.55->1.56 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5262 kaffe/ChangeLog:1.5263
--- kaffe/ChangeLog:1.5262  Sun Feb 17 13:17:59 2008
+++ kaffe/ChangeLog Tue Feb 19 03:33:30 2008
@@ -1,3 +1,12 @@
+2008-02-18  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   JIT fixes for ARM.
+
+   * kaffe/kaffevm/exception.c (vmExcept_setJNIFrame): Removed unnecessary 
assert.
+
+   * kaffe/kaffevm/stackTrace.c (buildStackTrace): Check if a frame shows 
up twice
+   on the stack and abort when it does.
+
 2008-02-17  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffevm/fp.c (doubleDivide): Follow the spec more closely.
Index: kaffe/kaffe/kaffevm/exception.c
diff -u kaffe/kaffe/kaffevm/exception.c:1.110 
kaffe/kaffe/kaffevm/exception.c:1.111
--- kaffe/kaffe/kaffevm/exception.c:1.110   Sat Jan 19 15:13:39 2008
+++ kaffe/kaffe/kaffevm/exception.c Tue Feb 19 03:33:32 2008
@@ -89,7 +89,6 @@
assert(eh != NULL);
assert(eh->meth == VMEXCEPTHANDLER_KAFFEJNI_HANDLER);
assert(fp != (JNIFrameAddress)0);
-
return (eh->frame.jni.fp == fp);
 }
 
@@ -97,7 +96,6 @@
 vmExcept_setJNIFrame(VmExceptHandler* eh, JNIFrameAddress fp)
 {
assert(eh != NULL);
-   assert(fp != (JNIFrameAddress)0);
 
eh->meth = VMEXCEPTHANDLER_KAFFEJNI_HANDLER;
eh->frame.jni.fp = fp;
Index: kaffe/kaffe/kaffevm/stackTrace.c
diff -u kaffe/kaffe/kaffevm/stackTrace.c:1.55 
kaffe/kaffe/kaffevm/stackTrace.c:1.56
--- kaffe/kaffe/kaffevm/stackTrace.c:1.55   Sat Sep 22 17:36:13 2007
+++ kaffe/kaffe/kaffevm/stackTrace.cTue Feb 19 03:33:32 2008
@@ -52,23 +52,43 @@
 Hjava_lang_Object*
 buildStackTrace(struct _exceptionFrame* base)
 {
-   int cnt;
struct _stackTrace trace;
stackTraceInfo* info;
struct _exceptionFrame orig;
+#ifdef TRANSLATOR
+   struct _exceptionFrame* previousframe;
+#else
+   VmExceptHandler* previousframe;
+#endif
+   int cnt;
+   int elements;
 
(void) orig;/* avoid compiler warning in intrp */
DBG(STACKTRACE,
dprintf("STACKTRACEINIT(trace, %p, %p, orig);\n", base, base); );
STACKTRACEINIT(trace, base, base, orig);
cnt = 0;
+   previousframe = trace.frame;
+
while(STACKTRACEFRAME(trace) && KTHREAD(on_current_stack) ((void 
*)STACKTRACEFP(trace))) {
+#ifdef TRANSLATOR
+   DBG(STACKTRACE,
+   dprintf("STACKTRACESTEP(%d, fp=%p, nextframe=%p);\n", 
+cnt, (void *) FPFRAME(trace.frame), (void *) 
NEXTFRAME(trace.frame)); );
+#endif
cnt++;
STACKTRACESTEP(trace);
+   /* break out of the frame counting loop if 
+* we start looping frames. */
+   if (previousframe == trace.frame)
+   break;
+   else
+   previousframe = trace.frame;
}
+   elements = cnt;
 
/* Build an array of stackTraceInfo */
-   info = gc_malloc(sizeof(stackTraceInfo) * (cnt+1), KGC_ALLOC_NOWALK);
+   info = gc_malloc(sizeof(stackTraceInfo) * (elements+1), 
KGC_ALLOC_NOWALK);
if (!info) {
dprintf("buildStackTrace(%p): can't allocate stackTraceInfo\n",
base);
@@ -81,7 +101,7 @@
dprintf("STACKTRACEINIT(trace, &orig, %p, orig);\n", base); );
STACKTRACEINIT(trace, &orig, base, orig);
 
-   while (STACKTRACEFRAME(trace) && KTHREAD(on_current_stack) ((void 
*)STACKTRACEFP(trace))) {
+   while (cnt < elements) {
info[cnt].pc = STACKTRACEPC(trace);
info[cnt].fp = STACKTRACEFP(trace);
info[cnt].meth = stacktraceFindMethod (info[cnt].fp, 
info[cnt].pc);

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): cleanup interpreter double division

[Kaffe CVS]

PatchSet 7761 
Date: 2008/02/17 13:17:59
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cleanup interpreter double division

2008-02-17  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/fp.c (doubleDivide): Follow the spec more closely.

* kaffe/kaffevm/soft.c, kaffe/kaffevm/soft.h (soft_fdivl):
Make the function available to the interpreter.

* kaffe/kaffevm/intrp/icode.h (div_double): Use soft_fdivl.

Members: 
ChangeLog:1.5261->1.5262 
kaffe/kaffevm/fp.c:1.14->1.15 
kaffe/kaffevm/soft.c:1.90->1.91 
kaffe/kaffevm/soft.h:1.20->1.21 
kaffe/kaffevm/intrp/icode.h:1.28->1.29 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5261 kaffe/ChangeLog:1.5262
--- kaffe/ChangeLog:1.5261  Sat Feb 16 17:40:10 2008
+++ kaffe/ChangeLog Sun Feb 17 13:17:59 2008
@@ -1,3 +1,12 @@
+2008-02-17  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/kaffevm/fp.c (doubleDivide): Follow the spec more closely.
+
+   * kaffe/kaffevm/soft.c, kaffe/kaffevm/soft.h (soft_fdivl): 
+   Make the function available to the interpreter.
+
+   * kaffe/kaffevm/intrp/icode.h (div_double): Use soft_fdivl.
+
 2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
 
* TODO: Updated.
Index: kaffe/kaffe/kaffevm/fp.c
diff -u kaffe/kaffe/kaffevm/fp.c:1.14 kaffe/kaffe/kaffevm/fp.c:1.15
--- kaffe/kaffe/kaffevm/fp.c:1.14   Fri Feb 15 01:32:36 2008
+++ kaffe/kaffe/kaffevm/fp.cSun Feb 17 13:18:01 2008
@@ -131,19 +131,48 @@
 jdouble
 doubleDivide(jdouble v1, jdouble v2)
 {
-   if (isnan(v1) || isnan(v2)) {
+   jboolean negative_result;
+
+   if (isnan(v1) || isnan(v2)) 
return KAFFE_JDOUBLE_NAN;
+
+   negative_result = ((signbit(v1) == 0) && (signbit(v2) != 0))
+   || ((signbit(v1) != 0) && (signbit(v2) == 0));
+
+   if (isinf(v1) && isinf(v2)) 
+   return KAFFE_JDOUBLE_NAN;
+
+   if (isinf(v1) && isfinite(v2)) {
+   if (negative_result)
+   return KAFFE_JDOUBLE_NEG_INF;
+   else
+   return KAFFE_JDOUBLE_POS_INF;
}
-   if (v2 != 0.0) {
-   return (v1 / v2);
+
+   if (isfinite(v1) && isinf(v2)) {
+   if (negative_result)
+   return -0.0;
+   else
+   return 0.0;
}
+
if (v1 == 0.0) {
-   return KAFFE_JDOUBLE_NAN;
+   if (v2 == 0.0)
+   return KAFFE_JDOUBLE_NAN;
+   else if (negative_result)
+   return -0.0;
+   else
+   return 0.0;
+   }
+
+   if (v1 != 0.0 && v2 == 0.0) {
+   if (negative_result)
+   return KAFFE_JDOUBLE_NEG_INF;
+   else
+   return KAFFE_JDOUBLE_POS_INF;
}
-   if (signbit(v1) ^ signbit(v2))
- return KAFFE_JDOUBLE_NEG_INF;
-   else
- return KAFFE_JDOUBLE_POS_INF;
+
+   return (v1 / v2);
 }
 
 /*
Index: kaffe/kaffe/kaffevm/soft.c
diff -u kaffe/kaffe/kaffevm/soft.c:1.90 kaffe/kaffe/kaffevm/soft.c:1.91
--- kaffe/kaffe/kaffevm/soft.c:1.90 Fri Feb 15 00:01:19 2008
+++ kaffe/kaffe/kaffevm/soft.c  Sun Feb 17 13:18:02 2008
@@ -686,6 +686,12 @@
   return soft_dcmpl(v1, v2);
 }
 
+jdouble
+soft_fdivl(jdouble v1, jdouble v2)
+{
+   return doubleDivide(v1, v2);
+}
+
 #if defined(TRANSLATOR)
 jlong
 soft_lmul(jlong v1, jlong v2)
@@ -746,12 +752,6 @@
 soft_fdiv(jfloat v1, jfloat v2)
 {
return floatDivide(v1, v2);
-}
-
-jdouble
-soft_fdivl(jdouble v1, jdouble v2)
-{
-   return doubleDivide(v1, v2);
 }
 
 jfloat
Index: kaffe/kaffe/kaffevm/soft.h
diff -u kaffe/kaffe/kaffevm/soft.h:1.20 kaffe/kaffe/kaffevm/soft.h:1.21
--- kaffe/kaffe/kaffevm/soft.h:1.20 Sun Mar  5 14:35:26 2006
+++ kaffe/kaffe/kaffevm/soft.h  Sun Feb 17 13:18:02 2008
@@ -59,6 +59,8 @@
 void*  soft_multianewarray(struct Hjava_lang_Class*, jint, struct _slots*);
 #endif
 
+jdoublesoft_fdivl(jdouble, jdouble);
+
 #if defined(TRANSLATOR)
 jlong  soft_lmul(jlong, jlong);
 jlong  soft_ldiv(jlong, jlong);
@@ -70,7 +72,6 @@
 jfloat soft_fmul(jfloat, jfloat);
 jdoublesoft_fmull(jdouble, jdouble);
 jfloat soft_fdiv(jfloat, jfloat);
-jdoublesoft_fdivl(jdouble, jdouble);
 jfloat soft_frem(jfloat, jfloat);
 jdoublesoft_freml(jdouble, jdouble);
 jlong  soft_lshll(jlong, jint);
Index: kaffe/kaffe/kaffevm/intrp/icode.h
diff -u kaffe/kaffe/kaffevm/intrp/icode.h:1.28 
kaffe/kaffe/kaffevm/intrp/icode.h:1.29
--- kaffe/kaffe/kaffevm/intrp/icode.h:1.28  Mon Feb 11 23:26:09 2008
+++ kaffe/kaffe/kaffevm/intrp/icode.h   Sun Feb 17 13:18:03 2008
@@ -266,7 +266,7 @@
 #definemul_float(t, f1, f2)(t)[0].v.tfloat = 
(f1)[0].v.tfloat * (f2)[0].v.tfloat
 #definemul_double(t, f1, f2)   (t)[0].v.tdouble = 
(f1)[0].v.tdouble * (f2)[0].v.tdouble
 #definedi

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7760 
Date: 2008/02/16 17:40:10
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

Members: 
ChangeLog:1.5260->1.5261 
TODO:1.54->1.55 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5260 kaffe/ChangeLog:1.5261
--- kaffe/ChangeLog:1.5260  Sat Feb 16 17:20:07 2008
+++ kaffe/ChangeLog Sat Feb 16 17:40:10 2008
@@ -1,5 +1,9 @@
 2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * TODO: Updated.
+
+2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
+
* config/config-hacks.h (HAVE_UNALIGNEDACCESS, MSG_PEEK)
(HAVE_DYN_UNDERSTORE, DEFAULT_LIBRARYPATH): Removed unused definitions.
 
Index: kaffe/TODO
diff -u kaffe/TODO:1.54 kaffe/TODO:1.55
--- kaffe/TODO:1.54 Fri Feb 15 01:51:37 2008
+++ kaffe/TODO  Sat Feb 16 17:40:10 2008
@@ -23,6 +23,7 @@
  * Look into removing the logging.properties file in libraries/javalib.
  * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
+ * Use CScout http://www.spinellis.gr/cscout/doc/indexw.html to weed out 
unused symbols.
 
 * Architectural changes:
  * Make threading model runtime selectable.

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): cleaned up config hacks

[Kaffe CVS]

PatchSet 7759 
Date: 2008/02/16 17:20:07
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cleaned up config hacks

008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>

* config/config-hacks.h (HAVE_UNALIGNEDACCESS, MSG_PEEK)
(HAVE_DYN_UNDERSTORE, DEFAULT_LIBRARYPATH): Removed unused definitions.

Members: 
ChangeLog:1.5259->1.5260 
config/config-hacks.h:1.19->1.20 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5259 kaffe/ChangeLog:1.5260
--- kaffe/ChangeLog:1.5259  Sat Feb 16 17:11:39 2008
+++ kaffe/ChangeLog Sat Feb 16 17:20:07 2008
@@ -1,5 +1,10 @@
 2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * config/config-hacks.h (HAVE_UNALIGNEDACCESS, MSG_PEEK)
+   (HAVE_DYN_UNDERSTORE, DEFAULT_LIBRARYPATH): Removed unused definitions.
+
+2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/constants.c (readConstantPool): Use 
check_if_need_to_switch_words_in_jdouble instead of checking 
if DOUBLE_ORDER_OPPOSITE is defined.
Index: kaffe/config/config-hacks.h
diff -u kaffe/config/config-hacks.h:1.19 kaffe/config/config-hacks.h:1.20
--- kaffe/config/config-hacks.h:1.19Sat Feb 16 17:11:41 2008
+++ kaffe/config/config-hacks.h Sat Feb 16 17:20:09 2008
@@ -13,15 +13,9 @@
 /* Hacks to configure NeXT */
 #if defined(NeXT)
 #undef  HAVE_SYS_UTSNAME_H
-#define HAVE_DYN_UNDERSTORE 1
 #undef HAVE_SBRK
 #endif
 
-/* Hack to configure AmigaOS */
-#if defined(__amigaos__)
-#define HAVE_DYN_UNDERSTORE 1
-#endif  
-
 /* Hack for Windows */
 #if defined(__WIN32__) || defined(WIN32) || defined(_WIN32)
 #undef __WIN32__
@@ -38,31 +32,9 @@
 #endif
 #endif
 
-/* Hack for NetBSD */
-#if defined(__NetBSD__)
-#defineHAVE_DYN_UNDERSTORE 1
-#defineDEFAULT_LIBRARYPATH "/usr/local/lib:/usr/lib"
-#endif
-
 /* Hack to configure AIX */
 #if defined(_AIX)
 #define  HAVE_SYS_SELECT_H 1
-#endif
-
-/* Hack to configure BeOS R4 */
-#if defined(__BEOS__)
-#include 
-#if defined(MSG_PEEK)
-#error Looks like BeOS finally supports MSG_PEEK.
-#error Please remove the MSG_PEEK hack in config-hacks.h and syscalls.c.
-#else
-#define MSG_PEEK 0x2
-#endif
-#endif
-
-/* The 386 can do unaligned memory accesses */
-#if defined(__i386__)
-#defineHAVE_UNALIGNEDACCESS
 #endif
 
 /*

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): fixed check if words need to be switched on arm

[Kaffe CVS]

PatchSet 7758 
Date: 2008/02/16 17:11:39
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
fixed check if words need to be switched on arm

2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/constants.c (readConstantPool): Use
check_if_need_to_switch_words_in_jdouble instead of checking
if DOUBLE_ORDER_OPPOSITE is defined.
(check_if_need_to_switch_words_in_jdouble): New static helper function.

* config/config-hacks.h (DOUBLE_ORDER_OPPOSITE): Removed.

Members: 
ChangeLog:1.5258->1.5259 
config/config-hacks.h:1.18->1.19 
kaffe/kaffevm/constants.c:1.21->1.22 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5258 kaffe/ChangeLog:1.5259
--- kaffe/ChangeLog:1.5258  Sat Feb 16 00:49:40 2008
+++ kaffe/ChangeLog Sat Feb 16 17:11:39 2008
@@ -1,5 +1,14 @@
 2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/constants.c (readConstantPool): Use 
+   check_if_need_to_switch_words_in_jdouble instead of checking 
+   if DOUBLE_ORDER_OPPOSITE is defined.
+   (check_if_need_to_switch_words_in_jdouble): New static helper function.
+
+   * config/config-hacks.h (DOUBLE_ORDER_OPPOSITE): Removed.
+
+2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
+
* THIRDPARTY: Added license information for files imported 
from GNU Classpath and GCC.
 
Index: kaffe/config/config-hacks.h
diff -u kaffe/config/config-hacks.h:1.18 kaffe/config/config-hacks.h:1.19
--- kaffe/config/config-hacks.h:1.18Tue Jun 21 16:41:36 2005
+++ kaffe/config/config-hacks.h Sat Feb 16 17:11:41 2008
@@ -65,18 +65,6 @@
 #defineHAVE_UNALIGNEDACCESS
 #endif
 
-/* On arm, word order of doubles is always big endian when
- * using FPA. When using VFP, word order of doubles follows
- * the word order of the memory system.
- *
- * Therefore, the word order of doubles is opposite to the
- * word order of jlongs when using a little endian arm
- * unless VFP is used.
- */
-#if defined(__ARMEL__) && !defined(__VFP_FP__)
-#define DOUBLE_ORDER_OPPOSITE
-#endif
-
 /*
  * GCC before 3.0 does not support explicit branch optimization.
  */
Index: kaffe/kaffe/kaffevm/constants.c
diff -u kaffe/kaffe/kaffevm/constants.c:1.21 
kaffe/kaffe/kaffevm/constants.c:1.22
--- kaffe/kaffe/kaffevm/constants.c:1.21Sat Apr 22 12:40:03 2006
+++ kaffe/kaffe/kaffevm/constants.c Sat Feb 16 17:11:41 2008
@@ -28,6 +28,21 @@
 /*
  * XXX move into readClass.c
  */
+/**
+ * Check if the words making up a jdouble need to be 
+ * switched around. Necessary for some ARM systems.
+ */
+static
+jboolean check_if_need_to_switch_words_in_jdouble(void) {
+  jvalue val; 
+
+  /* -0.0 as an IEEE754 double is 0x80LL, i.e. < 0LL.
+   * If the words in the double are switched around, then the 
+   * bit pattern will be 0x8000LL, i.e. > 0LL. 
+   */
+  val.d = -0.0;
+  return val.j > 0;
+}
 
 /*
  * Read in constant pool from opened file.
@@ -168,23 +183,23 @@
readu4(&d4b, fp);
 
 #if SIZEOF_VOID_P == 8
-#if defined(DOUBLE_ORDER_OPPOSITE)
-   pool[i] = WORDS_TO_LONG(d4b, d4);
-#else
-   pool[i] = WORDS_TO_LONG(d4, d4b);
-#endif /* DOUBLE_ORDER_OPPOSITE */
+   if(check_if_need_toswitch_words_in_jdouble())
+ pool[i] = WORDS_TO_LONG(d4b, d4);
+   else
+ pool[i] = WORDS_TO_LONG(d4, d4b);
i++;
pool[i] = 0;
 #else
-#if defined(DOUBLE_ORDER_OPPOSITE)
-   pool[i] = d4b;
-   i++;
-   pool[i] = d4;
-#else
-   pool[i] = d4;
-   i++;
-   pool[i] = d4b;
-#endif /* DOUBLE_ORDER_OPPOSITE */
+   if (check_if_need_to_switch_words_in_jdouble()) {
+ pool[i] = d4b;
+ i++;
+ pool[i] = d4;
+   }
+   else {
+ pool[i] = d4;
+ i++;
+ pool[i] = d4b;
+   }
 #endif /* SIZEOF_VOID_P == 8 */
tags[i] = CONSTANT_Unknown;
break;

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): updated THIRDPARTY licensing information

[Kaffe CVS]

PatchSet 7757 
Date: 2008/02/16 00:49:40
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated THIRDPARTY licensing information

2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>

* THIRDPARTY: Added license information for files imported
from GNU Classpath and GCC.

Members: 
ChangeLog:1.5257->1.5258 
THIRDPARTY:1.61->1.62 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5257 kaffe/ChangeLog:1.5258
--- kaffe/ChangeLog:1.5257  Fri Feb 15 23:46:56 2008
+++ kaffe/ChangeLog Sat Feb 16 00:49:40 2008
@@ -1,5 +1,10 @@
 2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * THIRDPARTY: Added license information for files imported 
+   from GNU Classpath and GCC.
+
+2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
+
* libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_getZipData0)
(java_util_zip_ZipFile_getZipEntries0): Only close entries we've 
opened successfully.
Index: kaffe/THIRDPARTY
diff -u kaffe/THIRDPARTY:1.61 kaffe/THIRDPARTY:1.62
--- kaffe/THIRDPARTY:1.61   Sat Feb  2 16:17:48 2008
+++ kaffe/THIRDPARTYSat Feb 16 00:49:40 2008
@@ -3,6 +3,39 @@
 licenses of third party sources either in their respective sources, or
 in license*.terms files in the top directory, or here. 
 
+* GNU Classpath VM interface
+
+Taken from GNU Classpath, which is licensed under the GNU General Public
+License with a special exception:
+
+   Linking this library statically or dynamically with other modules is
+   making a combined work based on this library.  Thus, the terms and
+   conditions of the GNU General Public License cover the whole
+   combination.
+
+   As a special exception, the copyright holders of this library give you
+   permission to link this library with independent modules to produce an
+   executable, regardless of the license terms of these independent
+   modules, and to copy and distribute the resulting executable under
+   terms of your choice, provided that you also meet, for each linked
+   independent module, the terms and conditions of the license of that
+   module.  An independent module is a module which is not derived from
+   or based on this library.  If you modify this library, you may extend
+   this exception to your version of the library, but you are not
+   obligated to do so.  If you do not wish to do so, delete this
+   exception statement from your version. 
+
+See the file license.terms for details of the GNU GPL.
+
+More information on GNU Classpath is available from http://www.classpath.org.
+
+* GCC clear cache implementation for arm & m68k GNU/Linux
+
+Taken from the GCC project, which is licensed under the GNU General Public
+License. See the file license.terms for details of the GNU GPL.
+
+More information on GCC is available from http://gcc.gnu.org.
+
 * Alpha, ARM, ia64, M68k, MIPS, S390 and SPARC atomic compare_and_swap, 
   Linux sigcontextinfo
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): more zip entry closing cleanup

[Kaffe CVS]

PatchSet 7756 
Date: 2008/02/15 23:46:56
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
more zip entry closing cleanup

008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>

* libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_getZipData0)
(java_util_zip_ZipFile_getZipEntries0): Only close entries we've
opened successfully.

Members: 
ChangeLog:1.5256->1.5257 
libraries/clib/zip/ZipFile.c:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5256 kaffe/ChangeLog:1.5257
--- kaffe/ChangeLog:1.5256  Fri Feb 15 23:34:42 2008
+++ kaffe/ChangeLog Fri Feb 15 23:46:56 2008
@@ -1,3 +1,9 @@
+2008-02-16  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_getZipData0)
+   (java_util_zip_ZipFile_getZipEntries0): Only close entries we've 
+   opened successfully.
+
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
* libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_getZipEntry0)
Index: kaffe/libraries/clib/zip/ZipFile.c
diff -u kaffe/libraries/clib/zip/ZipFile.c:1.6 
kaffe/libraries/clib/zip/ZipFile.c:1.7
--- kaffe/libraries/clib/zip/ZipFile.c:1.6  Fri Feb 15 23:34:44 2008
+++ kaffe/libraries/clib/zip/ZipFile.c  Fri Feb 15 23:46:58 2008
@@ -120,9 +120,10 @@
if( size > 0 )
{
  ZZIP_FILE *entry = getZipEntry( zip, unhand(zentry)->name);
- if (entry != NULL)
+ if (entry != NULL) {
buf = getDataJarFile(entry);
- zzip_file_close(entry);
+   zzip_file_close(entry);
+ }
  if (buf == 0) {
return (NULL);
  }
@@ -141,7 +142,6 @@
 {
Hjava_util_Vector* vec;
ZZIP_DIR* zfile;
-   ZZIP_FILE* entry;
ZZIP_DIRENT * zip_entry = NULL; 
HObject** elems;
int i = 0;
@@ -156,11 +156,15 @@
 
zzip_rewinddir(zfile);
do {
+ ZZIP_FILE* entry;
+
  zip_entry = zzip_readdir(zfile);
  if (NULL != zip_entry) {
entry = zzip_file_open(zfile, zip_entry->d_name, 0);
-   elems[i] = (HObject*)makeZipEntry(entry, 
stringC2Java(zip_entry->d_name));
-   zzip_file_close(entry);
+   if (NULL != entry) {
+ elems[i] = (HObject*)makeZipEntry(entry, 
stringC2Java(zip_entry->d_name));
+ zzip_file_close(entry);
+   }
i++;
  }
}while (zip_entry != NULL);

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): fixed ecj memory usage when building classpath

[Kaffe CVS]

PatchSet 7755 
Date: 2008/02/15 23:34:42
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
fixed ecj memory usage when building classpath

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_getZipEntry0)
(java_util_zip_ZipFile_getZipData0)
(java_util_zip_ZipFile_getZipEntries0),
kaffe/kaffevm/findInJar.c (findClassInJar)
(getManifestMainAttribute),
* kaffe/kaffeh/support.c (kaffeh_findClass): Close opened zip entries
after use.

Reported by:  Ito Kazumitsu  <[EMAIL PROTECTED]>

Members: 
ChangeLog:1.5255->1.5256 
kaffe/kaffeh/support.c:1.61->1.62 
kaffe/kaffevm/findInJar.c:1.80->1.81 
libraries/clib/zip/ZipFile.c:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5255 kaffe/ChangeLog:1.5256
--- kaffe/ChangeLog:1.5255  Fri Feb 15 20:04:05 2008
+++ kaffe/ChangeLog Fri Feb 15 23:34:42 2008
@@ -1,5 +1,17 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_getZipEntry0)
+   (java_util_zip_ZipFile_getZipData0)
+   (java_util_zip_ZipFile_getZipEntries0),
+   kaffe/kaffevm/findInJar.c (findClassInJar)
+   (getManifestMainAttribute),
+   * kaffe/kaffeh/support.c (kaffeh_findClass): Close opened zip entries
+   after use.
+
+   Reported by:  Ito Kazumitsu  <[EMAIL PROTECTED]>
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (lookupJarFile): Removed.
 
* libraries/clib/zip/ZipFile.c (getZipEntry)
Index: kaffe/kaffe/kaffeh/support.c
diff -u kaffe/kaffe/kaffeh/support.c:1.61 kaffe/kaffe/kaffeh/support.c:1.62
--- kaffe/kaffe/kaffeh/support.c:1.61   Fri Feb 15 20:04:07 2008
+++ kaffe/kaffe/kaffeh/support.cFri Feb 15 23:34:43 2008
@@ -868,7 +868,8 @@
unsigned char *buf;
classFile hand;
Hjava_lang_Class tmpClass;
-   
+   zzip_size_t length;
+
/* JAR file */
jfile = zzip_opendir(superName);
if (jfile == 0) {
@@ -884,7 +885,9 @@
continue;
}
 
+   length = getUncompressedSize(jentry);
buf = getDataJarFile(jentry);
+   zzip_file_close(jentry);
 if (buf == NULL) {
zzip_closedir(jfile);
continue;
@@ -893,7 +896,7 @@
classFileInit(&hand,
  buf,
  buf,
- getUncompressedSize(jentry),
+ length,
  CP_ZIPFILE);
 
objectDepth++;
Index: kaffe/kaffe/kaffevm/findInJar.c
diff -u kaffe/kaffe/kaffevm/findInJar.c:1.80 
kaffe/kaffe/kaffevm/findInJar.c:1.81
--- kaffe/kaffe/kaffevm/findInJar.c:1.80Fri Feb 15 20:04:07 2008
+++ kaffe/kaffe/kaffevm/findInJar.c Fri Feb 15 23:34:43 2008
@@ -215,6 +215,7 @@
{
ZZIP_FILE * entry;
unsigned char* data;
+   zzip_size_t length;
 
 DBG(CLASSLOOKUP,   dprintf("Opening JAR file %s for %s\n", ptr->path, 
cname); );
if (ptr->u.jar == 0) {
@@ -232,11 +233,13 @@
if (entry == 0) {
break;
}
-   if (getUncompressedSize(entry) == 0) {
+   length = getUncompressedSize(entry);
+   if (0 == length) {
hand->type = CP_NULLCLASS;
goto done;
}
data = getDataJarFile(entry);
+   zzip_file_close(entry);
if (data == 0) {
postExceptionMessage(einfo,
JAVA_IO(IOException),
@@ -248,7 +251,7 @@
classFileInit(hand,
  data,
  data,
- getUncompressedSize(entry),
+ length,
  CP_ZIPFILE);
 
if (Kaffe_JavaVMArgs.enableVerboseClassloading) {
@@ -633,7 +636,7 @@
char* mfdata;
char* attrEntry;
char* ret;
-   zzip_ssize_t i;
+   zzip_ssize_t i, manifest_length;
int posAttrValue;
 
/* Locate manifest entry in jar */
@@ -642,13 +645,17 @@
return (NULL);
 
/* Read it */
+   manifest_length = getUncompressedSize(mf);
mfdata = (char*)g

[kaffe] CVS kaffe (robilad): removed lookupJarFile function

[Kaffe CVS]

PatchSet 7754 
Date: 2008/02/15 20:04:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed lookupJarFile function

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (lookupJarFile): Removed.

* libraries/clib/zip/ZipFile.c (getZipEntry)
(java_util_zip_ZipFile_getZipEntries0),
kaffe/kaffevm/findInJar.c (findClassInJar)
(getManifestMainAttribute),
kaffe/kaffeh/support.c (kaffeh_findClass): Use zzip_file_open directly.

Members: 
ChangeLog:1.5254->1.5255 
kaffe/kaffeh/support.c:1.60->1.61 
kaffe/kaffevm/findInJar.c:1.79->1.80 
kaffe/kaffevm/jar.c:1.47->1.48 
kaffe/kaffevm/jar.h:1.13->1.14 
libraries/clib/zip/ZipFile.c:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5254 kaffe/ChangeLog:1.5255
--- kaffe/ChangeLog:1.5254  Fri Feb 15 19:10:37 2008
+++ kaffe/ChangeLog Fri Feb 15 20:04:05 2008
@@ -1,5 +1,15 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (lookupJarFile): Removed.
+
+   * libraries/clib/zip/ZipFile.c (getZipEntry)
+   (java_util_zip_ZipFile_getZipEntries0), 
+   kaffe/kaffevm/findInJar.c (findClassInJar)
+   (getManifestMainAttribute),
+   kaffe/kaffeh/support.c (kaffeh_findClass): Use zzip_file_open directly.
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (closeJarFile): Removed.
 
* libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_closeZipFile0),
Index: kaffe/kaffe/kaffeh/support.c
diff -u kaffe/kaffe/kaffeh/support.c:1.60 kaffe/kaffe/kaffeh/support.c:1.61
--- kaffe/kaffe/kaffeh/support.c:1.60   Fri Feb 15 19:10:39 2008
+++ kaffe/kaffe/kaffeh/support.cFri Feb 15 20:04:07 2008
@@ -878,7 +878,7 @@
strcpy(superName, nm);
strcat(superName, ".class");
 
-   jentry = lookupJarFile(jfile, superName);
+   jentry = zzip_file_open(jfile, superName, 0);
if (jentry == 0) {
zzip_closedir(jfile);
continue;
Index: kaffe/kaffe/kaffevm/findInJar.c
diff -u kaffe/kaffe/kaffevm/findInJar.c:1.79 
kaffe/kaffe/kaffevm/findInJar.c:1.80
--- kaffe/kaffe/kaffevm/findInJar.c:1.79Fri Feb 15 18:59:35 2008
+++ kaffe/kaffe/kaffevm/findInJar.c Fri Feb 15 20:04:07 2008
@@ -228,7 +228,7 @@
 #endif
}
 
-   entry = lookupJarFile(ptr->u.jar, cname);
+   entry = zzip_file_open(ptr->u.jar, cname, 0);
if (entry == 0) {
break;
}
@@ -637,7 +637,7 @@
int posAttrValue;
 
/* Locate manifest entry in jar */
-   mf = lookupJarFile(file, "META-INF/MANIFEST.MF");
+   mf = zzip_file_open(file, "META-INF/MANIFEST.MF", 0);
if (mf == 0)
return (NULL);
 
Index: kaffe/kaffe/kaffevm/jar.c
diff -u kaffe/kaffe/kaffevm/jar.c:1.47 kaffe/kaffe/kaffevm/jar.c:1.48
--- kaffe/kaffe/kaffevm/jar.c:1.47  Fri Feb 15 19:10:39 2008
+++ kaffe/kaffe/kaffevm/jar.c   Fri Feb 15 20:04:07 2008
@@ -40,8 +40,4 @@
   return -1;
 }
 
-ZZIP_FILE *lookupJarFile(ZZIP_DIR *jf, zzip_char_t *entry_name)
-{
-  return zzip_file_open(jf, entry_name, 0);
-}
 
Index: kaffe/kaffe/kaffevm/jar.h
diff -u kaffe/kaffe/kaffevm/jar.h:1.13 kaffe/kaffe/kaffevm/jar.h:1.14
--- kaffe/kaffe/kaffevm/jar.h:1.13  Fri Feb 15 19:10:40 2008
+++ kaffe/kaffe/kaffevm/jar.h   Fri Feb 15 20:04:08 2008
@@ -19,14 +19,6 @@
 
 #include 
 
-/**
- * Lookup a file stored in the given jarFile.
- *
- * @param jf The jarFile in which to search for the given file.
- * @param entry_name The name of the file to search for in the JAR.
- * @return the file entry in the jar file.
- */
-ZZIP_FILE *lookupJarFile(ZZIP_DIR *jf, zzip_char_t *entry_name);
 /*
  * Read in and, if necessary, decompress the contents of a file stored in a
  * JAR file.
Index: kaffe/libraries/clib/zip/ZipFile.c
diff -u kaffe/libraries/clib/zip/ZipFile.c:1.4 
kaffe/libraries/clib/zip/ZipFile.c:1.5
--- kaffe/libraries/clib/zip/ZipFile.c:1.4  Fri Feb 15 19:10:40 2008
+++ kaffe/libraries/clib/zip/ZipFile.c  Fri Feb 15 20:04:08 2008
@@ -84,7 +84,7 @@
char* str;
 
str = checkPtr(stringJava2C(zname));
-   entry = lookupJarFile((ZZIP_DIR*)zip, str);
+   entry = zzip_file_open((ZZIP_DIR*)zip, str, 0);
gc_free(str);
 
return entry;
@@ -157,7 +157,7 @@
do {
  zip_entry = zzip_readdir(zfile);
  if (NULL != zip_entry) {
-   entry = lookupJarFile(zfile, zip_entry->d_name);
+   entry = zzip_file_open(zfile, zip_entry->d_name, 0);
elems[i] = (HObject*)makeZipEntry(entry, 
stringC2Java(zip_entry->d_name));
i++;
  }

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi

[kaffe] CVS kaffe (robilad): removed closeJarFile function

[Kaffe CVS]

PatchSet 7753 
Date: 2008/02/15 19:10:37
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed closeJarFile function

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (closeJarFile): Removed.

* libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_closeZipFile0),
kaffe/kaffeh/support.c (kaffeh_findClass): Use zzip_closedir directly.

Members: 
ChangeLog:1.5253->1.5254 
kaffe/kaffeh/support.c:1.59->1.60 
kaffe/kaffevm/jar.c:1.46->1.47 
kaffe/kaffevm/jar.h:1.12->1.13 
libraries/clib/zip/ZipFile.c:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5253 kaffe/ChangeLog:1.5254
--- kaffe/ChangeLog:1.5253  Fri Feb 15 18:59:32 2008
+++ kaffe/ChangeLog Fri Feb 15 19:10:37 2008
@@ -1,5 +1,12 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (closeJarFile): Removed.
+
+   * libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_closeZipFile0),
+   kaffe/kaffeh/support.c (kaffeh_findClass): Use zzip_closedir directly.
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (openJarFile): Removed.
 
* libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_openZipFile0),
Index: kaffe/kaffe/kaffeh/support.c
diff -u kaffe/kaffe/kaffeh/support.c:1.59 kaffe/kaffe/kaffeh/support.c:1.60
--- kaffe/kaffe/kaffeh/support.c:1.59   Fri Feb 15 18:59:34 2008
+++ kaffe/kaffe/kaffeh/support.cFri Feb 15 19:10:39 2008
@@ -880,13 +880,13 @@
 
jentry = lookupJarFile(jfile, superName);
if (jentry == 0) {
-   closeJarFile(jfile);
+   zzip_closedir(jfile);
continue;
}
 
buf = getDataJarFile(jentry);
 if (buf == NULL) {
-   closeJarFile(jfile);
+   zzip_closedir(jfile);
continue;
 }
 
@@ -908,7 +908,7 @@
hand.type = CP_INVALID;
free(buf);
 
-   closeJarFile(jfile);
+   zzip_closedir(jfile);
return;
}
}
Index: kaffe/kaffe/kaffevm/jar.c
diff -u kaffe/kaffe/kaffevm/jar.c:1.46 kaffe/kaffe/kaffevm/jar.c:1.47
--- kaffe/kaffe/kaffevm/jar.c:1.46  Fri Feb 15 18:59:35 2008
+++ kaffe/kaffe/kaffevm/jar.c   Fri Feb 15 19:10:39 2008
@@ -40,11 +40,6 @@
   return -1;
 }
 
-void closeJarFile(ZZIP_DIR *jf)
-{
-  zzip_closedir(jf);
-}
-
 ZZIP_FILE *lookupJarFile(ZZIP_DIR *jf, zzip_char_t *entry_name)
 {
   return zzip_file_open(jf, entry_name, 0);
Index: kaffe/kaffe/kaffevm/jar.h
diff -u kaffe/kaffe/kaffevm/jar.h:1.12 kaffe/kaffe/kaffevm/jar.h:1.13
--- kaffe/kaffe/kaffevm/jar.h:1.12  Fri Feb 15 18:59:35 2008
+++ kaffe/kaffe/kaffevm/jar.h   Fri Feb 15 19:10:40 2008
@@ -20,12 +20,6 @@
 #include 
 
 /**
- * Close a jarFile structure that was created with openJarFile.
- *
- * @param jf The jarFile structure as returned by openJarFile.
- */
-void closeJarFile(ZZIP_DIR *jf);
-/**
  * Lookup a file stored in the given jarFile.
  *
  * @param jf The jarFile in which to search for the given file.
Index: kaffe/libraries/clib/zip/ZipFile.c
diff -u kaffe/libraries/clib/zip/ZipFile.c:1.3 
kaffe/libraries/clib/zip/ZipFile.c:1.4
--- kaffe/libraries/clib/zip/ZipFile.c:1.3  Fri Feb 15 18:59:35 2008
+++ kaffe/libraries/clib/zip/ZipFile.c  Fri Feb 15 19:10:40 2008
@@ -61,7 +61,7 @@
 void
 java_util_zip_ZipFile_closeZipFile0(struct Horg_kaffe_util_Ptr* zip)
 {
-   closeJarFile((ZZIP_DIR*)zip);
+   zzip_closedir((ZZIP_DIR*)zip);
 }
 
 jint

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed openJarFile function

[Kaffe CVS]

PatchSet 7752 
Date: 2008/02/15 18:59:32
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed openJarFile function

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (openJarFile): Removed.

* libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_openZipFile0),
kaffe/kaffevm/findInJar.c (findClassInJar),
kaffe/kaffeh/support.c (kaffeh_findClass): Use zzip_opendir directly.

Members: 
ChangeLog:1.5252->1.5253 
kaffe/kaffeh/support.c:1.58->1.59 
kaffe/kaffevm/findInJar.c:1.78->1.79 
kaffe/kaffevm/jar.c:1.45->1.46 
kaffe/kaffevm/jar.h:1.11->1.12 
libraries/clib/zip/ZipFile.c:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5252 kaffe/ChangeLog:1.5253
--- kaffe/ChangeLog:1.5252  Fri Feb 15 01:50:44 2008
+++ kaffe/ChangeLog Fri Feb 15 18:59:32 2008
@@ -1,5 +1,13 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (openJarFile): Removed.
+
+   * libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_openZipFile0),
+   kaffe/kaffevm/findInJar.c (findClassInJar),
+   kaffe/kaffeh/support.c (kaffeh_findClass): Use zzip_opendir directly.
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
* TODO: Updated.
 
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/kaffe/kaffeh/support.c
diff -u kaffe/kaffe/kaffeh/support.c:1.58 kaffe/kaffe/kaffeh/support.c:1.59
--- kaffe/kaffe/kaffeh/support.c:1.58   Tue Jan 22 14:41:00 2008
+++ kaffe/kaffe/kaffeh/support.cFri Feb 15 18:59:34 2008
@@ -33,6 +33,8 @@
 #include 
 #endif /* defined(HAVE_SYS_TYPES_H) */
 
+#include 
+
 #if defined(__WIN32__) || defined (__amigaos__)
 #definePATHSEP ';'
 #else
@@ -868,7 +870,7 @@
Hjava_lang_Class tmpClass;

/* JAR file */
-   jfile = openJarFile(superName);
+   jfile = zzip_opendir(superName);
if (jfile == 0) {
continue;
}
Index: kaffe/kaffe/kaffevm/findInJar.c
diff -u kaffe/kaffe/kaffevm/findInJar.c:1.78 
kaffe/kaffe/kaffevm/findInJar.c:1.79
--- kaffe/kaffe/kaffevm/findInJar.c:1.78Mon Jan 21 02:03:32 2008
+++ kaffe/kaffe/kaffevm/findInJar.c Fri Feb 15 18:59:35 2008
@@ -41,6 +41,8 @@
 #include 
 #endif /* defined(HAVE_SYS_TYPES_H) */
 
+#include 
+
 #ifdef __riscos__
 #include 
 #endif
@@ -216,7 +218,7 @@
 
 DBG(CLASSLOOKUP,   dprintf("Opening JAR file %s for %s\n", ptr->path, 
cname); );
if (ptr->u.jar == 0) {
-   ptr->u.jar = openJarFile(ptr->path);
+   ptr->u.jar = zzip_opendir(ptr->path);
if (ptr->u.jar == 0) {
break;
}
Index: kaffe/kaffe/kaffevm/jar.c
diff -u kaffe/kaffe/kaffevm/jar.c:1.45 kaffe/kaffe/kaffevm/jar.c:1.46
--- kaffe/kaffe/kaffevm/jar.c:1.45  Mon Jan 21 01:04:37 2008
+++ kaffe/kaffe/kaffevm/jar.c   Fri Feb 15 18:59:35 2008
@@ -40,11 +40,6 @@
   return -1;
 }
 
-ZZIP_DIR *openJarFile(zzip_char_t *name)
-{
-  return zzip_opendir(name);
-}
-
 void closeJarFile(ZZIP_DIR *jf)
 {
   zzip_closedir(jf);
Index: kaffe/kaffe/kaffevm/jar.h
diff -u kaffe/kaffe/kaffevm/jar.h:1.11 kaffe/kaffe/kaffevm/jar.h:1.12
--- kaffe/kaffe/kaffevm/jar.h:1.11  Mon Jan 21 01:04:37 2008
+++ kaffe/kaffe/kaffevm/jar.h   Fri Feb 15 18:59:35 2008
@@ -20,13 +20,6 @@
 #include 
 
 /**
- * Attempt to open the given JAR file. 
- *
- * @param filename The full path to JAR file on the file system.
- * @return A zip dir structure or NULL if something went  wrong.
- */
-ZZIP_DIR *openJarFile(zzip_char_t *filename);
-/**
  * Close a jarFile structure that was created with openJarFile.
  *
  * @param jf The jarFile structure as returned by openJarFile.
Index: kaffe/libraries/clib/zip/ZipFile.c
diff -u kaffe/libraries/clib/zip/ZipFile.c:1.2 
kaffe/libraries/clib/zip/ZipFile.c:1.3
--- kaffe/libraries/clib/zip/ZipFile.c:1.2  Thu Jan 31 20:49:47 2008
+++ kaffe/libraries/clib/zip/ZipFile.c  Fri Feb 15 18:59:35 2008
@@ -53,7 +53,7 @@
char* str;
 
str = checkPtr(stringJava2C(fname));
-   zip = openJarFile(str);
+   zip = zzip_opendir(str);
gc_free(str);
return ((struct Horg_kaffe_util_Ptr*)zip);
 }

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7751 
Date: 2008/02/15 01:50:44
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

Members: 
ChangeLog:1.5251->1.5252 
TODO:1.52->1.53 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5251 kaffe/ChangeLog:1.5252
--- kaffe/ChangeLog:1.5251  Fri Feb 15 01:32:30 2008
+++ kaffe/ChangeLog Fri Feb 15 01:50:44 2008
@@ -1,5 +1,12 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * TODO: Updated.
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * configure.ac (AC_PROG_CC_C99): Ask for a C99 compiler, so that useful
+   ISO C99 macros like isnan and signbit are defined in math.h.
+   
* kaffe/kaffevm/fp.c (doubleDivide): Return KAFFE_JDOUBLE_POS_INF or
KAFFE_JDOUBLE_NEG_INF depending on the signbit of input.
(doubleToLong, longToDouble): Removed unused functions.
@@ -9,7 +16,7 @@
 
* kaffe/kaffevm/baseClasses.h (KAFFE_JDOUBLE_POS_INF, 
KAFFE_JDOUBLE_NEG_INF): 
New fields used to cache Double.POSITIVE_INFINITY and 
Double.NEGATIVE_INFINITY.
-
+   
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffevm/fp.c (floatToInt, doubleToLong): Made static.
Index: kaffe/TODO
diff -u kaffe/TODO:1.52 kaffe/TODO:1.53
--- kaffe/TODO:1.52 Sat Feb  2 22:15:32 2008
+++ kaffe/TODO  Fri Feb 15 01:50:44 2008
@@ -13,6 +13,13 @@
* libjit could use a vmgenned interpreter, too.
 
 * Cleanup
+ * In config/config-hacks.h: Remove DOUBLE_ORDER_OPPOSITE.
+In kaffe/kaffevm/constants.c: Instead of it, check if 
+NEGATIVE_INFINITY (0xfff0L) as jdouble is
+< 0.0 as a static bool, and only swap in that case.
+ * Remove kaffe's copies of jni.h, jni-md.h, etc. Use GNU Classpath's headers 
instead.
+Also remove the config-int.h generation now that we are using C99.
+ * Look into removing the logging.properties file in libraries/javalib.
  * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
 
@@ -60,7 +67,6 @@
 
 * Merging work:
   * sun.misc.Unsafe native implementation from openjdk/cacao for full jsr166 
support.
-  * zip library from openjdk
   * verifier from gcj (rob gonzalez)
   * SkyOS port
 
@@ -72,6 +78,8 @@
   * Non-recursive build, single Makefile.am for kaffe.
   * Switch to autotest for the test suites
 
-* Pending patches 
+* Pending patches
+  classpath's doubleToLongBits (dalibor)
+  jit fixes for arm-linux (dalibor)
   amd64 jit from Eric Anholt (guilhem)
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7751 
Date: 2008/02/15 01:50:44
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

Members: 
ChangeLog:1.5251->1.5252 
TODO:1.53->1.54 
TODO:1.52->1.53 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5251 kaffe/ChangeLog:1.5252
--- kaffe/ChangeLog:1.5251  Fri Feb 15 01:32:30 2008
+++ kaffe/ChangeLog Fri Feb 15 01:50:44 2008
@@ -1,5 +1,12 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * TODO: Updated.
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * configure.ac (AC_PROG_CC_C99): Ask for a C99 compiler, so that useful
+   ISO C99 macros like isnan and signbit are defined in math.h.
+   
* kaffe/kaffevm/fp.c (doubleDivide): Return KAFFE_JDOUBLE_POS_INF or
KAFFE_JDOUBLE_NEG_INF depending on the signbit of input.
(doubleToLong, longToDouble): Removed unused functions.
@@ -9,7 +16,7 @@
 
* kaffe/kaffevm/baseClasses.h (KAFFE_JDOUBLE_POS_INF, 
KAFFE_JDOUBLE_NEG_INF): 
New fields used to cache Double.POSITIVE_INFINITY and 
Double.NEGATIVE_INFINITY.
-
+   
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffevm/fp.c (floatToInt, doubleToLong): Made static.
Index: kaffe/TODO
diff -u kaffe/TODO:1.53 kaffe/TODO:1.54
--- kaffe/TODO:1.53 Fri Feb 15 01:50:44 2008
+++ kaffe/TODO  Fri Feb 15 01:51:37 2008
@@ -13,6 +13,7 @@
* libjit could use a vmgenned interpreter, too.
 
 * Cleanup
+ * Remove KAFFE_CFLAGS
  * In config/config-hacks.h: Remove DOUBLE_ORDER_OPPOSITE.
 In kaffe/kaffevm/constants.c: Instead of it, check if 
 NEGATIVE_INFINITY (0xfff0L) as jdouble is
Index: kaffe/TODO
diff -u kaffe/TODO:1.52 kaffe/TODO:1.53
--- kaffe/TODO:1.52 Sat Feb  2 22:15:32 2008
+++ kaffe/TODO  Fri Feb 15 01:50:44 2008
@@ -13,6 +13,13 @@
* libjit could use a vmgenned interpreter, too.
 
 * Cleanup
+ * In config/config-hacks.h: Remove DOUBLE_ORDER_OPPOSITE.
+In kaffe/kaffevm/constants.c: Instead of it, check if 
+NEGATIVE_INFINITY (0xfff0L) as jdouble is
+< 0.0 as a static bool, and only swap in that case.
+ * Remove kaffe's copies of jni.h, jni-md.h, etc. Use GNU Classpath's headers 
instead.
+Also remove the config-int.h generation now that we are using C99.
+ * Look into removing the logging.properties file in libraries/javalib.
  * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
 
@@ -60,7 +67,6 @@
 
 * Merging work:
   * sun.misc.Unsafe native implementation from openjdk/cacao for full jsr166 
support.
-  * zip library from openjdk
   * verifier from gcj (rob gonzalez)
   * SkyOS port
 
@@ -72,6 +78,8 @@
   * Non-recursive build, single Makefile.am for kaffe.
   * Switch to autotest for the test suites
 
-* Pending patches 
+* Pending patches
+  classpath's doubleToLongBits (dalibor)
+  jit fixes for arm-linux (dalibor)
   amd64 jit from Eric Anholt (guilhem)
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed doubleToLong and longToDouble functions

[Kaffe CVS]

PatchSet 7750 
Date: 2008/02/15 01:32:30
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed doubleToLong and longToDouble functions

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* configure.ac (AC_PROG_CC_C99): Ask for a C99 compiler, so that useful
ISO C99 macros like isnan and signbit are defined in math.h.

* kaffe/kaffevm/fp.c (doubleDivide): Return KAFFE_JDOUBLE_POS_INF or
KAFFE_JDOUBLE_NEG_INF depending on the signbit of input.
(doubleToLong, longToDouble): Removed unused functions.

* kaffe/kaffevm/baseClasses.c (initBaseClasses): Initialize 
KAFFE_JDOUBLE_NEG_INF
and KAFFE_JDOUBLE_POS_INF.

* kaffe/kaffevm/baseClasses.h (KAFFE_JDOUBLE_POS_INF, KAFFE_JDOUBLE_NEG_INF):
New fields used to cache Double.POSITIVE_INFINITY and Double.NEGATIVE_INFINITY.

Members: 
ChangeLog:1.5250->1.5251 
configure:1.639->1.640 
configure.ac:1.309->1.310 
kaffe/kaffevm/baseClasses.c:1.82->1.83 
kaffe/kaffevm/baseClasses.h:1.27->1.28 
kaffe/kaffevm/fp.c:1.13->1.14 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5250 kaffe/ChangeLog:1.5251
--- kaffe/ChangeLog:1.5250  Fri Feb 15 00:12:26 2008
+++ kaffe/ChangeLog Fri Feb 15 01:32:30 2008
@@ -1,5 +1,17 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/fp.c (doubleDivide): Return KAFFE_JDOUBLE_POS_INF or
+   KAFFE_JDOUBLE_NEG_INF depending on the signbit of input.
+   (doubleToLong, longToDouble): Removed unused functions.
+   
+   * kaffe/kaffevm/baseClasses.c (initBaseClasses): Initialize 
KAFFE_JDOUBLE_NEG_INF
+   and KAFFE_JDOUBLE_POS_INF.
+
+   * kaffe/kaffevm/baseClasses.h (KAFFE_JDOUBLE_POS_INF, 
KAFFE_JDOUBLE_NEG_INF): 
+   New fields used to cache Double.POSITIVE_INFINITY and 
Double.NEGATIVE_INFINITY.
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/fp.c (floatToInt, doubleToLong): Made static.
 
* kaffe/kaffevm/fp.h (doubleToLong, floatToInt): Removed.
Index: kaffe/configure
diff -u kaffe/configure:1.639 kaffe/configure:1.640
--- kaffe/configure:1.639   Sat Feb  2 15:58:10 2008
+++ kaffe/configure Fri Feb 15 01:32:34 2008
@@ -4027,6 +4027,207 @@
 fi
 
 
+   { echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c99+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include 
+#include 
+#include 
+#include 
+#include 
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+{
+  switch (*format++)
+   {
+   case 's': // string
+ str = va_arg (args_copy, const char *);
+ break;
+   case 'd': // int
+ number = va_arg (args_copy, int);
+ break;
+   case 'f': // float
+ fnumber = va_arg (args_copy, double);
+ break;
+   default:
+ break;
+   }
+}
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array 

[kaffe] CVS kaffe (robilad): made further fp conversion functions static

[Kaffe CVS]

PatchSet 7749 
Date: 2008/02/15 00:12:26
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
made further fp conversion functions static

08-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/fp.c (floatToInt, doubleToLong): Made static.

* kaffe/kaffevm/fp.h (doubleToLong, floatToInt): Removed.

Members: 
ChangeLog:1.5249->1.5250 
kaffe/kaffevm/fp.c:1.12->1.13 
kaffe/kaffevm/fp.h:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5249 kaffe/ChangeLog:1.5250
--- kaffe/ChangeLog:1.5249  Fri Feb 15 00:06:30 2008
+++ kaffe/ChangeLog Fri Feb 15 00:12:26 2008
@@ -1,5 +1,11 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/fp.c (floatToInt, doubleToLong): Made static.
+
+   * kaffe/kaffevm/fp.h (doubleToLong, floatToInt): Removed.
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/fp.c (intToFloat):  Simplified collapsing of NaNs.
Made function static.
 
Index: kaffe/kaffe/kaffevm/fp.c
diff -u kaffe/kaffe/kaffevm/fp.c:1.12 kaffe/kaffe/kaffevm/fp.c:1.13
--- kaffe/kaffe/kaffevm/fp.c:1.12   Fri Feb 15 00:06:31 2008
+++ kaffe/kaffe/kaffevm/fp.cFri Feb 15 00:12:28 2008
@@ -23,10 +23,8 @@
 
 /*
  * Convert double to jlong.
- *
- * If you change this function, also change strtod("-0.0") check in
- * configure.in.
  */
+static
 jlong
 doubleToLong(jdouble val)
 {
@@ -76,6 +74,7 @@
 /*
  * Convert float to int.
  */
+static
 jint
 floatToInt(jfloat val)
 {
Index: kaffe/kaffe/kaffevm/fp.h
diff -u kaffe/kaffe/kaffevm/fp.h:1.8 kaffe/kaffe/kaffevm/fp.h:1.9
--- kaffe/kaffe/kaffevm/fp.h:1.8Fri Feb 15 00:06:32 2008
+++ kaffe/kaffe/kaffevm/fp.hFri Feb 15 00:12:28 2008
@@ -37,8 +37,5 @@
 extern jfloat  floatDivide(jfloat v1, jfloat v2);
 extern jdouble doubleDivide(jdouble v1, jdouble v2);
 
-extern jlong   doubleToLong(jdouble val);
-extern jintfloatToInt(jfloat val);
-
 #endif /* __fp_h */
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): statified intToFloat

[Kaffe CVS]

PatchSet 7748 
Date: 2008/02/15 00:06:30
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
statified intToFloat

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/fp.c (intToFloat):  Simplified collapsing of NaNs.
Made function static.

* kaffe/kaffevm/fp.h (FNANBITS, intToFloat): Removed.

Members: 
ChangeLog:1.5248->1.5249 
kaffe/kaffevm/fp.c:1.11->1.12 
kaffe/kaffevm/fp.h:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5248 kaffe/ChangeLog:1.5249
--- kaffe/ChangeLog:1.5248  Fri Feb 15 00:01:16 2008
+++ kaffe/ChangeLog Fri Feb 15 00:06:30 2008
@@ -1,5 +1,12 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/fp.c (intToFloat):  Simplified collapsing of NaNs.
+   Made function static.
+
+   * kaffe/kaffevm/fp.h (FNANBITS, intToFloat): Removed.
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/fp.c (floatAdd, floatSubtract, floatMultiply)
(floatDivide):  Use KAFFE_JFLOAT_NAN.
 
Index: kaffe/kaffe/kaffevm/fp.c
diff -u kaffe/kaffe/kaffevm/fp.c:1.11 kaffe/kaffe/kaffevm/fp.c:1.12
--- kaffe/kaffe/kaffevm/fp.c:1.11   Fri Feb 15 00:01:19 2008
+++ kaffe/kaffe/kaffevm/fp.cFri Feb 15 00:06:31 2008
@@ -88,17 +88,19 @@
 /*
  * Convert int to float.
  */
+static
 float
 intToFloat(jint val)
 {
jvalue d;
 
-   /* Force all possible NaN values into the canonical NaN value */
-   if ((val & FEXPMASK) == FEXPMASK && (val & FMANMASK) != 0)
-   val = FNANBITS;
-
/* Convert value */
d.i = val;
+
+   /* Force all possible NaN values into the canonical NaN value */
+   if (isnan(d.f))
+ return KAFFE_JFLOAT_NAN;
+
return d.f;
 }
 
Index: kaffe/kaffe/kaffevm/fp.h
diff -u kaffe/kaffe/kaffevm/fp.h:1.7 kaffe/kaffe/kaffevm/fp.h:1.8
--- kaffe/kaffe/kaffevm/fp.h:1.7Thu Feb 14 23:42:22 2008
+++ kaffe/kaffe/kaffevm/fp.hFri Feb 15 00:06:32 2008
@@ -27,7 +27,6 @@
 #define FMANMASK   0x007f
 #define FSIGNBIT   0x8000
 #define FINFBITS   0x7f80
-#define FNANBITS   0x7fc0
 
 extern jfloat  floatAdd(jfloat v1, jfloat v2);
 extern jdouble doubleAdd(jdouble v1, jdouble v2);
@@ -40,7 +39,6 @@
 
 extern jlong   doubleToLong(jdouble val);
 extern jintfloatToInt(jfloat val);
-extern float   intToFloat(jint val);
 
 #endif /* __fp_h */
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): cache Float.NaN for conversions

[Kaffe CVS]

PatchSet 7747 
Date: 2008/02/15 00:01:16
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cache Float.NaN for conversions

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/fp.c (floatAdd, floatSubtract, floatMultiply)
(floatDivide):  Use KAFFE_JFLOAT_NAN.

* kaffe/kaffevm/soft.c (soft_cvtdf):  Use KAFFE_JFLOAT_NAN. Documented.

* kaffe/kaffevm/baseClasses.c (initBaseClasses): Initialize KAFFE_JFLOAT_NAN.

* kaffe/kaffevm/baseClasses.h (KAFFE_JFLOAT_NAN): New field caching
java.lang.Float.NaN.

Members: 
ChangeLog:1.5247->1.5248 
kaffe/kaffevm/baseClasses.c:1.81->1.82 
kaffe/kaffevm/baseClasses.h:1.26->1.27 
kaffe/kaffevm/fp.c:1.10->1.11 
kaffe/kaffevm/soft.c:1.89->1.90 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5247 kaffe/ChangeLog:1.5248
--- kaffe/ChangeLog:1.5247  Thu Feb 14 23:42:20 2008
+++ kaffe/ChangeLog Fri Feb 15 00:01:16 2008
@@ -1,5 +1,17 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/fp.c (floatAdd, floatSubtract, floatMultiply)
+   (floatDivide):  Use KAFFE_JFLOAT_NAN.
+
+   * kaffe/kaffevm/soft.c (soft_cvtdf):  Use KAFFE_JFLOAT_NAN. Documented.
+
+   * kaffe/kaffevm/baseClasses.c (initBaseClasses): Initialize 
KAFFE_JFLOAT_NAN.
+
+   * kaffe/kaffevm/baseClasses.h (KAFFE_JFLOAT_NAN): New field caching
+   java.lang.Float.NaN.
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/fp.h (DNANBITS, longToDouble): Removed.
 
* kaffe/kaffevm/fp.c (longToDouble): Simplified collapsing of NaNs.
Index: kaffe/kaffe/kaffevm/baseClasses.c
diff -u kaffe/kaffe/kaffevm/baseClasses.c:1.81 
kaffe/kaffe/kaffevm/baseClasses.c:1.82
--- kaffe/kaffe/kaffevm/baseClasses.c:1.81  Thu Feb 14 23:31:41 2008
+++ kaffe/kaffe/kaffevm/baseClasses.c   Fri Feb 15 00:01:18 2008
@@ -91,6 +91,7 @@
 Hjava_lang_Class* javaLangFloatClass;
 Hjava_lang_Class* javaLangDoubleClass;
 
+jfloat KAFFE_JFLOAT_NAN;
 jdouble KAFFE_JDOUBLE_NAN;
 
 Hjava_lang_Class *javaNioBufferClass;
@@ -425,6 +426,9 @@
KAFFEVM_EXIT(-1);
  }
 
+   KAFFE_JFLOAT_NAN = KaffeJNI_GetStaticFloatField(NULL, 
javaLangFloatClass, 
+ 
KNI_lookupFieldC(javaLangFloatClass,
+  
"NaN", true, &einfo));
KAFFE_JDOUBLE_NAN = KaffeJNI_GetStaticDoubleField(NULL, 
javaLangDoubleClass, 
  
KNI_lookupFieldC(javaLangDoubleClass,
   
"NaN", true, &einfo));
Index: kaffe/kaffe/kaffevm/baseClasses.h
diff -u kaffe/kaffe/kaffevm/baseClasses.h:1.26 
kaffe/kaffe/kaffevm/baseClasses.h:1.27
--- kaffe/kaffe/kaffevm/baseClasses.h:1.26  Thu Feb 14 23:31:41 2008
+++ kaffe/kaffe/kaffevm/baseClasses.h   Fri Feb 15 00:01:19 2008
@@ -50,6 +50,7 @@
 extern struct Hjava_lang_Class*javaLangLongClass;
 extern struct Hjava_lang_Class*javaLangFloatClass;
 extern struct Hjava_lang_Class*javaLangDoubleClass;
+extern jfloat KAFFE_JFLOAT_NAN;
 extern jdouble KAFFE_JDOUBLE_NAN;
 
 extern struct Hjava_lang_Class *javaNioDirectByteBufferImplClass;
Index: kaffe/kaffe/kaffevm/fp.c
diff -u kaffe/kaffe/kaffevm/fp.c:1.10 kaffe/kaffe/kaffevm/fp.c:1.11
--- kaffe/kaffe/kaffevm/fp.c:1.10   Thu Feb 14 23:42:22 2008
+++ kaffe/kaffe/kaffevm/fp.cFri Feb 15 00:01:19 2008
@@ -121,7 +121,7 @@
 floatAdd(jfloat v1, jfloat v2)
 {
if (isnan(v1) || isnan(v2)) {
-   return intToFloat(FNANBITS);
+   return KAFFE_JFLOAT_NAN;
}
return (v1 + v2);
 }
@@ -145,7 +145,7 @@
 floatSubtract(jfloat v1, jfloat v2)
 {
if (isnan(v1) || isnan(v2)) {
-   return intToFloat(FNANBITS);
+   return KAFFE_JFLOAT_NAN;
}
return (v1 - v2);
 }
@@ -169,7 +169,7 @@
 floatMultiply(jfloat v1, jfloat v2)
 {
if (isnan(v1) || isnan(v2)) {
-   return intToFloat(FNANBITS);
+   return KAFFE_JFLOAT_NAN;
}
return (v1 * v2);
 }
@@ -209,13 +209,13 @@
v2bits = floatToInt(v2);
 
if (isnan(v1) || isnan(v2)) {
-   return intToFloat(FNANBITS);
+   return KAFFE_JFLOAT_NAN;
}
if (v2 != 0.0) {
return (v1 / v2);
}
if (v1 == 0.0) {
-   return intToFloat(FNANBITS);
+   return KAFFE_JFLOAT_NAN;
}
return intToFloat((jint)(FINFBITS | ((v1bits ^ v2bits) & FSIGNBIT)));
 }
Index: kaffe/kaffe/kaffevm/soft.c
diff -u kaffe/kaffe/kaffevm/soft.c:1.89 kaffe/kaffe/kaffevm/soft.c:1.90
--- kaffe/kaffe/kaffevm/soft.c:1.89 Thu Feb 14 23:31:41 2008
+++ kaffe/kaffe/kaffevm/soft.c  Fri Feb 15 00:01:19 2008
@@ -861,15 +861,20 @@
return (jdouble)v;
 }
 
+/**
+ * convert a double to float
+ *
+ * @param v a double
+ * 
+ * @return the float corresponding t

[kaffe] CVS kaffe (robilad): statified longToDouble

[Kaffe CVS]

PatchSet 7746 
Date: 2008/02/14 23:42:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
statified longToDouble

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/fp.h (DNANBITS, longToDouble): Removed.

* kaffe/kaffevm/fp.c (longToDouble): Simplified collapsing of NaNs.
Made function static.

Members: 
ChangeLog:1.5246->1.5247 
kaffe/kaffevm/fp.c:1.9->1.10 
kaffe/kaffevm/fp.h:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5246 kaffe/ChangeLog:1.5247
--- kaffe/ChangeLog:1.5246  Thu Feb 14 23:31:38 2008
+++ kaffe/ChangeLog Thu Feb 14 23:42:20 2008
@@ -1,5 +1,12 @@
 2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/fp.h (DNANBITS, longToDouble): Removed.
+
+   * kaffe/kaffevm/fp.c (longToDouble): Simplified collapsing of NaNs.
+   Made function static.
+
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/fp.c (doubleAdd, doubleSubtract, doubleMultiply)
(doubleDivide): Use KAFFE_JDOUBLE_NAN.
 
Index: kaffe/kaffe/kaffevm/fp.c
diff -u kaffe/kaffe/kaffevm/fp.c:1.9 kaffe/kaffe/kaffevm/fp.c:1.10
--- kaffe/kaffe/kaffevm/fp.c:1.9Thu Feb 14 23:31:41 2008
+++ kaffe/kaffe/kaffevm/fp.cThu Feb 14 23:42:22 2008
@@ -48,15 +48,12 @@
 /*
  * Convert jlong to double.
  */
+static
 jdouble
 longToDouble(jlong val)
 {
jvalue d;
 
-   /* Force all possible NaN values into the canonical NaN value */
-   if ((val & DEXPMASK) == DEXPMASK && (val & DMANMASK) != 0)
-   val = DNANBITS;
-
/* Convert value */
d.j = val;
 #if defined(DOUBLE_ORDER_OPPOSITE)
@@ -68,7 +65,12 @@
*s = r;
}
 #endif
-   return d.d;
+
+   /* Collapse NaNs */
+   if (isnan(d.d))
+ return KAFFE_JDOUBLE_NAN;
+   else
+ return d.d;
 }
 
 /*
Index: kaffe/kaffe/kaffevm/fp.h
diff -u kaffe/kaffe/kaffevm/fp.h:1.6 kaffe/kaffe/kaffevm/fp.h:1.7
--- kaffe/kaffe/kaffevm/fp.h:1.6Thu Feb 14 22:24:41 2008
+++ kaffe/kaffe/kaffevm/fp.hThu Feb 14 23:42:22 2008
@@ -22,7 +22,6 @@
 #define DMANMASK   uint64)0x000f)<<32)|((uint64)0x))
 #define DSIGNBIT   (((uint64)0x8000)<<32)
 #define DINFBITS   (((uint64)0x7ff0)<<32)
-#define DNANBITS   (((uint64)0x7ff8)<<32)
 
 #define FEXPMASK   0x7f80
 #define FMANMASK   0x007f
@@ -40,7 +39,6 @@
 extern jdouble doubleDivide(jdouble v1, jdouble v2);
 
 extern jlong   doubleToLong(jdouble val);
-extern jdouble longToDouble(jlong val);
 extern jintfloatToInt(jfloat val);
 extern float   intToFloat(jint val);
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): cache Double.NaN for conversions

[Kaffe CVS]

PatchSet 7745 
Date: 2008/02/14 23:31:38
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cache Double.NaN for conversions

2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/fp.c (doubleAdd, doubleSubtract, doubleMultiply)
(doubleDivide): Use KAFFE_JDOUBLE_NAN.

* kaffe/kaffevm/soft.c (soft_cvtfd): Use KAFFE_JDOUBLE_NAN. Documented.

* kaffe/kaffevm/baseClasses.c (initBaseClasses): Initialize KAFFE_JDOUBLE_NAN.

* kaffe/kaffevm/baseClasses.h (KAFFE_JDOUBLE_NAN): New field caching
java.lang.Double.NaN.

Members: 
ChangeLog:1.5245->1.5246 
kaffe/kaffevm/baseClasses.c:1.80->1.81 
kaffe/kaffevm/baseClasses.h:1.25->1.26 
kaffe/kaffevm/fp.c:1.8->1.9 
kaffe/kaffevm/soft.c:1.88->1.89 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5245 kaffe/ChangeLog:1.5246
--- kaffe/ChangeLog:1.5245  Thu Feb 14 22:24:40 2008
+++ kaffe/ChangeLog Thu Feb 14 23:31:38 2008
@@ -1,3 +1,15 @@
+2008-02-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/kaffevm/fp.c (doubleAdd, doubleSubtract, doubleMultiply)
+   (doubleDivide): Use KAFFE_JDOUBLE_NAN.
+
+   * kaffe/kaffevm/soft.c (soft_cvtfd): Use KAFFE_JDOUBLE_NAN. Documented.
+
+   * kaffe/kaffevm/baseClasses.c (initBaseClasses): Initialize 
KAFFE_JDOUBLE_NAN.
+
+   * kaffe/kaffevm/baseClasses.h (KAFFE_JDOUBLE_NAN): New field caching
+   java.lang.Double.NaN.
+
 2008-02-14  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffevm/fp.h (DISNAN): Removed.
Index: kaffe/kaffe/kaffevm/baseClasses.c
diff -u kaffe/kaffe/kaffevm/baseClasses.c:1.80 
kaffe/kaffe/kaffevm/baseClasses.c:1.81
--- kaffe/kaffe/kaffevm/baseClasses.c:1.80  Mon Jan 21 01:04:36 2008
+++ kaffe/kaffe/kaffevm/baseClasses.c   Thu Feb 14 23:31:41 2008
@@ -44,6 +44,7 @@
 #include "fileSections.h"
 #include "verify-type.h"
 #include "jar.h"
+#include "jni_funcs.h"
 
 Utf8Const* init_name;
 Utf8Const* final_name;
@@ -90,6 +91,8 @@
 Hjava_lang_Class* javaLangFloatClass;
 Hjava_lang_Class* javaLangDoubleClass;
 
+jdouble KAFFE_JDOUBLE_NAN;
+
 Hjava_lang_Class *javaNioBufferClass;
 Hjava_lang_Class *javaNioDirectByteBufferImplClass;
 Hjava_lang_Class *javaNioDirectByteBufferImplReadWriteClass;
@@ -421,5 +424,9 @@
DBG(INIT, dprintf("Cannot resolve fields necessary for NIO 
operations\n"); );
KAFFEVM_EXIT(-1);
  }
+
+   KAFFE_JDOUBLE_NAN = KaffeJNI_GetStaticDoubleField(NULL, 
javaLangDoubleClass, 
+ 
KNI_lookupFieldC(javaLangDoubleClass,
+  
"NaN", true, &einfo));
 }
 
Index: kaffe/kaffe/kaffevm/baseClasses.h
diff -u kaffe/kaffe/kaffevm/baseClasses.h:1.25 
kaffe/kaffe/kaffevm/baseClasses.h:1.26
--- kaffe/kaffe/kaffevm/baseClasses.h:1.25  Fri Dec 16 20:35:47 2005
+++ kaffe/kaffe/kaffevm/baseClasses.h   Thu Feb 14 23:31:41 2008
@@ -50,6 +50,7 @@
 extern struct Hjava_lang_Class*javaLangLongClass;
 extern struct Hjava_lang_Class*javaLangFloatClass;
 extern struct Hjava_lang_Class*javaLangDoubleClass;
+extern jdouble KAFFE_JDOUBLE_NAN;
 
 extern struct Hjava_lang_Class *javaNioDirectByteBufferImplClass;
 extern struct Hjava_lang_Class *javaNioDirectByteBufferImplReadWriteClass;
Index: kaffe/kaffe/kaffevm/fp.c
diff -u kaffe/kaffe/kaffevm/fp.c:1.8 kaffe/kaffe/kaffevm/fp.c:1.9
--- kaffe/kaffe/kaffevm/fp.c:1.8Thu Feb 14 22:24:41 2008
+++ kaffe/kaffe/kaffevm/fp.cThu Feb 14 23:31:41 2008
@@ -15,6 +15,7 @@
 #include "config-mem.h"
 #include "config-hacks.h"
 #include 
+#include "baseClasses.h"
 #include "gtypes.h"
 #include "defs.h"
 #include "files.h"
@@ -106,7 +107,7 @@
 doubleAdd(jdouble v1, jdouble v2)
 {
if (isnan(v1) || isnan(v2)) {
-   return longToDouble(DNANBITS);
+   return KAFFE_JDOUBLE_NAN;
}
return (v1 + v2);
 }
@@ -130,7 +131,7 @@
 doubleSubtract(jdouble v1, jdouble v2)
 {
if (isnan(v1) || isnan(v2)) {
-   return longToDouble(DNANBITS);
+ return KAFFE_JDOUBLE_NAN;
}
return (v1 - v2);
 }
@@ -154,7 +155,7 @@
 doubleMultiply(jdouble v1, jdouble v2)
 {
if (isnan(v1) || isnan(v2)) {
-   return longToDouble(DNANBITS);
+ return KAFFE_JDOUBLE_NAN;
}
return (v1 * v2);
 }
@@ -183,13 +184,13 @@
v2bits = doubleToLong(v2);
 
if (isnan(v1) || isnan(v2)) {
-   return longToDouble(DNANBITS);
+   return KAFFE_JDOUBLE_NAN;
}
if (v2 != 0.0) {
return (v1 / v2);
}
if (v1 == 0.0) {
-   return longToDouble(DNANBITS);
+   return KAFFE_JDOUBLE_NAN;
}
return longToDouble((jlong)(DINFBITS | ((v1bits ^ v2bits) & DSIGNBIT)));
 }
Index: kaffe/kaffe/kaffevm/soft.c
diff -u kaffe/kaffe/kaffevm/soft.c:1.88 kaffe/kaffe/kaffevm/soft.c:1.89
--- kaffe/kaffe/kaffevm/soft.c:1.88 Thu Feb 14 22:24:41 2008
+++ kaffe/

[kaffe] CVS kaffe (robilad): removed DISNAN

[Kaffe CVS]

PatchSet 7744 
Date: 2008/02/14 22:24:40
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed DISNAN

2008-02-14  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/fp.h (DISNAN): Removed.

* kaffe/kaffevm/soft.c (soft_cvtdf, soft_cvtdl, soft_cvtdi),
kaffe/kaffevm/fp.c (doubleAdd, doubleSubtract, doubleMultiply)
(doubleDivide):

Members: 
ChangeLog:1.5244->1.5245 
kaffe/kaffevm/fp.c:1.7->1.8 
kaffe/kaffevm/fp.h:1.5->1.6 
kaffe/kaffevm/soft.c:1.87->1.88 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5244 kaffe/ChangeLog:1.5245
--- kaffe/ChangeLog:1.5244  Thu Feb 14 20:43:20 2008
+++ kaffe/ChangeLog Thu Feb 14 22:24:40 2008
@@ -1,5 +1,13 @@
 2008-02-14  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/fp.h (DISNAN): Removed.
+
+   * kaffe/kaffevm/soft.c (soft_cvtdf, soft_cvtdl, soft_cvtdi),
+   kaffe/kaffevm/fp.c (doubleAdd, doubleSubtract, doubleMultiply)
+   (doubleDivide): 
+
+2008-02-14  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/fp.h (FISNAN): Removed.
 
* kaffe/kaffevm/soft.c (soft_cvtfl, soft_cvtfd, soft_cvtfi), 
Index: kaffe/kaffe/kaffevm/fp.c
diff -u kaffe/kaffe/kaffevm/fp.c:1.7 kaffe/kaffe/kaffevm/fp.c:1.8
--- kaffe/kaffe/kaffevm/fp.c:1.7Thu Feb 14 20:43:24 2008
+++ kaffe/kaffe/kaffevm/fp.cThu Feb 14 22:24:41 2008
@@ -105,12 +105,7 @@
 jdouble
 doubleAdd(jdouble v1, jdouble v2)
 {
-   jlong v1bits, v2bits;
-
-   v1bits = doubleToLong(v1);
-   v2bits = doubleToLong(v2);
-
-   if (DISNAN(v1bits) || DISNAN(v2bits)) {
+   if (isnan(v1) || isnan(v2)) {
return longToDouble(DNANBITS);
}
return (v1 + v2);
@@ -134,12 +129,7 @@
 jdouble
 doubleSubtract(jdouble v1, jdouble v2)
 {
-   jlong v1bits, v2bits;
-
-   v1bits = doubleToLong(v1);
-   v2bits = doubleToLong(v2);
-
-   if (DISNAN(v1bits) || DISNAN(v2bits)) {
+   if (isnan(v1) || isnan(v2)) {
return longToDouble(DNANBITS);
}
return (v1 - v2);
@@ -163,12 +153,7 @@
 jdouble
 doubleMultiply(jdouble v1, jdouble v2)
 {
-   jlong v1bits, v2bits;
-
-   v1bits = doubleToLong(v1);
-   v2bits = doubleToLong(v2);
-
-   if (DISNAN(v1bits) || DISNAN(v2bits)) {
+   if (isnan(v1) || isnan(v2)) {
return longToDouble(DNANBITS);
}
return (v1 * v2);
@@ -197,7 +182,7 @@
v1bits = doubleToLong(v1);
v2bits = doubleToLong(v2);
 
-   if (DISNAN(v1bits) || DISNAN(v2bits)) {
+   if (isnan(v1) || isnan(v2)) {
return longToDouble(DNANBITS);
}
if (v2 != 0.0) {
Index: kaffe/kaffe/kaffevm/fp.h
diff -u kaffe/kaffe/kaffevm/fp.h:1.5 kaffe/kaffe/kaffevm/fp.h:1.6
--- kaffe/kaffe/kaffevm/fp.h:1.5Thu Feb 14 20:43:24 2008
+++ kaffe/kaffe/kaffevm/fp.hThu Feb 14 22:24:41 2008
@@ -30,8 +30,6 @@
 #define FINFBITS   0x7f80
 #define FNANBITS   0x7fc0
 
-#define DISNAN(b)  (((b) & DEXPMASK) == DEXPMASK && ((b) & DMANMASK) != 0)
-
 extern jfloat  floatAdd(jfloat v1, jfloat v2);
 extern jdouble doubleAdd(jdouble v1, jdouble v2);
 extern jfloat  floatSubtract(jfloat v1, jfloat v2);
Index: kaffe/kaffe/kaffevm/soft.c
diff -u kaffe/kaffe/kaffevm/soft.c:1.87 kaffe/kaffe/kaffevm/soft.c:1.88
--- kaffe/kaffe/kaffevm/soft.c:1.87 Thu Feb 14 20:43:24 2008
+++ kaffe/kaffe/kaffevm/soft.c  Thu Feb 14 22:24:41 2008
@@ -859,10 +859,7 @@
 jfloat
 soft_cvtdf(jdouble v)
 {
-   jlong vbits;
-
-   vbits = doubleToLong(v);
-if (DISNAN(vbits)) {
+if (isnan(v)) {
return (intToFloat(FNANBITS));
}
else {
@@ -904,10 +901,7 @@
 jlong
 soft_cvtdl(jdouble v)
 {
-   jlong vbits;
-
-   vbits = doubleToLong(v);
-if (DISNAN(vbits)) {
+if (isnan(v)) {
return ((jlong)0);
}
 
@@ -960,10 +954,7 @@
 jint
 soft_cvtdi(jdouble v)
 {
-jlong vbits;
-
-   vbits = doubleToLong(v);
-if (DISNAN(vbits)) {
+if (isnan(v)) {
return (0);
}
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed FISNAN

[Kaffe CVS]

PatchSet 7743 
Date: 2008/02/14 20:43:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed FISNAN

2008-02-14  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/fp.h (FISNAN): Removed.

* kaffe/kaffevm/soft.c (soft_cvtfl, soft_cvtfd, soft_cvtfi),
kaffe/kaffevm/fp.c (floatDivide, floatMultiply, floatSubtract)
(floatAdd): Use isnan instead of FISNAN.

Members: 
ChangeLog:1.5243->1.5244 
kaffe/kaffevm/fp.c:1.6->1.7 
kaffe/kaffevm/fp.h:1.4->1.5 
kaffe/kaffevm/soft.c:1.86->1.87 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5243 kaffe/ChangeLog:1.5244
--- kaffe/ChangeLog:1.5243  Mon Feb 11 23:44:09 2008
+++ kaffe/ChangeLog Thu Feb 14 20:43:20 2008
@@ -1,3 +1,11 @@
+2008-02-14  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/kaffevm/fp.h (FISNAN): Removed.
+
+   * kaffe/kaffevm/soft.c (soft_cvtfl, soft_cvtfd, soft_cvtfi), 
+   kaffe/kaffevm/fp.c (floatDivide, floatMultiply, floatSubtract)
+   (floatAdd): Use isnan instead of FISNAN.
+   
 2008-02-12  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffevm/soft.c (soft_fcmpg): Delegate to soft_dcmpg.
Index: kaffe/kaffe/kaffevm/fp.c
diff -u kaffe/kaffe/kaffevm/fp.c:1.6 kaffe/kaffe/kaffevm/fp.c:1.7
--- kaffe/kaffe/kaffevm/fp.c:1.6Sun Apr 18 13:57:26 2004
+++ kaffe/kaffe/kaffevm/fp.cThu Feb 14 20:43:24 2008
@@ -122,12 +122,7 @@
 jfloat
 floatAdd(jfloat v1, jfloat v2)
 {
-   jint v1bits, v2bits;
-
-   v1bits = floatToInt(v1);
-   v2bits = floatToInt(v2);
-
-   if (FISNAN(v1bits) || FISNAN(v2bits)) {
+   if (isnan(v1) || isnan(v2)) {
return intToFloat(FNANBITS);
}
return (v1 + v2);
@@ -156,12 +151,7 @@
 jfloat
 floatSubtract(jfloat v1, jfloat v2)
 {
-   jint v1bits, v2bits;
-
-   v1bits = floatToInt(v1);
-   v2bits = floatToInt(v2);
-
-   if (FISNAN(v1bits) || FISNAN(v2bits)) {
+   if (isnan(v1) || isnan(v2)) {
return intToFloat(FNANBITS);
}
return (v1 - v2);
@@ -190,12 +180,7 @@
 jfloat
 floatMultiply(jfloat v1, jfloat v2)
 {
-   jint v1bits, v2bits;
-
-   v1bits = floatToInt(v1);
-   v2bits = floatToInt(v2);
-
-   if (FISNAN(v1bits) || FISNAN(v2bits)) {
+   if (isnan(v1) || isnan(v2)) {
return intToFloat(FNANBITS);
}
return (v1 * v2);
@@ -235,7 +220,7 @@
v1bits = floatToInt(v1);
v2bits = floatToInt(v2);
 
-   if (FISNAN(v1bits) || FISNAN(v2bits)) {
+   if (isnan(v1) || isnan(v2)) {
return intToFloat(FNANBITS);
}
if (v2 != 0.0) {
Index: kaffe/kaffe/kaffevm/fp.h
diff -u kaffe/kaffe/kaffevm/fp.h:1.4 kaffe/kaffe/kaffevm/fp.h:1.5
--- kaffe/kaffe/kaffevm/fp.h:1.4Sat Oct  9 22:56:21 1999
+++ kaffe/kaffe/kaffevm/fp.hThu Feb 14 20:43:24 2008
@@ -31,7 +31,6 @@
 #define FNANBITS   0x7fc0
 
 #define DISNAN(b)  (((b) & DEXPMASK) == DEXPMASK && ((b) & DMANMASK) != 0)
-#define FISNAN(b)  (((b) & FEXPMASK) == FEXPMASK && ((b) & FMANMASK) != 0)
 
 extern jfloat  floatAdd(jfloat v1, jfloat v2);
 extern jdouble doubleAdd(jdouble v1, jdouble v2);
Index: kaffe/kaffe/kaffevm/soft.c
diff -u kaffe/kaffe/kaffevm/soft.c:1.86 kaffe/kaffe/kaffevm/soft.c:1.87
--- kaffe/kaffe/kaffevm/soft.c:1.86 Mon Feb 11 23:44:12 2008
+++ kaffe/kaffe/kaffevm/soft.c  Thu Feb 14 20:43:24 2008
@@ -848,10 +848,7 @@
 jdouble
 soft_cvtfd(jfloat v)
 {
-   jint vbits;
-
-   vbits = floatToInt(v);
-if (FISNAN(vbits)) {
+if (isnan(v)) {
return (longToDouble(DNANBITS));
}
else {
@@ -881,10 +878,7 @@
 jlong
 soft_cvtfl(jfloat v)
 {
-   jint vbits;
-
-   vbits = floatToInt(v);
-if (FISNAN(vbits)) {
+   if(isnan(v)) {
return ((jlong)0);
}
 
@@ -939,10 +933,7 @@
 jint
 soft_cvtfi(jfloat v)
 {
-jint vbits;
-
-   vbits = floatToInt(v);
-if (FISNAN(vbits)) {
+if (isnan(v)) {
return (0);
}
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): slimmed down floating point compare functions

[Kaffe CVS]

PatchSet 7742 
Date: 2008/02/11 23:44:09
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
slimmed down floating point compare functions

2008-02-12  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/soft.c (soft_fcmpg): Delegate to soft_dcmpg.
(soft_fcmpl): Delegate to soft_dcmpl.

Members: 
ChangeLog:1.5242->1.5243 
kaffe/kaffevm/soft.c:1.85->1.86 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5242 kaffe/ChangeLog:1.5243
--- kaffe/ChangeLog:1.5242  Mon Feb 11 23:26:08 2008
+++ kaffe/ChangeLog Mon Feb 11 23:44:09 2008
@@ -1,5 +1,10 @@
 2008-02-12  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/soft.c (soft_fcmpg): Delegate to soft_dcmpg.
+   (soft_fcmpl): Delegate to soft_dcmpl.
+
+2008-02-12  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/intrp/icode.h (cmpg_float, cmpl_float): 
Use soft_dcmpg and soft_dcmpl internally, as they 
produce the same results, since the float parameters 
Index: kaffe/kaffe/kaffevm/soft.c
diff -u kaffe/kaffe/kaffevm/soft.c:1.85 kaffe/kaffe/kaffevm/soft.c:1.86
--- kaffe/kaffe/kaffevm/soft.c:1.85 Mon Feb 11 21:49:59 2008
+++ kaffe/kaffe/kaffevm/soft.c  Mon Feb 11 23:44:12 2008
@@ -674,26 +674,7 @@
 jint
 soft_fcmpg(jfloat v1, jfloat v2)
 {
-jint ret;
-   jint v1bits;
-   jint v2bits;
-
-   v1bits = floatToInt(v1);
-   v2bits = floatToInt(v2);
-
-if (FISNAN(v1bits) || FISNAN(v2bits)) {
-   ret = 1;
-   }
-else if (v1 > v2) {
-ret = 1;
-}
-else if (v1 == v2) {
-ret = 0;
-}
-else {
-ret = -1;
-}
-   return (ret);
+  return soft_dcmpg(v1, v2);
 }
 
 /*
@@ -702,26 +683,7 @@
 jint
 soft_fcmpl(jfloat v1, jfloat v2)
 {
-jint ret;
-   jint v1bits;
-   jint v2bits;
-
-   v1bits = floatToInt(v1);
-   v2bits = floatToInt(v2);
-
-if (FISNAN(v1bits) || FISNAN(v2bits)) {
-   ret = -1;
-   }
-else if (v1 > v2) {
-ret = 1;
-}
-else if (v1 == v2) {
-ret = 0;
-}
-else {
-ret = -1;
-}
-   return (ret);
+  return soft_dcmpl(v1, v2);
 }
 
 #if defined(TRANSLATOR)

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): simplified float comparisons in interpreter

[Kaffe CVS]

PatchSet 7741 
Date: 2008/02/11 23:26:08
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
simplified float comparisons in interpreter

2008-02-12  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/intrp/icode.h (cmpg_float, cmpl_float):
Use soft_dcmpg and soft_dcmpl internally, as they
produce the same results, since the float parameters
are automatically widened to equivalent doubles.

Members: 
ChangeLog:1.5241->1.5242 
kaffe/kaffevm/intrp/icode.h:1.27->1.28 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5241 kaffe/ChangeLog:1.5242
--- kaffe/ChangeLog:1.5241  Mon Feb 11 21:49:57 2008
+++ kaffe/ChangeLog Mon Feb 11 23:26:08 2008
@@ -1,3 +1,10 @@
+2008-02-12  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/kaffevm/intrp/icode.h (cmpg_float, cmpl_float): 
+   Use soft_dcmpg and soft_dcmpl internally, as they 
+   produce the same results, since the float parameters 
+   are automatically widened to equivalent doubles.
+
 2008-02-11  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffevm/soft.c (soft_dcmp): Documented.
Index: kaffe/kaffe/kaffevm/intrp/icode.h
diff -u kaffe/kaffe/kaffevm/intrp/icode.h:1.27 
kaffe/kaffe/kaffevm/intrp/icode.h:1.28
--- kaffe/kaffe/kaffevm/intrp/icode.h:1.27  Mon Sep  4 19:12:54 2006
+++ kaffe/kaffe/kaffevm/intrp/icode.h   Mon Feb 11 23:26:09 2008
@@ -272,9 +272,9 @@
 #defineneg_float(t, f) (t)[0].v.tfloat = 
-(f)[0].v.tfloat
 #defineneg_double(t, f)(t)[0].v.tdouble = 
-(f)[0].v.tdouble
 
-#definecmpg_float(t, f1, f2)   (t)[0].v.tint = 
soft_fcmpg((f1)[0].v.tfloat, (f2)[0].v.tfloat)
+#definecmpg_float(t, f1, f2)   (t)[0].v.tint = 
soft_dcmpg((f1)[0].v.tfloat, (f2)[0].v.tfloat)
 #definecmpg_double(t, f1, f2)  (t)[0].v.tint = 
soft_dcmpg((f1)[0].v.tdouble, (f2)[0].v.tdouble)
-#definecmpl_float(t, f1, f2)   (t)[0].v.tint = 
soft_fcmpl((f1)[0].v.tfloat, (f2)[0].v.tfloat)
+#definecmpl_float(t, f1, f2)   (t)[0].v.tint = 
soft_dcmpl((f1)[0].v.tfloat, (f2)[0].v.tfloat)
 #definecmpl_double(t, f1, f2)  (t)[0].v.tint = 
soft_dcmpl((f1)[0].v.tdouble, (f2)[0].v.tdouble)
 
 #definecvt_int_float(t, f) (t)[0].v.tfloat = 
(f)[0].v.tint

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): documented helper function soft_dcmp

[Kaffe CVS]

PatchSet 7740 
Date: 2008/02/11 21:49:57
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
documented helper function soft_dcmp

2008-02-11  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/soft.c (soft_dcmp): Documented.

Members: 
ChangeLog:1.5240->1.5241 
kaffe/kaffevm/soft.c:1.84->1.85 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5240 kaffe/ChangeLog:1.5241
--- kaffe/ChangeLog:1.5240  Mon Feb 11 21:44:41 2008
+++ kaffe/ChangeLog Mon Feb 11 21:49:57 2008
@@ -1,5 +1,9 @@
 2008-02-11  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/soft.c (soft_dcmp): Documented.
+
+2008-02-11  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/soft.c (soft_dcmp): New function.
Implements dcmpl/dcmpg according to VM spec.
(soft_dcmpl, soft_dcmpg) Call soft_dcmp.
Index: kaffe/kaffe/kaffevm/soft.c
diff -u kaffe/kaffe/kaffevm/soft.c:1.84 kaffe/kaffe/kaffevm/soft.c:1.85
--- kaffe/kaffe/kaffevm/soft.c:1.84 Mon Feb 11 21:44:43 2008
+++ kaffe/kaffe/kaffevm/soft.c  Mon Feb 11 21:49:59 2008
@@ -627,6 +627,15 @@
 }
 
 
+/**
+ * dcmp helper function.
+ *
+ * @param v1 left side value
+ * @param v2 right side value
+ * @param nan return value in case v1 or v2 is NaN
+ *
+ * @return 1 if v1 > v2, 0 if v1 == v2, -1 if v1 < v2, otherwise nan.
+ */
 static
 jint
 soft_dcmp(const jdouble v1, const jdouble v2, const jint nan)

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): make dcmpl and dcmpg comply with spec

[Kaffe CVS]

PatchSet 7739 
Date: 2008/02/11 21:44:41
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
make dcmpl and dcmpg comply with spec

2008-02-11  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/soft.c (soft_dcmp): New function.
Implements dcmpl/dcmpg according to VM spec.
(soft_dcmpl, soft_dcmpg) Call soft_dcmp.

Members: 
ChangeLog:1.5239->1.5240 
kaffe/kaffevm/soft.c:1.83->1.84 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5239 kaffe/ChangeLog:1.5240
--- kaffe/ChangeLog:1.5239  Sun Feb  3 15:08:29 2008
+++ kaffe/ChangeLog Mon Feb 11 21:44:41 2008
@@ -1,3 +1,9 @@
+2008-02-11  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/kaffevm/soft.c (soft_dcmp): New function.
+   Implements dcmpl/dcmpg according to VM spec.
+   (soft_dcmpl, soft_dcmpg) Call soft_dcmp.
+
 2008-02-03  Dalibor Topic  <[EMAIL PROTECTED]>
 
* config/arm/jit-arm.def (cvtfi_RxR): Removed.
Index: kaffe/kaffe/kaffevm/soft.c
diff -u kaffe/kaffe/kaffevm/soft.c:1.83 kaffe/kaffe/kaffevm/soft.c:1.84
--- kaffe/kaffe/kaffevm/soft.c:1.83 Sat Jan 19 15:13:39 2008
+++ kaffe/kaffe/kaffevm/soft.c  Mon Feb 11 21:44:43 2008
@@ -626,27 +626,28 @@
}
 }
 
+
+static
+jint
+soft_dcmp(const jdouble v1, const jdouble v2, const jint nan)
+{
+  if (v1 > v2)
+return 1;
+  else if (v1 == v2)
+return 0;
+  else if (v1 < v2)
+return -1;
+  else 
+return nan;
+}
+  
 /*
  * soft_dcmpg
  */
 jint
 soft_dcmpg(jdouble v1, jdouble v2)
 {
-   jint ret;
-   if ((!isinf(v1) && isnan(v1)) || (!isinf(v2) && isnan(v2))) {
-   ret = 1;
-   }
-   else if (v1 > v2) {
-   ret = 1;
-   }
-   else if (v1 == v2) {
-   ret = 0;
-   }
-   else {
-   ret = -1;
-   }
-
-   return (ret);
+  return soft_dcmp(v1, v2, 1);
 }
 
 /*
@@ -655,20 +656,7 @@
 jint
 soft_dcmpl(jdouble v1, jdouble v2)
 {
-jint ret;
-   if ((!isinf(v1) && isnan(v1)) || (!isinf(v2) && isnan(v2))) {
-   ret = -1;
-   }
-else if (v1 > v2) {
-ret = 1;
-}
-else if (v1 == v2) {
-ret = 0;
-}
-else {
-ret = -1;
-}
-   return (ret);
+  return soft_dcmp(v1, v2, -1);
 }
 
 /*

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed unused cvtfi_RxR from arm jit

[Kaffe CVS]

PatchSet 7738 
Date: 2008/02/03 15:08:29
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed unused cvtfi_RxR from arm jit

2008-02-03  Dalibor Topic  <[EMAIL PROTECTED]>

* config/arm/jit-arm.def (cvtfi_RxR): Removed.

Members: 
ChangeLog:1.5238->1.5239 
config/arm/jit-arm.def:1.10->1.11 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5238 kaffe/ChangeLog:1.5239
--- kaffe/ChangeLog:1.5238  Sun Feb  3 15:05:15 2008
+++ kaffe/ChangeLog Sun Feb  3 15:08:29 2008
@@ -1,6 +1,10 @@
 2008-02-03  Dalibor Topic  <[EMAIL PROTECTED]>
 
-   * config/arm/jit-icode.h (HAVE_cvt_float_int)> Undefine
+   * config/arm/jit-arm.def (cvtfi_RxR): Removed.
+
+2008-02-03  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * config/arm/jit-icode.h (HAVE_cvt_float_int): Undefine
to fix jit regression test failure.
 
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/config/arm/jit-arm.def
diff -u kaffe/config/arm/jit-arm.def:1.10 kaffe/config/arm/jit-arm.def:1.11
--- kaffe/config/arm/jit-arm.def:1.10   Sat Jan 19 15:13:38 2008
+++ kaffe/config/arm/jit-arm.defSun Feb  3 15:08:33 2008
@@ -1344,14 +1344,6 @@
debug(("cvt_int_double %d, %d\n", w, r));
 }
 
-define_insn(cvt_float_int, cvtfi_RxR)
-{
-   int r = rreg_float(2);
-   int w = wreg_int(0);
-   op_cvt_f2i(w,r);
-   debug(("cvt_float_int r%d, f%d\n", w, r));
-}
-
 define_insn(cvt_int_double, cvtdi_RxR)
 {
int r = rreg_double(2);

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): use soft_cvtfi on arm jit

[Kaffe CVS]

PatchSet 7737 
Date: 2008/02/03 15:05:15
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
use soft_cvtfi on arm jit

Members: 
ChangeLog:1.5237->1.5238 
config/arm/jit-icode.h:INITIAL->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5237 kaffe/ChangeLog:1.5238
--- kaffe/ChangeLog:1.5237  Sat Feb  2 22:15:25 2008
+++ kaffe/ChangeLog Sun Feb  3 15:05:15 2008
@@ -1,3 +1,8 @@
+2008-02-03  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * config/arm/jit-icode.h (HAVE_cvt_float_int)> Undefine
+   to fix jit regression test failure.
+
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
* TODO: Updated.
===
Checking out kaffe/config/arm/jit-icode.h
RCS:  /home/cvs/kaffe/kaffe/config/arm/jit-icode.h,v
VERS: 1.4
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/config/arm/jit-icode.hSun Feb  3 15:07:28 2008
@@ -0,0 +1,274 @@
+/* arm/jit-icode.h
+ * Define the instructions which are present on the ARM.
+ *
+ * Copyright (c) 1996, 1997
+ * Transvirtual Technologies, Inc.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file. 
+ */
+
+#ifndef __icode_h
+#define __icode_h
+
+/*
+ * Size of long's compared to references.
+ */
+#define pusharg_long_idx_inc2
+
+/*
+ * Define the range checking macros.
+ */
+#define__anyvalue_rangecheck(v)(1)
+
+//
+// Register-register operations allow you to specify an 8-bit
+// constant (...than can be shifted, although we don't handle that yet)
+//
+#define__I8const_rangecheck(v) ((v) >= -256 && (v) <= 255)
+#define__U8const_rangecheck(v) ((v) >= 0 && (v) <= 255)
+
+//
+// Used for floating load/stores, which use word index rather
+// than byte index.
+//
+#define__I10const_rangecheck(v)((v) >= -1020 && (v) <= 1020)
+
+//
+// memory operations allow you to specify a 12-bit constant
+//
+#define__I12const_rangecheck(v)((v) >= -4096 && (v) <= 4095)
+
+#define__refconst_rangecheck(v)__I8const_rangecheck(v)
+
+#define __floatconst_rangecheck(v) 0
+
+#define __builtin_FP_values(v) ( (v) == 0 || (v) == 1.0 || (v) == 2.0 || (v) 
== 3.0 || (v) == 4.0 || (v) == 5.0 || (v) == 0.5 || (v) == 10)
+
+#define __doubleconst_rangecheck(v)0
+
+/*
+ * These must be defined for any architecture.
+ */
+#defineHAVE_spill_int  spill_Rxx
+#defineHAVE_reload_int reload_Rxx
+#defineHAVE_spill_floatfspill_Rxx
+#defineHAVE_reload_float   freload_Rxx
+#defineHAVE_spill_double   fspilll_Rxx
+#defineHAVE_reload_double  freloadl_Rxx
+#defineHAVE_prologue   prologue_xxx
+#defineHAVE_epilogue   epilogue_xxx
+#defineHAVE_exception_prologue eprologue_xxx
+
+#defineHAVE_move_int_const move_RxC
+#defineHAVE_move_int   move_RxR
+#defineHAVE_move_float fmove_RxR
+#defineHAVE_move_doublefmovel_RxR
+#defineHAVE_move_label_const   move_RxL
+#defineHAVE_move_ref   move_RxR
+#defineHAVE_move_ref_const move_RxC
+#defineHAVE_move_any   move_RxR
+
+#defineHAVE_move_float_const_rangecheck(v) __builtin_FP_values(v)
+#defineHAVE_move_double_const_rangecheck(v)__builtin_FP_values(v)
+#defineHAVE_move_float_const   fmove_RxC
+#defineHAVE_move_double_const  fmovel_RxC
+
+#defineHAVE_move_int_const_rangecheck(v)   __anyvalue_rangecheck(v)
+#defineHAVE_move_ref_const_rangecheck(v)   __anyvalue_rangecheck(v)
+
+#defineHAVE_add_intadd_RRR
+#defineHAVE_sub_intsub_RRR
+#defineHAVE_mul_intmul_RRR
+#undef HAVE_div_int
+#undef HAVE_rem_int
+#defineHAVE_and_intand_RRR
+#defineHAVE_or_int or_RRR
+#defineHAVE_xor_intxor_RRR
+#defineHAVE_ashr_int   ashr_RRR
+#defineHAVE_lshr_int   lshr_RRR
+#defineHAVE_lshl_int   lshl_RRR
+
+#defineHAVE_add_float  fadd_RRR
+#defineHAVE_sub_float  fsub_RRR
+#defineHAVE_mul_float  fmul_RRR
+
+#defineHAVE_add_double faddl_RRR
+#defineHAVE_sub_double fsubl_RRR
+#defineHAVE_mul_double fmull_RRR
+
+#defineHAVE_load_int   load_RxR
+#defineHAVE_store_int  store_xRR
+#defineHAVE_load_ref   load_RxR
+#defineHAVE_store_ref   

[kaffe] CVS kaffe (robilad): updated todo list

[Kaffe CVS]

PatchSet 7736 
Date: 2008/02/02 22:15:25
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated todo list

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Update

Members: 
ChangeLog:1.5236->1.5237 
TODO:1.51->1.52 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5236 kaffe/ChangeLog:1.5237
--- kaffe/ChangeLog:1.5236  Sat Feb  2 22:12:26 2008
+++ kaffe/ChangeLog Sat Feb  2 22:15:25 2008
@@ -1,5 +1,9 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * TODO: Updated.
+
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
Fixed build with arm-linux-oabi-jit and arm-linux-eabi-jit.
Reported by:  Robert Schuster  <[EMAIL PROTECTED]>
 
Index: kaffe/TODO
diff -u kaffe/TODO:1.51 kaffe/TODO:1.52
--- kaffe/TODO:1.51 Sat Feb  2 16:25:50 2008
+++ kaffe/TODO  Sat Feb  2 22:15:32 2008
@@ -73,6 +73,5 @@
   * Switch to autotest for the test suites
 
 * Pending patches 
-  arm flush_dcache from Robert Schuster
   amd64 jit from Eric Anholt (guilhem)
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): fixed build failure with jit on arm-linux

[Kaffe CVS]

PatchSet 7735 
Date: 2008/02/02 22:12:26
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
fixed build failure with jit on arm-linux

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

Fixed build with arm-linux-oabi-jit and arm-linux-eabi-jit.
Reported by:  Robert Schuster  <[EMAIL PROTECTED]>

* config/Makefile.am (EXTRA_DIST): Added arm/linux/linux-eabi.h
and arm/linux/linux-gas.h.

* config/arm/linux/linux-eabi.h,
onfig/arm/linux/linux-gas.h: New files, imported from GCC.

* config/arm/linux/md.c: Include linux-eabi.h when using EABI
and linux-gas otherwise for cache flushing code.
(flish_dcache) Use CLEAR_INSN_CACHE.

Members: 
ChangeLog:1.5235->1.5236 
config/Makefile.am:1.76->1.77 
config/Makefile.in:1.257->1.258 
config/arm/linux/linux-eabi.h:INITIAL->1.1 
config/arm/linux/linux-gas.h:INITIAL->1.1 
config/arm/linux/md.c:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5235 kaffe/ChangeLog:1.5236
--- kaffe/ChangeLog:1.5235  Sat Feb  2 16:25:49 2008
+++ kaffe/ChangeLog Sat Feb  2 22:12:26 2008
@@ -1,5 +1,20 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   Fixed build with arm-linux-oabi-jit and arm-linux-eabi-jit.
+   Reported by:  Robert Schuster  <[EMAIL PROTECTED]>
+
+   * config/Makefile.am (EXTRA_DIST): Added arm/linux/linux-eabi.h
+   and arm/linux/linux-gas.h.
+
+   * config/arm/linux/linux-eabi.h,
+   onfig/arm/linux/linux-gas.h: New files, imported from GCC.
+   
+   * config/arm/linux/md.c: Include linux-eabi.h when using EABI
+   and linux-gas otherwise for cache flushing code.
+   (flish_dcache) Use CLEAR_INSN_CACHE.
+   
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:
Don't use __USE_GNU, use _GNU_SOURCE instead.
 
Index: kaffe/config/Makefile.am
diff -u kaffe/config/Makefile.am:1.76 kaffe/config/Makefile.am:1.77
--- kaffe/config/Makefile.am:1.76   Wed Jan  2 21:05:33 2008
+++ kaffe/config/Makefile.amSat Feb  2 22:12:31 2008
@@ -61,6 +61,8 @@
arm/jit3-arm.def \
arm/jit3-icode.h \
arm/linux/config.frag \
+   arm/linux/linux-eabi.h \
+   arm/linux/linux-gas.h \
arm/linux/jit-md.h \
arm/linux/jit3-md.h \
arm/linux/md.c \
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.257 kaffe/config/Makefile.in:1.258
--- kaffe/config/Makefile.in:1.257  Sat Feb  2 15:58:12 2008
+++ kaffe/config/Makefile.inSat Feb  2 22:12:32 2008
@@ -327,6 +327,8 @@
arm/jit3-arm.def \
arm/jit3-icode.h \
arm/linux/config.frag \
+   arm/linux/linux-eabi.h \
+   arm/linux/linux-gas.h \
arm/linux/jit-md.h \
arm/linux/jit3-md.h \
arm/linux/md.c \
===
Checking out kaffe/config/arm/linux/linux-eabi.h
RCS:  /home/cvs/kaffe/kaffe/config/arm/linux/linux-eabi.h,v
VERS: 1.1
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/config/arm/linux/linux-eabi.h Sat Feb  2 22:16:06 2008
@@ -0,0 +1,87 @@
+/* Configuration file for ARM GNU/Linux EABI targets.
+   Copyright (C) 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+   Contributed by CodeSourcery, LLC   
+
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3, or (at your
+   option) any later version.
+
+   GCC is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING3.  If not see
+   .  */
+
+/* On EABI GNU/Linux, we want both the BPABI builtins and the
+   GNU/Linux builtins.  */
+#undef  TARGET_OS_CPP_BUILTINS
+#define TARGET_OS_CPP_BUILTINS()   \
+  do   \
+{  \
+  TARGET_BPABI_CPP_BUILTINS(); \
+  LINUX_TARGET_OS_CPP_BUILTINS();  \
+}  \
+  while (false)
+
+/* We default to a soft-float ABI so that binaries can run on all
+   target hardware.  */
+#undef  TARGET_DEFAULT_FLOAT_ABI
+#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT
+
+/* We default to the "aapcs-linux" ABI so that enums are int-sized by
+   default.  */
+#undef  ARM_DEFAULT_ABI
+#define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
+
+/* Default to armv5t so that thumb shared libraries work.
+   The ARM10TDMI core is the default for armv5t, so set
+   SUBTARGET_CPU_DEFAULT to achieve this.  */
+#und

[kaffe] CVS kaffe (robilad): cleaned up __USE_GNU

[Kaffe CVS]

PatchSet 7734 
Date: 2008/02/02 16:25:49
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cleaned up __USE_GNU

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:
Don't use __USE_GNU, use _GNU_SOURCE instead.

* TODO: Updated.

Members: 
ChangeLog:1.5234->1.5235 
TODO:1.50->1.51 
kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.99->1.100 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5234 kaffe/ChangeLog:1.5235
--- kaffe/ChangeLog:1.5234  Sat Feb  2 16:17:47 2008
+++ kaffe/ChangeLog Sat Feb  2 16:25:49 2008
@@ -1,5 +1,12 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:
+   Don't use __USE_GNU, use _GNU_SOURCE instead.
+
+   * TODO: Updated.
+   
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
* FAQ/FAQ.bignum: Removed.
 
* Makefile.am (EXTRA_DIST): Removed FAQ/FAQ.bignum.
Index: kaffe/TODO
diff -u kaffe/TODO:1.50 kaffe/TODO:1.51
--- kaffe/TODO:1.50 Sat Feb  2 16:07:23 2008
+++ kaffe/TODO  Sat Feb  2 16:25:50 2008
@@ -13,7 +13,6 @@
* libjit could use a vmgenned interpreter, too.
 
 * Cleanup
- * Don't use __USE_GNU use _GNU_SOURCE instead
  * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
 
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.99 
kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.100
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.99Sat Feb 
 2 16:05:47 2008
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c Sat Feb  2 
16:25:52 2008
@@ -47,9 +47,9 @@
 #include 
 #endif
 
-/* define __USE_GNU for pthread_yield on linux */
-#ifndef __USE_GNU
-#define __USE_GNU
+/* define _GNU_SOURCE for pthread_yield on linux */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 #include 
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): cleaned up docs from GNU MP references

[Kaffe CVS]

PatchSet 7733 
Date: 2008/02/02 16:17:47
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cleaned up docs from GNU MP references

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

* FAQ/FAQ.bignum: Removed.

* Makefile.am (EXTRA_DIST): Removed FAQ/FAQ.bignum.

* THIRDPARTY: Remove section on gmp.m4.

* FAQ/FAQ.requiredlibraries: Removed section on ESD, ALSA,
GNU MP, and libmd.

* FAQ/FAQ.ps2linux: Removed paragraph on GNU MP.

Members: 
ChangeLog:1.5233->1.5234 
Makefile.am:1.150->1.151 
Makefile.in:1.313->1.314 
THIRDPARTY:1.60->1.61 
FAQ/FAQ.bignum:1.1->1.2(DEAD) 
FAQ/FAQ.ps2linux:INITIAL->1.3 
FAQ/FAQ.requiredlibraries:1.16->1.17 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5233 kaffe/ChangeLog:1.5234
--- kaffe/ChangeLog:1.5233  Sat Feb  2 16:05:46 2008
+++ kaffe/ChangeLog Sat Feb  2 16:17:47 2008
@@ -1,5 +1,22 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * FAQ/FAQ.bignum: Removed.
+
+   * Makefile.am (EXTRA_DIST): Removed FAQ/FAQ.bignum.
+
+   * THIRDPARTY: Remove section on gmp.m4.
+
+   * FAQ/FAQ.requiredlibraries: Removed section on ESD, ALSA, 
+   GNU MP, and libmd.
+
+   * FAQ/FAQ.ps2linux: Removed paragraph on GNU MP.
+   
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * WHATSNEW, TODO: Updated for native big math purge.
+   
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
Fix for build on arm-oabi-linux-ffi.

* kaffe/kaffevm/systems/unix-pthreads/thread-impl.c (__USE_GNU)
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.150 kaffe/Makefile.am:1.151
--- kaffe/Makefile.am:1.150 Sat Jan 19 22:53:06 2008
+++ kaffe/Makefile.am   Sat Feb  2 16:17:48 2008
@@ -67,7 +67,6 @@
FAQ/FAQ.automake \
FAQ/FAQ.awt \
FAQ/FAQ.benchmarking \
-   FAQ/FAQ.bignum \
FAQ/FAQ.blackfin \
FAQ/FAQ.charsets \
FAQ/FAQ.class-states \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.313 kaffe/Makefile.in:1.314
--- kaffe/Makefile.in:1.313 Sat Feb  2 15:58:10 2008
+++ kaffe/Makefile.in   Sat Feb  2 16:17:48 2008
@@ -356,7 +356,6 @@
FAQ/FAQ.automake \
FAQ/FAQ.awt \
FAQ/FAQ.benchmarking \
-   FAQ/FAQ.bignum \
FAQ/FAQ.blackfin \
FAQ/FAQ.charsets \
FAQ/FAQ.class-states \
Index: kaffe/THIRDPARTY
diff -u kaffe/THIRDPARTY:1.60 kaffe/THIRDPARTY:1.61
--- kaffe/THIRDPARTY:1.60   Sun Jan  6 19:05:14 2008
+++ kaffe/THIRDPARTYSat Feb  2 16:17:48 2008
@@ -147,15 +147,6 @@
agrees to be bound by the terms and conditions of this License
Agreement.
 
-* m4/gmp.m4
-
-This code has been taken from GNU m4. Kaffe is tracking this project's CVS. 
-The code is licensed under GNU General Public License v2 or later.
-
-See license.terms for the text of GNU General Public License v2. 
-
-More information on GNU m4 is available at http://www.gnu.org/software/m4/.
-
 * libraries/clib/native/VMRuntime.c, m4/classpath.m4.
 
   This file comes from CACAO. More information on CACAO is available from
===
Checking out kaffe/FAQ/FAQ.bignum
RCS:  /home/cvs/kaffe/kaffe/FAQ/Attic/FAQ.bignum,v
VERS: 1.1
***
--- kaffe/FAQ/FAQ.bignumSat Feb  2 16:19:38 2008
+++ /dev/null   Sun Aug  4 19:57:58 2002
@@ -1,43 +0,0 @@
-Using BigIntegers and BigDecimal on Kaffe
-=
-
-Author: Dalibor Topic <[EMAIL PROTECTED]>
-
-Implementations

-
-  Kaffe comes with two implementations of java.math package. The default one, 
-  from GNU Classpath, is written in Java. It is available on all platforms.
-
-  The other implementation uses GNU MP for the actual calculations on 
-  BigInteger. Using the very fast GNU MP library makes it much faster than the
-  default implementation.
-
-Configuration
--
-
-  When Kaffe's configure script detects the presence of GNU MP library, it 
-  automatically takes care of building kaffe with GNU MP support enabled.
-
-  Support for GNU MP can be explicitely turned off using the --without-gmp 
-  configure script option.
-
-Usage
--
-
-  Kaffe uses the pure java implementation by default. If you want to use the 
-  fast java.math implementation, you need to run kaffe with the 
-  -Xnative-big-math option.
-
-Performance

-
-  Running the NativeBigInteger benchmark from i2p [1] shows that kaffe on i686 
-  on GNU/Linux with jit3 and jthreads is about 4 times slower than JDK 1.4.2 
-  using the default, pure java implementation of java.math.
-
-  Using the native implementation, the tables turn, and kaffe is 5 times faster
-  than JDK 1.4.2.
-
-[1] I2P is available at http://www.i2p.net. The benchmark is in the 
net.i2p.util 
-package.
===
Checking out kaffe/FAQ/FAQ.ps2linux
RCS:  /home/cvs/kaffe/kaffe/FAQ/FAQ.ps2linux,v
VERS: 1.3
***
--- /dev

[kaffe] CVS kaffe (robilad): updated docs for big math purge

[Kaffe CVS]

PatchSet 7732 
Date: 2008/02/02 16:07:23
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated docs for big math purge

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

* WHATSNEW, TODO: Updated for native big math purge.

Members: 
TODO:1.49->1.50 
WHATSNEW:1.75->1.76 

Index: kaffe/TODO
diff -u kaffe/TODO:1.49 kaffe/TODO:1.50
--- kaffe/TODO:1.49 Sat Feb  2 15:38:22 2008
+++ kaffe/TODO  Sat Feb  2 16:07:23 2008
@@ -57,7 +57,6 @@
   * Replace native library code using KNI with code using JNI
 
 * Unmerging work
-  * Remove GNU MP big math
   * Remove old Kaffe AWT implementations
 
 * Merging work:
Index: kaffe/WHATSNEW
diff -u kaffe/WHATSNEW:1.75 kaffe/WHATSNEW:1.76
--- kaffe/WHATSNEW:1.75 Sat Feb  2 15:38:22 2008
+++ kaffe/WHATSNEW  Sat Feb  2 16:07:23 2008
@@ -2,6 +2,7 @@
 
 
 * Depend on zziplib instead of zlib for JAR reading.
+* Removed support for native big math.
 * Removed libltdl. Kaffe uses an existing installation 
   exclusively now.
 * Removed gnu-inet, dnsjava, Tritonus and binreloc.

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): fix for build on arm-oabi-linux-ffi

[Kaffe CVS]

PatchSet 7731 
Date: 2008/02/02 16:05:46
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
fix for build on arm-oabi-linux-ffi

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

Fix for build on arm-oabi-linux-ffi.

* kaffe/kaffevm/systems/unix-pthreads/thread-impl.c (__USE_GNU)
Define it only if it's not yet defined.

* kaffe/kaffevm/systems/unix-pthreads/thread-internal.h (__USE_GNU):
Removed.
#

Members: 
ChangeLog:1.5232->1.5233 
kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.98->1.99 
kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.44->1.45 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5232 kaffe/ChangeLog:1.5233
--- kaffe/ChangeLog:1.5232  Sat Feb  2 16:01:19 2008
+++ kaffe/ChangeLog Sat Feb  2 16:05:46 2008
@@ -1,5 +1,15 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   Fix for build on arm-oabi-linux-ffi.
+   
+   * kaffe/kaffevm/systems/unix-pthreads/thread-impl.c (__USE_GNU)
+   Define it only if it's not yet defined.
+   
+   * kaffe/kaffevm/systems/unix-pthreads/thread-internal.h (__USE_GNU):
+   Removed.
+   
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
* m4/gmp.m4: Removed.

 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.98 
kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.99
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c:1.98Sat Jan 
19 15:13:42 2008
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-impl.c Sat Feb  2 
16:05:47 2008
@@ -48,7 +48,9 @@
 #endif
 
 /* define __USE_GNU for pthread_yield on linux */
+#ifndef __USE_GNU
 #define __USE_GNU
+#endif
 #include 
 
 #if !defined(HAVE_PTHREAD_YIELD) && defined(HAVE_SCHED_YIELD)
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.44 
kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.45
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.44Sun Apr 
16 18:44:13 2006
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h Sat Feb  2 
16:05:47 2008
@@ -15,10 +15,6 @@
 #ifndef __thread_internal_h
 #define __thread_internal_h
 
-#if !defined(__USE_GNU)
-#define __USE_GNU
-#endif /* !defined(__USE_GNU) */
-
 #include 
 #include "repsemaphore.h"
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed gmp m4 checks

[Kaffe CVS]

PatchSet 7730 
Date: 2008/02/02 16:01:19
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed gmp m4 checks

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

* m4/gmp.m4: Removed.

Members: 
ChangeLog:1.5231->1.5232 
m4/gmp.m4:1.2->1.3(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5231 kaffe/ChangeLog:1.5232
--- kaffe/ChangeLog:1.5231  Sat Feb  2 15:58:10 2008
+++ kaffe/ChangeLog Sat Feb  2 16:01:19 2008
@@ -1,5 +1,9 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * m4/gmp.m4: Removed.
+   
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
* libraries/clib/math/BigInteger.c,
libraries/clib/math/.cvsignore,
libraries/clib/math/Makefile.am,
===
Checking out kaffe/m4/gmp.m4
RCS:  /home/cvs/kaffe/kaffe/m4/Attic/gmp.m4,v
VERS: 1.2
***
--- kaffe/m4/gmp.m4 Sat Feb  2 16:03:05 2008
+++ /dev/null   Sun Aug  4 19:57:58 2002
@@ -1,74 +0,0 @@
-# -*- Autoconf -*-
-# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301  USA
-
-# serial 7
-
-m4_define([_m4_LIB_GMP],
-[AC_ARG_WITH(gmp,
-[  --without-gmp   don't use GNU multiple precision arithmetic 
library],
-[use_gmp=$withval], [use_gmp=yes])
-
-case $use_gmp:$LIBADD_GMP:$ac_cv_header_gmp_h in
-  *::yes)
-AC_MSG_WARN([gmp library not found or does not appear to work
- but `gmp.h' is present])
-m4_cv_using_lib_gmp=no
-;;
-  *:-lgmp:no)
-AC_MSG_WARN([gmp works but `gmp.h' is missing])
-m4_cv_using_lib_gmp=no
-;;
-  yes:*:yes)
-m4_cv_using_lib_gmp=yes
-;;
-  no:*)
-m4_cv_using_lib_gmp=no
-;;
-esac
-])# _m4_LIB_GMP
-
-
-AC_DEFUN([m4_LIB_GMP],
-[AC_PREREQ(2.56)dnl We use the new compiler based header checking in 2.56
-AC_CHECK_HEADERS([gmp.h], [], [], [AC_INCLUDES_DEFAULT])
-m4_pattern_allow([^m4_gmp_save_LIBS$])
-m4_pattern_allow([^m4_cv_using_lib_gmp])
-# Some versions of gmp provide mpq_init as a macro, so we need to
-# include the header file, otherwise the detection will fail.
-m4_gmp_save_LIBS="$LIBS"
-LIBS="$LIBS -lgmp"
-AC_TRY_LINK([#if HAVE_GMP_H
-#  include 
-#endif],
-  [mpq_t n; mpq_init (n);],
-  [LIBADD_GMP=-lgmp])
-LIBS=$m4_gmp_save_LIBS
-AC_SUBST([LIBADD_GMP])
-
-AC_CACHE_CHECK([if using GNU multiple precision arithmetic library],
-   [m4_cv_using_lib_gmp],
-   [_m4_LIB_GMP])
-
-# Don't try to link in libgmp if we are not using it after the last call
-if test "$m4_cv_using_lib_gmp" = yes; then
-  AC_DEFINE(USE_GMP, 1,
-[Define to 1 if using the GNU multiple precision library.])
-fi
-
-AC_SUBST([USE_GMP], [$m4_cv_using_lib_gmp])
-])# m4_LIB_GMP

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed support for native big math

[Kaffe CVS]

PatchSet 7729 
Date: 2008/02/02 15:58:10
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed support for native big math

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

* libraries/clib/math/BigInteger.c,
libraries/clib/math/.cvsignore,
libraries/clib/math/Makefile.am,
libraries/clib/math/Makefile.in,
libraries/javalib/gmp-math/.cvsignore,
libraries/javalib/gmp-math/Makefile.am,
libraries/javalib/gmp-math/Makefile.in,
libraries/javalib/gmp-math/java/math/BigDecimal.java,
libraries/javalib/gmp-math/java/math/BigInteger.java:
Removed.

* configure.ac: Removed checks for GNU MP and native math.

* libraries/clib/Makefile.am (SUBDIRS):
Removed math dir.

* libraries/javalib/Makefile.am (SUBDIRS): Removed
gmp-math dir.

Members: 
ChangeLog:1.5230->1.5231 
Makefile.in:1.312->1.313 
aclocal.m4:1.143->1.144 
configure:1.638->1.639 
configure.ac:1.308->1.309 
config/Makefile.in:1.256->1.257 
config/config.h.in:1.182->1.183 
include/Makefile.in:1.320->1.321 
kaffe/Makefile.in:1.205->1.206 
kaffe/jvmpi/Makefile.in:1.131->1.132 
kaffe/kaffe/Makefile.in:1.230->1.231 
kaffe/kaffeh/Makefile.in:1.212->1.213 
kaffe/kaffevm/Makefile.in:1.286->1.287 
kaffe/kaffevm/boehm-gc/Makefile.in:1.96->1.97 
kaffe/kaffevm/gcj/Makefile.in:1.185->1.186 
kaffe/kaffevm/intrp/Makefile.in:1.194->1.195 
kaffe/kaffevm/jit/Makefile.in:1.204->1.205 
kaffe/kaffevm/jit3/Makefile.in:1.174->1.175 
kaffe/kaffevm/kaffe-gc/Makefile.in:1.94->1.95 
kaffe/kaffevm/systems/Makefile.in:1.194->1.195 
kaffe/kaffevm/systems/beos-native/Makefile.in:1.185->1.186 
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.49->1.50 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.191->1.192 
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.195->1.196 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.171->1.172 
kaffe/man/Makefile.in:1.192->1.193 
kaffe/scripts/Makefile.in:1.238->1.239 
kaffe/scripts/bat/Makefile.in:1.185->1.186 
kaffe/scripts/compat/Makefile.in:1.213->1.214 
kaffe/xprof/Makefile.in:1.161->1.162 
libraries/Makefile.in:1.188->1.189 
libraries/clib/Makefile.am:1.33->1.34 
libraries/clib/Makefile.in:1.210->1.211 
libraries/clib/awt/Makefile.in:1.203->1.204 
libraries/clib/awt/X/Makefile.in:1.199->1.200 
libraries/clib/awt/nano-X/Makefile.in:1.70->1.71 
libraries/clib/awt/qt/Makefile.in:1.151->1.152 
libraries/clib/awt/xynth/Makefile.in:1.26->1.27 
libraries/clib/math/.cvsignore:1.1->1.2(DEAD) 
libraries/clib/math/BigInteger.c:1.31->1.32(DEAD) 
libraries/clib/math/Makefile.am:1.14->1.15(DEAD) 
libraries/clib/math/Makefile.in:1.201->1.202(DEAD) 
libraries/clib/zip/Makefile.in:1.208->1.209 
libraries/javalib/Makefile.am:1.467->1.468 
libraries/javalib/Makefile.in:1.601->1.602 
libraries/javalib/awt-implementations/Makefile.in:1.82->1.83 
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.105->1.106 
libraries/javalib/gmp-math/.cvsignore:1.1->1.2(DEAD) 
libraries/javalib/gmp-math/Makefile.am:1.14->1.15(DEAD) 
libraries/javalib/gmp-math/Makefile.in:1.91->1.92(DEAD) 
libraries/javalib/gmp-math/java/math/BigDecimal.java:1.1->1.2(DEAD) 
libraries/javalib/gmp-math/java/math/BigInteger.java:1.3->1.4(DEAD) 
libraries/javalib/vmspecific/Makefile.in:1.34->1.35 
libraries/javalib/zlib-zip/Makefile.in:1.32->1.33 
replace/Makefile.in:1.148->1.149 
test/Makefile.in:1.197->1.198 
test/internal/Makefile.in:1.173->1.174 
test/jni/Makefile.in:1.105->1.106 
test/regression/Makefile.in:1.276->1.277 
test/regression/compile_time/Makefile.in:1.125->1.126 
test/regression/compiler/Makefile.in:1.109->1.110 
test/regression/run_time/Makefile.in:1.124->1.125 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5230 kaffe/ChangeLog:1.5231
--- kaffe/ChangeLog:1.5230  Sat Feb  2 15:38:22 2008
+++ kaffe/ChangeLog Sat Feb  2 15:58:10 2008
@@ -1,5 +1,26 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * libraries/clib/math/BigInteger.c,
+   libraries/clib/math/.cvsignore,
+   libraries/clib/math/Makefile.am,
+   libraries/clib/math/Makefile.in,
+   libraries/javalib/gmp-math/.cvsignore,
+   libraries/javalib/gmp-math/Makefile.am,
+   libraries/javalib/gmp-math/Makefile.in,
+   libraries/javalib/gmp-math/java/math/BigDecimal.java,
+   libraries/javalib/gmp-math/java/math/BigInteger.java:
+   Removed.
+
+   * configure.ac: Removed checks for GNU MP and native math.
+
+   * libraries/clib/Makefile.am (SUBDIRS): 
+   Removed math dir.
+
+   * libraries/javalib/Makefile.am (SUBDIRS): Removed
+   gmp-math dir.
+
+2008-02-02  

[kaffe] CVS kaffe (robilad): updated docs for switch to zziplib

[Kaffe CVS]

PatchSet 7728 
Date: 2008/02/02 15:38:22
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated docs for switch to zziplib

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

* WHATSNEW: Documented JAR reading dependency change.

* TODO: Updated.

* FAQ/FAQ.requiredlibraries: Removed section on zlib.

Members: 
ChangeLog:1.5229->1.5230 
TODO:1.48->1.49 
WHATSNEW:1.74->1.75 
FAQ/FAQ.requiredlibraries:1.15->1.16 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5229 kaffe/ChangeLog:1.5230
--- kaffe/ChangeLog:1.5229  Sat Feb  2 15:26:40 2008
+++ kaffe/ChangeLog Sat Feb  2 15:38:22 2008
@@ -1,5 +1,13 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * WHATSNEW: Documented JAR reading dependency change.
+
+   * TODO: Updated.
+
+   * FAQ/FAQ.requiredlibraries: Removed section on zlib.
+
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
* configure.ac: Removed checks for zlib.h, libz, and ZIP_LIBS.
 
* libraries/clib/zip/Makefile.am (libzip_la_CFLAGS): Added
Index: kaffe/TODO
diff -u kaffe/TODO:1.48 kaffe/TODO:1.49
--- kaffe/TODO:1.48 Thu Jan 31 20:49:45 2008
+++ kaffe/TODO  Sat Feb  2 15:38:22 2008
@@ -36,7 +36,6 @@
  * Switch to libjclassinfo for class file parsing
   * Switch to libzzlib for zip file reading first to be able to kill the 
syscall
 interface in the threading code.
-* continue with native zip libs.
 * findInJar is a bit trickier, as it also deals with directories, regular 
classes
   etc. Maybe it can be largely rewritten in Java in the VMClassLoader? 
   Alternatively, use zziplib's transparent file access to access class 
files,
Index: kaffe/WHATSNEW
diff -u kaffe/WHATSNEW:1.74 kaffe/WHATSNEW:1.75
--- kaffe/WHATSNEW:1.74 Sat Jan 19 22:57:25 2008
+++ kaffe/WHATSNEW  Sat Feb  2 15:38:22 2008
@@ -1,6 +1,7 @@
 What's New Since Kaffe 1.1.8
 
 
+* Depend on zziplib instead of zlib for JAR reading.
 * Removed libltdl. Kaffe uses an existing installation 
   exclusively now.
 * Removed gnu-inet, dnsjava, Tritonus and binreloc.
Index: kaffe/FAQ/FAQ.requiredlibraries
diff -u kaffe/FAQ/FAQ.requiredlibraries:1.15 
kaffe/FAQ/FAQ.requiredlibraries:1.16
--- kaffe/FAQ/FAQ.requiredlibraries:1.15Mon Jan 21 01:13:06 2008
+++ kaffe/FAQ/FAQ.requiredlibraries Sat Feb  2 15:38:23 2008
@@ -38,13 +38,6 @@
 http://www.classpath.org . GNU Classpath is used as the core class
 library for Kaffe.
 
-ZIP library

-
-You'll need the zlib library for Kaffe to be able to use class libraries
-stored in JAR archives. It is available at:
-http://www.zlib.net
-
 JAR tool
 
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed checks for zlib

[Kaffe CVS]

PatchSet 7727 
Date: 2008/02/02 15:26:40
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed checks for zlib

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

* configure.ac: Removed checks for zlib.h, libz, and ZIP_LIBS.

* libraries/clib/zip/Makefile.am (libzip_la_CFLAGS): Added
ZZIP_CFLAGS. (libzip_la_LIBADD): Replaced ZIP_LIBS by ZZIP_LIBS.

Members: 
ChangeLog:1.5228->1.5229 
Makefile.in:1.311->1.312 
configure:1.637->1.638 
configure.ac:1.307->1.308 
config/Makefile.in:1.255->1.256 
config/config.h.in:1.181->1.182 
include/Makefile.in:1.319->1.320 
kaffe/Makefile.in:1.204->1.205 
kaffe/jvmpi/Makefile.in:1.130->1.131 
kaffe/kaffe/Makefile.in:1.229->1.230 
kaffe/kaffeh/Makefile.in:1.211->1.212 
kaffe/kaffevm/Makefile.in:1.285->1.286 
kaffe/kaffevm/boehm-gc/Makefile.in:1.95->1.96 
kaffe/kaffevm/gcj/Makefile.in:1.184->1.185 
kaffe/kaffevm/intrp/Makefile.in:1.193->1.194 
kaffe/kaffevm/jit/Makefile.in:1.203->1.204 
kaffe/kaffevm/jit3/Makefile.in:1.173->1.174 
kaffe/kaffevm/kaffe-gc/Makefile.in:1.93->1.94 
kaffe/kaffevm/systems/Makefile.in:1.193->1.194 
kaffe/kaffevm/systems/beos-native/Makefile.in:1.184->1.185 
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.48->1.49 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.190->1.191 
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.194->1.195 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.170->1.171 
kaffe/man/Makefile.in:1.191->1.192 
kaffe/scripts/Makefile.in:1.237->1.238 
kaffe/scripts/bat/Makefile.in:1.184->1.185 
kaffe/scripts/compat/Makefile.in:1.212->1.213 
kaffe/xprof/Makefile.in:1.160->1.161 
libraries/Makefile.in:1.187->1.188 
libraries/clib/Makefile.in:1.209->1.210 
libraries/clib/awt/Makefile.in:1.202->1.203 
libraries/clib/awt/X/Makefile.in:1.198->1.199 
libraries/clib/awt/nano-X/Makefile.in:1.69->1.70 
libraries/clib/awt/qt/Makefile.in:1.150->1.151 
libraries/clib/awt/xynth/Makefile.in:1.25->1.26 
libraries/clib/math/Makefile.in:1.200->1.201 
libraries/clib/zip/Makefile.am:1.22->1.23 
libraries/clib/zip/Makefile.in:1.207->1.208 
libraries/javalib/Makefile.in:1.600->1.601 
libraries/javalib/awt-implementations/Makefile.in:1.81->1.82 
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.104->1.105 
libraries/javalib/gmp-math/Makefile.in:1.90->1.91 
libraries/javalib/vmspecific/Makefile.in:1.33->1.34 
libraries/javalib/zlib-zip/Makefile.in:1.31->1.32 
replace/Makefile.in:1.147->1.148 
test/Makefile.in:1.196->1.197 
test/internal/Makefile.in:1.172->1.173 
test/jni/Makefile.in:1.104->1.105 
test/regression/Makefile.in:1.275->1.276 
test/regression/compile_time/Makefile.in:1.124->1.125 
test/regression/compiler/Makefile.in:1.108->1.109 
test/regression/run_time/Makefile.in:1.123->1.124 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5228 kaffe/ChangeLog:1.5229
--- kaffe/ChangeLog:1.5228  Sat Feb  2 15:10:25 2008
+++ kaffe/ChangeLog Sat Feb  2 15:26:40 2008
@@ -1,5 +1,12 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * configure.ac: Removed checks for zlib.h, libz, and ZIP_LIBS.
+
+   * libraries/clib/zip/Makefile.am (libzip_la_CFLAGS): Added
+   ZZIP_CFLAGS. (libzip_la_LIBADD): Replaced ZIP_LIBS by ZZIP_LIBS.
+
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
 
* libraries/javalib/zlib-zip/org/kaffe/util/Assert.java,
libraries/javalib/zlib-zip/org/kaffe/util/UTF8.java,
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.311 kaffe/Makefile.in:1.312
--- kaffe/Makefile.in:1.311 Tue Jan 22 23:21:21 2008
+++ kaffe/Makefile.in   Sat Feb  2 15:26:40 2008
@@ -240,7 +240,6 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
 ZZIP_CFLAGS = @ZZIP_CFLAGS@
 ZZIP_LIBS = @ZZIP_LIBS@
 abs_builddir = @abs_builddir@
Index: kaffe/configure
diff -u kaffe/configure:1.637 kaffe/configure:1.638
--- kaffe/configure:1.637   Tue Jan 22 23:21:21 2008
+++ kaffe/configure Sat Feb  2 15:26:40 2008
@@ -972,7 +972,6 @@
 HAVE_JASMIN_FALSE
 KAFFE_LIBS
 M_LIBS
-ZIP_LIBS
 LIBADD_GMP
 USE_GMP
 GC_NAME
@@ -2185,7 +2184,6 @@
 ac_header_list="$ac_header_list sys/ucontext.h"
 ac_header_list="$ac_header_list unistd.h"
 ac_header_list="$ac_header_list wintypes.h"
-ac_header_list="$ac_header_list zlib.h"
 ac_header_list="$ac_header_list asm/sigcontext.h"
 ac_header_list="$ac_header_list asm/ppc_asm.h"
 ac_header_list="$ac_header_list asm/cachectl.h"
@@ -7041,7 +7039,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7044 "configure"' > conftest.$ac_ext
+  echo '#line 7042 "configure"' > conftest.$ac_ext
   if { (eval echo "$as

[kaffe] CVS kaffe (robilad): removed zlib inflater and deflater

[Kaffe CVS]

PatchSet 7726 
Date: 2008/02/02 15:10:25
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed zlib inflater and deflater

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>


* libraries/javalib/zlib-zip/org/kaffe/util/Assert.java,
libraries/javalib/zlib-zip/org/kaffe/util/UTF8.java,
libraries/javalib/zlib-zip/org/kaffe/util/zip/SwitchInflater.java,
libraries/clib/zip/Inflater.c,
libraries/clib/zip/Deflater.c,
libraries/javalib/zlib-zip/java/util/zip/Inflater.java,
libraries/javalib/zlib-zip/java/util/zip/Deflater.java:
Removed.

* libraries/clib/zip/Makefile.am (libzip_la_SOURCES):
Removed Inflater.c and Deflater.c.

* libraries/javalib/zlib-zip/Makefile.am (dist_zlib_JAVA):
Removed org/kaffe/util/Assert.java, org/kaffe/util/UTF8.java,
org/kaffe/util/zip/SwitchInflater.java, java/util/zip/Inflater.java,
java/util/zip/Deflater.java.

Members: 
ChangeLog:1.5227->1.5228 
libraries/clib/zip/Deflater.c:1.20->1.21(DEAD) 
libraries/clib/zip/Inflater.c:1.19->1.20(DEAD) 
libraries/clib/zip/Makefile.am:1.21->1.22 
libraries/clib/zip/Makefile.in:1.206->1.207 
libraries/javalib/zlib-zip/Makefile.am:1.10->1.11 
libraries/javalib/zlib-zip/Makefile.in:1.30->1.31 
libraries/javalib/zlib-zip/java/util/zip/Deflater.java:1.1->1.2(DEAD) 
libraries/javalib/zlib-zip/java/util/zip/Inflater.java:1.1->1.2(DEAD) 
libraries/javalib/zlib-zip/org/kaffe/util/Assert.java:1.1->1.2(DEAD) 
libraries/javalib/zlib-zip/org/kaffe/util/UTF8.java:1.1->1.2(DEAD) 

libraries/javalib/zlib-zip/org/kaffe/util/zip/SwitchInflater.java:1.1->1.2(DEAD)
 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5227 kaffe/ChangeLog:1.5228
--- kaffe/ChangeLog:1.5227  Sat Feb  2 14:59:31 2008
+++ kaffe/ChangeLog Sat Feb  2 15:10:25 2008
@@ -1,5 +1,25 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+
+   * libraries/javalib/zlib-zip/org/kaffe/util/Assert.java,
+   libraries/javalib/zlib-zip/org/kaffe/util/UTF8.java,
+   libraries/javalib/zlib-zip/org/kaffe/util/zip/SwitchInflater.java,
+   libraries/clib/zip/Inflater.c,
+   libraries/clib/zip/Deflater.c,
+   libraries/javalib/zlib-zip/java/util/zip/Inflater.java,
+   libraries/javalib/zlib-zip/java/util/zip/Deflater.java:
+   Removed.
+   
+   * libraries/clib/zip/Makefile.am (libzip_la_SOURCES): 
+   Removed Inflater.c and Deflater.c.
+
+   * libraries/javalib/zlib-zip/Makefile.am (dist_zlib_JAVA): 
+   Removed org/kaffe/util/Assert.java, org/kaffe/util/UTF8.java,
+   org/kaffe/util/zip/SwitchInflater.java, java/util/zip/Inflater.java,
+   java/util/zip/Deflater.java.
+
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
* libraries/javalib/zlib-zip/java/util/zip/DeflaterOutputStream.java:
Removed.

===
Checking out kaffe/libraries/clib/zip/Deflater.c
RCS:  /home/cvs/kaffe/kaffe/libraries/clib/zip/Attic/Deflater.c,v
VERS: 1.20
***
--- kaffe/libraries/clib/zip/Deflater.c Sat Feb  2 15:14:37 2008
+++ /dev/null   Sun Aug  4 19:57:58 2002
@@ -1,189 +0,0 @@
-/*
- * java.util.zip.Deflater.c
- *
- * Copyright (c) 1996, 1997
- * Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution 
- * of this file. 
- */
-
-#define DBG(s)
-#include "config.h"
-#include "config-std.h"
-#include "config-mem.h"
-#include 
-#include "java_util_zip_Deflater.h"
-
-#include 
-
-#defineWSIZE   0x8000
-#defineWSIZEBITS   15
-
-static inline 
-z_stream*
-getStream(struct Hjava_util_zip_Deflater* this)
-{
-  return *(z_stream**)&unhand(this)->strm;
-}
-
-static inline 
-void
-setStream(struct Hjava_util_zip_Deflater* this, z_stream* stream)
-{
-  *(z_stream**)&unhand(this)->strm = stream;
-}
-
-void
-java_util_zip_Deflater_setDictionary(struct Hjava_util_zip_Deflater* this, 
HArrayOfByte* buf, jint from, jint len)
-{
-   int r;
-   z_stream* dstream;
-
-   dstream = getStream(this);
-
-   // XXX What happens if out of bounds ? 
-   if (from >= 0 && len > 0 && from + len <= obj_length(buf)) {
-   void* dictionary = &unhand_array(buf)->body[from];
-   r = deflateSetDictionary (dstream, dictionary, (unsigned)len);
-   if (r < 0) {
-   SignalError("java.lang.Error", dstream->msg ? 
dstream->msg : "unknown error");
-   }
-   }
-}
-
-jint
-java_util_zip_Deflater_deflate(struct Hjava_util_zip_Deflater* this, 
HArrayOfByte* buf, jint off, jint len)
-{
-   int r;
-   int ilen;
-   z_stream* dstream;
-   void* next_available_input = 
&unhand_array(unhand(this)->buf)->body[unhand(this)->off];
-   void* next_available_output = &unhand_array(buf)->body[off];
-
-   dstream = getStream(this);
-
-   ilen = unhand(this)->len;
-
-   dstream->next_in = next_available_input;

[kaffe] CVS kaffe (robilad): removed deflateroutputstream

[Kaffe CVS]

PatchSet 7725 
Date: 2008/02/02 14:59:31
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed deflateroutputstream

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

* libraries/javalib/zlib-zip/java/util/zip/DeflaterOutputStream.java:
Removed.

* libraries/javalib/zlib-zip/Makefile.am (dist_zlib_JAVA):
Removed java/util/zip/DeflaterOutputStream.java.

Members: 
ChangeLog:1.5226->1.5227 
libraries/javalib/zlib-zip/Makefile.am:1.9->1.10 
libraries/javalib/zlib-zip/Makefile.in:1.29->1.30 

libraries/javalib/zlib-zip/java/util/zip/DeflaterOutputStream.java:1.1->1.2(DEAD)
 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5226 kaffe/ChangeLog:1.5227
--- kaffe/ChangeLog:1.5226  Sat Feb  2 01:08:36 2008
+++ kaffe/ChangeLog Sat Feb  2 14:59:31 2008
@@ -1,5 +1,13 @@
 2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * libraries/javalib/zlib-zip/java/util/zip/DeflaterOutputStream.java:
+   Removed.
+   
+   * libraries/javalib/zlib-zip/Makefile.am (dist_zlib_JAVA): 
+   Removed java/util/zip/DeflaterOutputStream.java.
+
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
* libraries/clib/zip/Adler32.c, 
libraries/clib/zip/CRC32.c, 
libraries/javalib/zlib-zip/java/util/zip/Adler32.java,
Index: kaffe/libraries/javalib/zlib-zip/Makefile.am
diff -u kaffe/libraries/javalib/zlib-zip/Makefile.am:1.9 
kaffe/libraries/javalib/zlib-zip/Makefile.am:1.10
--- kaffe/libraries/javalib/zlib-zip/Makefile.am:1.9Sat Feb  2 01:08:42 2008
+++ kaffe/libraries/javalib/zlib-zip/Makefile.amSat Feb  2 14:59:33 2008
@@ -23,7 +23,6 @@
 
 dist_zlib_JAVA = \
java/util/zip/Deflater.java \
-   java/util/zip/DeflaterOutputStream.java \
java/util/zip/Inflater.java \
java/util/zip/ZipFile.java \
org/kaffe/util/Assert.java \
Index: kaffe/libraries/javalib/zlib-zip/Makefile.in
diff -u kaffe/libraries/javalib/zlib-zip/Makefile.in:1.29 
kaffe/libraries/javalib/zlib-zip/Makefile.in:1.30
--- kaffe/libraries/javalib/zlib-zip/Makefile.in:1.29   Sat Feb  2 01:08:42 2008
+++ kaffe/libraries/javalib/zlib-zip/Makefile.inSat Feb  2 14:59:33 2008
@@ -288,7 +288,6 @@
 zlibdir = $(FAKE)
 dist_zlib_JAVA = \
java/util/zip/Deflater.java \
-   java/util/zip/DeflaterOutputStream.java \
java/util/zip/Inflater.java \
java/util/zip/ZipFile.java \
org/kaffe/util/Assert.java \
===
Checking out 
kaffe/libraries/javalib/zlib-zip/java/util/zip/DeflaterOutputStream.java
RCS:  
/home/cvs/kaffe/kaffe/libraries/javalib/zlib-zip/java/util/zip/Attic/DeflaterOutputStream.java,v
VERS: 1.1
***
--- kaffe/libraries/javalib/zlib-zip/java/util/zip/DeflaterOutputStream.java
Sat Feb  2 15:01:07 2008
+++ /dev/null   Sun Aug  4 19:57:58 2002
@@ -1,78 +0,0 @@
-package java.util.zip;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/*
- * Java core library component.
- *
- * Copyright (c) 1997, 1998
- *  Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- */
-public class DeflaterOutputStream
-  extends FilterOutputStream
-{
-   final private static int DEFAULT = 512;
-   protected Deflater def;
-   protected byte[] buf;
-
-public DeflaterOutputStream(OutputStream out) {
-   this(out, new Deflater(), DEFAULT);
-}
-
-public DeflaterOutputStream(OutputStream out, Deflater defx) {
-   this(out, defx, DEFAULT);
-}
-
-public DeflaterOutputStream(OutputStream out, Deflater defx, int size) {
-   super(out);
-   if (out == null)
- throw new NullPointerException("out");
-   if (defx == null)
- throw new NullPointerException("def");
-   def = defx;
-   if (size < 1)
- throw new IllegalArgumentException("size < 1");
-   buf = new byte[size];
-}
-
-public void close() throws IOException {
-   finish();
-   super.close();
-}
-
-protected void deflate() throws IOException {
-   do {
-   int r = def.deflate(buf, 0, buf.length);
-   out.write(buf, 0, r);
-   } while (!def.needsInput());
-}
-
-public void finish() throws IOException {
-   def.finish();
-   while (!def.finished()) {
-   deflate();
-   }
-}
-
-public void write(byte b[], int off, int len) throws IOException {
-   if (off < 0 || len < 0 || off + len > b.length)
-   throw new IndexOutOfBoundsException();
-   
-   if(len != 0) {
-   def.setInput(b, off, len);
-   deflate();
-   }
-}
-
-public void write(int b) throws IOException {
-   byte a[] = new byte[1];
-   a[0] = (byte)b;
-   write(a, 0, 1);
-}
-
-}

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed native adler32 and crc32 code

[Kaffe CVS]

PatchSet 7724 
Date: 2008/02/02 01:08:36
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed native adler32 and crc32 code

2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>

* libraries/clib/zip/Adler32.c,
libraries/clib/zip/CRC32.c,
libraries/javalib/zlib-zip/java/util/zip/Adler32.java,
libraries/javalib/zlib-zip/java/util/zip/CRC32.java: Removed.

* libraries/clib/zip/Makefile.am (libzip_la_SOURCES):
Removed Adler32.c and CRC32.c.

* libraries/javalib/zlib-zip/Makefile.am (dist_zlib_JAVA):
Removed java/util/zip/Adler32.java and java/util/zip/CRC32.java.

Members: 
ChangeLog:1.5225->1.5226 
libraries/clib/zip/Adler32.c:1.10->1.11(DEAD) 
libraries/clib/zip/CRC32.c:1.8->1.9(DEAD) 
libraries/clib/zip/Makefile.am:1.20->1.21 
libraries/clib/zip/Makefile.in:1.205->1.206 
libraries/javalib/zlib-zip/Makefile.am:1.8->1.9 
libraries/javalib/zlib-zip/Makefile.in:1.28->1.29 
libraries/javalib/zlib-zip/java/util/zip/Adler32.java:1.1->1.2(DEAD) 
libraries/javalib/zlib-zip/java/util/zip/CRC32.java:1.1->1.2(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5225 kaffe/ChangeLog:1.5226
--- kaffe/ChangeLog:1.5225  Thu Jan 31 20:49:45 2008
+++ kaffe/ChangeLog Sat Feb  2 01:08:36 2008
@@ -1,3 +1,16 @@
+2008-02-02  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * libraries/clib/zip/Adler32.c, 
+   libraries/clib/zip/CRC32.c, 
+   libraries/javalib/zlib-zip/java/util/zip/Adler32.java,
+   libraries/javalib/zlib-zip/java/util/zip/CRC32.java: Removed.
+
+   * libraries/clib/zip/Makefile.am (libzip_la_SOURCES): 
+   Removed Adler32.c and CRC32.c.
+
+   * libraries/javalib/zlib-zip/Makefile.am (dist_zlib_JAVA): 
+   Removed java/util/zip/Adler32.java and java/util/zip/CRC32.java.
+
 2008-01-31  Dalibor Topic  <[EMAIL PROTECTED]>
 
* TODO: Updated.
===
Checking out kaffe/libraries/clib/zip/Adler32.c
RCS:  /home/cvs/kaffe/kaffe/libraries/clib/zip/Attic/Adler32.c,v
VERS: 1.10
***
--- kaffe/libraries/clib/zip/Adler32.c  Sat Feb  2 01:11:29 2008
+++ /dev/null   Sun Aug  4 19:57:58 2002
@@ -1,41 +0,0 @@
-/*
- * java.util.zip.Adler32.c
- *
- * Copyright (c) 1996, 1997
- * Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution 
- * of this file. 
- */
-
-#include "config.h"
-#include "config-std.h"
-#include "config-mem.h"
-#include 
-#include "java_util_zip_Adler32.h"
-#include "gtypes.h"
-
-#include 
-
-void
-java_util_zip_Adler32_update(struct Hjava_util_zip_Adler32* this, 
HArrayOfByte* buf, jint from, jint len)
-{
-   // XXX What happens if out of bounds ? 
-   if (from >= 0 && len > 0 && from + len <= obj_length(buf)) {
-   unhand(this)->adler = adler32((uLong)unhand(this)->adler, 
- (const Bytef 
*)&unhand_array(buf)->body[from], 
- (uInt)len);
-   }
-}
-
-void
-java_util_zip_Adler32_update1(struct Hjava_util_zip_Adler32* this, jint val)
-{
-   jbyte b;
-
-   b = val;
-   unhand(this)->adler = adler32((uLong)unhand(this)->adler, 
- (const Bytef *)&b, 
- (uInt)sizeof(b));
-}
-
===
Checking out kaffe/libraries/clib/zip/CRC32.c
RCS:  /home/cvs/kaffe/kaffe/libraries/clib/zip/Attic/CRC32.c,v
VERS: 1.8
***
--- kaffe/libraries/clib/zip/CRC32.cSat Feb  2 01:11:29 2008
+++ /dev/null   Sun Aug  4 19:57:58 2002
@@ -1,38 +0,0 @@
-/*
- * java.util.zip.CRC32.c
- *
- * Copyright (c) 1996, 1997
- * Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution 
- * of this file. 
- */
-
-#include "config.h"
-#include "config-std.h"
-#include "config-mem.h"
-#include 
-#include "java_util_zip_CRC32.h"
-#include "gtypes.h"
-
-#include 
-
-void
-java_util_zip_CRC32_update(struct Hjava_util_zip_CRC32* this, HArrayOfByte* 
buf, jint from, jint len)
-{
-   unhand(this)->crc = crc32((uLong)unhand(this)->crc, 
- (const Bytef 
*)&unhand_array(buf)->body[from], 
- (uInt)len);
-}
-
-void
-java_util_zip_CRC32_update1(struct Hjava_util_zip_CRC32* this, jint val)
-{
-   jbyte b;
-
-   b = val;
-   unhand(this)->crc = crc32((uLong)unhand(this)->crc,
- (const Bytef *)&b,
- (uInt)sizeof(b));
-}
-
Index: kaffe/libraries/clib/zip/Makefile.am
diff -u kaffe/libraries/clib/zip/Makefile.am:1.20 
kaffe/libraries/clib/zip/Makefile.am:1.21
--- kaffe/libraries/clib/zip/Makefile.am:1.20   Sun Jul  1 19:09:14 2007
+++ kaffe/libraries/clib/zip/Makefile.amSat Feb  2 01:08:41 2008
@@ -31,8 +31,6 @@
$(

[kaffe] CVS kaffe (robilad): updated zlib-zip

[Kaffe CVS]

PatchSet 7723 
Date: 2008/01/31 20:49:45
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated zlib-zip

2008-01-31  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

* libraries/javalib/zlib-zip/java/util/zip/ZipEntry.java,
libraries/javalib/zlib-zip/java/util/zip/ZipInputStream.java,
libraries/javalib/zlib-zip/java/util/zip/ZipOutputStream.java:
Removed.

* kaffe/kaffevm/debug.c (kaffe_dprintf): Changed prototype of
max to size_t.

* libraries/clib/zip/ZipFile.c: Include native.h amd zzip/zzip.h.
(makeZipEntry, java_util_zip_ZipFile_openZipFile0,
java_util_zip_ZipFile_closeZipFile0, 
java_util_zip_ZipFile_getZipFileSize0,
java_util_zip_ZipFile_getZipEntry0, java_util_zip_ZipFile_getZipData0,
java_util_zip_ZipFile_getZipEntries0) Rewritten to use zziplib.
(getZipEntry) New helper function.

* libraries/javalib/zlib-zip/Makefile.am (dist_zlib_JAVA):
Removed /java/util/zip/ZipEntry.java, java/util/zip/ZipInputStream.java
and java/util/zip/ZipOutputStream.java.

* libraries/javalib/zlib-zip/java/util/zip/ZipFile.java (getZipEntry):
New private helper method. (getEntry, getInputStream) Use getZipEntry
to avoid infinte recursion with overridden getEntry.

Members: 
ChangeLog:1.5224->1.5225 
TODO:1.47->1.48 
kaffe/kaffevm/debug.c:1.67->1.68 
libraries/clib/zip/ZipFile.c:1.1->1.2 
libraries/javalib/zlib-zip/Makefile.am:1.7->1.8 
libraries/javalib/zlib-zip/Makefile.in:1.27->1.28 
libraries/javalib/zlib-zip/java/util/zip/ZipEntry.java:1.1->1.2(DEAD) 
libraries/javalib/zlib-zip/java/util/zip/ZipFile.java:1.1->1.2 

libraries/javalib/zlib-zip/java/util/zip/ZipInputStream.java:1.1->1.2(DEAD) 

libraries/javalib/zlib-zip/java/util/zip/ZipOutputStream.java:1.1->1.2(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5224 kaffe/ChangeLog:1.5225
--- kaffe/ChangeLog:1.5224  Mon Jan 28 00:59:32 2008
+++ kaffe/ChangeLog Thu Jan 31 20:49:45 2008
@@ -1,3 +1,30 @@
+2008-01-31  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * TODO: Updated.
+
+   * libraries/javalib/zlib-zip/java/util/zip/ZipEntry.java,
+   libraries/javalib/zlib-zip/java/util/zip/ZipInputStream.java,
+   libraries/javalib/zlib-zip/java/util/zip/ZipOutputStream.java:
+   Removed.
+
+   * kaffe/kaffevm/debug.c (kaffe_dprintf): Changed prototype of
+   max to size_t.
+
+   * libraries/clib/zip/ZipFile.c: Include native.h amd zzip/zzip.h.
+   (makeZipEntry, java_util_zip_ZipFile_openZipFile0, 
+   java_util_zip_ZipFile_closeZipFile0, 
java_util_zip_ZipFile_getZipFileSize0,
+   java_util_zip_ZipFile_getZipEntry0, java_util_zip_ZipFile_getZipData0, 
+   java_util_zip_ZipFile_getZipEntries0) Rewritten to use zziplib.
+   (getZipEntry) New helper function.
+
+   * libraries/javalib/zlib-zip/Makefile.am (dist_zlib_JAVA):
+   Removed /java/util/zip/ZipEntry.java, java/util/zip/ZipInputStream.java
+   and java/util/zip/ZipOutputStream.java.
+
+   * libraries/javalib/zlib-zip/java/util/zip/ZipFile.java (getZipEntry):
+   New private helper method. (getEntry, getInputStream) Use getZipEntry
+   to avoid infinte recursion with overridden getEntry.
+   
 2008-01-27  Dalibor Topic  <[EMAIL PROTECTED]>
 
* config/arm/netbsd1/md.c,
Index: kaffe/TODO
diff -u kaffe/TODO:1.47 kaffe/TODO:1.48
--- kaffe/TODO:1.47 Tue Jan 22 14:42:16 2008
+++ kaffe/TODO  Thu Jan 31 20:49:45 2008
@@ -13,6 +13,7 @@
* libjit could use a vmgenned interpreter, too.
 
 * Cleanup
+ * Don't use __USE_GNU use _GNU_SOURCE instead
  * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
 
Index: kaffe/kaffe/kaffevm/debug.c
diff -u kaffe/kaffe/kaffevm/debug.c:1.67 kaffe/kaffe/kaffevm/debug.c:1.68
--- kaffe/kaffe/kaffevm/debug.c:1.67Tue Nov  7 00:59:10 2006
+++ kaffe/kaffe/kaffevm/debug.c Thu Jan 31 20:49:47 2008
@@ -429,7 +429,7 @@
 {
 
int n;
-   int max;
+   size_t max;
va_list args;
ssize_t w = 0;
int rc;
@@ -441,7 +441,7 @@
 #ifdef HAVE_VSNPRINTF
max = bufferSz - bufferBegin - 1;
assert(max > 0);
-   n = vsnprintf(debugBuffer + bufferBegin, (unsigned int)max, fmt, args);
+   n = vsnprintf(debugBuffer + bufferBegin, max, fmt, args);
 
/* The return value is bytes *needed* not bytes *used* */
if (n > max)
Index: kaffe/libraries/clib/zip/ZipFile.c
diff -u kaffe/libraries/clib/zip/ZipFile.c:1.1 
kaffe/libraries/clib/zip/ZipFile.c:1.2
--- kaffe/libraries/clib/zip/ZipFile.c:1.1  Sun Jul 23 15:48:26 2006
+++ kaffe/libraries/clib/zip/ZipFile.c  Thu Jan 31 20:49:47 2008
@@ -18,17 +18,38 @@
 #include "gtypes.h"
 #include "itypes.h"
 #include "jar.h"
+#include "native.h"
+
+#include 
 
 #include "java_util_zip_ZipEntry.h"
 #include "ja

[kaffe] CVS kaffe (robilad): only declare flush_dcache on arm for jit engine

[Kaffe CVS]

PatchSet 7722 
Date: 2008/01/28 00:59:32
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
only declare flush_dcache on arm for jit engine

2008-01-27  Dalibor Topic  <[EMAIL PROTECTED]>

* config/arm/netbsd1/md.c,
config/arm/riscos/md.c (flush_dcache): Only
declare for JIT engine.

Members: 
ChangeLog:1.5223->1.5224 
config/arm/netbsd1/md.c:1.3->1.4 
config/arm/riscos/md.c:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5223 kaffe/ChangeLog:1.5224
--- kaffe/ChangeLog:1.5223  Mon Jan 28 00:57:24 2008
+++ kaffe/ChangeLog Mon Jan 28 00:59:32 2008
@@ -1,5 +1,11 @@
 2008-01-27  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * config/arm/netbsd1/md.c,
+   config/arm/riscos/md.c (flush_dcache): Only
+declare for JIT engine.
+
+2008-01-27  Dalibor Topic  <[EMAIL PROTECTED]>
+
* libltdl/.cvsignore: Removed.
 
 2008-01-25  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/config/arm/netbsd1/md.c
diff -u kaffe/config/arm/netbsd1/md.c:1.3 kaffe/config/arm/netbsd1/md.c:1.4
--- kaffe/config/arm/netbsd1/md.c:1.3   Sat Oct 16 03:16:24 1999
+++ kaffe/config/arm/netbsd1/md.c   Mon Jan 28 00:59:33 2008
@@ -12,6 +12,7 @@
 #include "config.h"
 #include 
 
+#ifdef TRANSLATOR
 #define CACHE_SIZE (32 * 1024)
 #define LINE_SIZE sizeof(int)
 #define CACHE_LINES (CACHE_SIZE / LINE_SIZE)
@@ -27,3 +28,4 @@
 }
 /* sched_yield(); */
 }
+#endif
Index: kaffe/config/arm/riscos/md.c
diff -u kaffe/config/arm/riscos/md.c:1.1 kaffe/config/arm/riscos/md.c:1.2
--- kaffe/config/arm/riscos/md.c:1.1Tue Feb 25 23:19:58 2003
+++ kaffe/config/arm/riscos/md.cMon Jan 28 00:59:34 2008
@@ -16,6 +16,7 @@
__feature_imagefs_is_file = 1;
 }
 
+#ifdef TRANSLATOR
 /* This may not be correct for all ARMs, e.g. XScale */
 #define CACHE_SIZE (32 * 1024)
 #define LINE_SIZE sizeof(int)
@@ -34,3 +35,4 @@
/* Not a call we have yet */
 /*sched_yield(); */
 }
+#endif

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed no longer needed cvsignore file

[Kaffe CVS]

PatchSet 7721 
Date: 2008/01/28 00:57:24
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed no longer needed cvsignore file

2008-01-27  Dalibor Topic  <[EMAIL PROTECTED]>

* libltdl/.cvsignore: Removed.

Members: 
ChangeLog:1.5222->1.5223 
libltdl/.cvsignore:1.4->1.5(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5222 kaffe/ChangeLog:1.5223
--- kaffe/ChangeLog:1.5222  Sun Jan 27 01:50:20 2008
+++ kaffe/ChangeLog Mon Jan 28 00:57:24 2008
@@ -1,9 +1,13 @@
-2008-01-25  Dalibor Topic  <[EMAIL PROTECTED]>
+2008-01-27  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * libltdl/.cvsignore: Removed.
+
+2008-01-25  Dalibor Topic  <[EMAIL PROTECTED]>
 
* config/arm/linux/md.c (flush_dcache): Only
declare for JIT engine.
 
-2008-01-22  Dalibor Topic  <[EMAIL PROTECTED]>
+2008-01-22  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffeh/Makefile.am (kaffeh_LDADD, AM_CPPFLAGS): 
kaffe/kaffevm/Makefile.am (libkaffe_la_CFLAGS)
===
Checking out kaffe/libltdl/.cvsignore
RCS:  /home/cvs/kaffe/kaffe/libltdl/Attic/.cvsignore,v
VERS: 1.4
***
--- kaffe/libltdl/.cvsignoreMon Jan 28 00:58:52 2008
+++ /dev/null   Sun Aug  4 19:57:58 2002
@@ -1,12 +0,0 @@
-.deps
-.libs
-Makefile
-config.h
-config.log
-config.status
-conftest*
-libtool
-*.lo
-*.la
-stamp-h*
-autom4te.cache

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): build fix for arm linux interpreter

[Kaffe CVS]

PatchSet 7720 
Date: 2008/01/27 01:50:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
build fix for arm linux interpreter

Members: 
ChangeLog:1.5221->1.5222 
config/arm/linux/md.c:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5221 kaffe/ChangeLog:1.5222
--- kaffe/ChangeLog:1.5221  Tue Jan 22 23:21:21 2008
+++ kaffe/ChangeLog Sun Jan 27 01:50:20 2008
@@ -1,3 +1,8 @@
+2008-01-25  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * config/arm/linux/md.c (flush_dcache): Only
+   declare for JIT engine.
+
 2008-01-22  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffeh/Makefile.am (kaffeh_LDADD, AM_CPPFLAGS): 
Index: kaffe/config/arm/linux/md.c
diff -u kaffe/config/arm/linux/md.c:1.8 kaffe/config/arm/linux/md.c:1.9
--- kaffe/config/arm/linux/md.c:1.8 Sun Apr 22 23:39:20 2007
+++ kaffe/config/arm/linux/md.c Sun Jan 27 01:50:22 2008
@@ -26,6 +26,7 @@
 #endif
 }
 
+#ifdef TRANSLATOR
 /**
  * Shamelessly stolen from parrot... ([perl]/parrot/jit/arm/jit_emit.h 
arm_sync_d_i_cache)
  *
@@ -41,3 +42,4 @@
: "r" ((long)start), "r" ((long)end)
: "r0","r1","r2");
 }
+#endif

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): check for zzip using pkg-config

[Kaffe CVS]

PatchSet 7719 
Date: 2008/01/22 23:21:21
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
check for zzip using pkg-config

2008-01-22  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffeh/Makefile.am (kaffeh_LDADD, AM_CPPFLAGS):
kaffe/kaffevm/Makefile.am (libkaffe_la_CFLAGS)
(libkaffe_la_LIBADD): Added ZZIP_CFLAGS and ZZIP_LIBS,
Removed ZIP_LIBS.

Members: 
ChangeLog:1.5220->1.5221 
Makefile.in:1.310->1.311 
aclocal.m4:1.142->1.143 
configure:1.636->1.637 
configure.ac:1.306->1.307 
config/Makefile.in:1.254->1.255 
config/config.h.in:1.180->1.181 
include/Makefile.in:1.318->1.319 
kaffe/Makefile.in:1.203->1.204 
kaffe/jvmpi/Makefile.in:1.129->1.130 
kaffe/kaffe/Makefile.in:1.228->1.229 
kaffe/kaffeh/Makefile.am:1.32->1.33 
kaffe/kaffeh/Makefile.in:1.210->1.211 
kaffe/kaffevm/Makefile.am:1.111->1.112 
kaffe/kaffevm/Makefile.in:1.284->1.285 
kaffe/kaffevm/boehm-gc/Makefile.in:1.94->1.95 
kaffe/kaffevm/gcj/Makefile.in:1.183->1.184 
kaffe/kaffevm/intrp/Makefile.in:1.192->1.193 
kaffe/kaffevm/jit/Makefile.in:1.202->1.203 
kaffe/kaffevm/jit3/Makefile.in:1.172->1.173 
kaffe/kaffevm/kaffe-gc/Makefile.in:1.92->1.93 
kaffe/kaffevm/systems/Makefile.in:1.192->1.193 
kaffe/kaffevm/systems/beos-native/Makefile.in:1.183->1.184 
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.47->1.48 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.189->1.190 
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.193->1.194 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.169->1.170 
kaffe/man/Makefile.in:1.190->1.191 
kaffe/scripts/Makefile.in:1.236->1.237 
kaffe/scripts/bat/Makefile.in:1.183->1.184 
kaffe/scripts/compat/Makefile.in:1.211->1.212 
kaffe/xprof/Makefile.in:1.159->1.160 
libraries/Makefile.in:1.186->1.187 
libraries/clib/Makefile.in:1.208->1.209 
libraries/clib/awt/Makefile.in:1.201->1.202 
libraries/clib/awt/X/Makefile.in:1.197->1.198 
libraries/clib/awt/nano-X/Makefile.in:1.68->1.69 
libraries/clib/awt/qt/Makefile.in:1.149->1.150 
libraries/clib/awt/xynth/Makefile.in:1.24->1.25 
libraries/clib/math/Makefile.in:1.199->1.200 
libraries/clib/zip/Makefile.in:1.204->1.205 
libraries/javalib/Makefile.in:1.599->1.600 
libraries/javalib/awt-implementations/Makefile.in:1.80->1.81 
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.103->1.104 
libraries/javalib/gmp-math/Makefile.in:1.89->1.90 
libraries/javalib/vmspecific/Makefile.in:1.32->1.33 
libraries/javalib/zlib-zip/Makefile.in:1.26->1.27 
replace/Makefile.in:1.146->1.147 
scripts/config.guess:1.28->1.29 
scripts/config.sub:1.28->1.29 
scripts/ltmain.sh:1.53->1.54 
test/Makefile.in:1.195->1.196 
test/internal/Makefile.in:1.171->1.172 
test/jni/Makefile.in:1.103->1.104 
test/regression/Makefile.in:1.274->1.275 
test/regression/compile_time/Makefile.in:1.123->1.124 
test/regression/compiler/Makefile.in:1.107->1.108 
test/regression/run_time/Makefile.in:1.122->1.123 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5220 kaffe/ChangeLog:1.5221
--- kaffe/ChangeLog:1.5220  Tue Jan 22 14:42:16 2008
+++ kaffe/ChangeLog Tue Jan 22 23:21:21 2008
@@ -1,3 +1,10 @@
+2008-01-22  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/kaffeh/Makefile.am (kaffeh_LDADD, AM_CPPFLAGS): 
+   kaffe/kaffevm/Makefile.am (libkaffe_la_CFLAGS)
+   (libkaffe_la_LIBADD): Added ZZIP_CFLAGS and ZZIP_LIBS, 
+   Removed ZIP_LIBS.
+
 2008-01-22  Dalibor Topic  <[EMAIL PROTECTED]>
 
* TODO: Updated.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.310 kaffe/Makefile.in:1.311
--- kaffe/Makefile.in:1.310 Sun Jan 20 18:10:34 2008
+++ kaffe/Makefile.in   Tue Jan 22 23:21:21 2008
@@ -209,6 +209,7 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
@@ -240,6 +241,8 @@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 ZIP_LIBS = @ZIP_LIBS@
+ZZIP_CFLAGS = @ZZIP_CFLAGS@
+ZZIP_LIBS = @ZZIP_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.142 kaffe/aclocal.m4:1.143
--- kaffe/aclocal.m4:1.142  Sun Jan 20 18:10:34 2008
+++ kaffe/aclocal.m4Tue Jan 22 23:21:21 2008
@@ -18,7 +18,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 51 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1644,6 +1644,18 @@
   dynamic_linker=

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7718 
Date: 2008/01/22 14:42:16
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

Members: 
ChangeLog:1.5219->1.5220 
TODO:1.46->1.47 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5219 kaffe/ChangeLog:1.5220
--- kaffe/ChangeLog:1.5219  Tue Jan 22 14:40:57 2008
+++ kaffe/ChangeLog Tue Jan 22 14:42:16 2008
@@ -1,3 +1,7 @@
+2008-01-22  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * TODO: Updated.
+
 2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
 
* include/jsyscall.h,
Index: kaffe/TODO
diff -u kaffe/TODO:1.46 kaffe/TODO:1.47
--- kaffe/TODO:1.46 Mon Jan 21 16:25:41 2008
+++ kaffe/TODO  Tue Jan 22 14:42:16 2008
@@ -13,7 +13,6 @@
* libjit could use a vmgenned interpreter, too.
 
 * Cleanup
- * Remove KLSEEK implementations from threading code, syscall interface and 
kaffeh
  * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed lseek from syscall interface

[Kaffe CVS]

PatchSet 7717 
Date: 2008/01/22 14:40:57
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed lseek from syscall interface

Members: 
ChangeLog:1.5218->1.5219 
include/jsyscall.h:1.33->1.34 
kaffe/kaffeh/support.c:1.57->1.58 
kaffe/kaffevm/systems/beos-native/syscalls.c:1.15->1.16 
kaffe/kaffevm/systems/drops-l4threads/syscalls.c:1.6->1.7 
kaffe/kaffevm/systems/oskit-pthreads/syscalls.c:1.15->1.16 
kaffe/kaffevm/systems/unix-jthreads/syscalls.c:1.25->1.26 
kaffe/kaffevm/systems/unix-pthreads/syscalls.c:1.43->1.44 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5218 kaffe/ChangeLog:1.5219
--- kaffe/ChangeLog:1.5218  Mon Jan 21 16:25:41 2008
+++ kaffe/ChangeLog Tue Jan 22 14:40:57 2008
@@ -1,4 +1,16 @@
-2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
+2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * include/jsyscall.h,
+   kaffe/kaffeh/support.c,
+   kaffe/kaffevm/systems/beos-native/syscalls.c,
+   kaffe/kaffevm/systems/drops-l4threads/syscalls.c,
+   kaffe/kaffevm/systems/oskit-pthreads/syscalls.c,
+   kaffe/kaffevm/systems/unix-jthreads/syscalls.c,
+   kaffe/kaffevm/systems/unix-pthreads/syscalls.c:
+   Removed lseek from syscall interface and the threading
+   implementations.
+
+2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
 
* TODO: Updated.

Index: kaffe/include/jsyscall.h
diff -u kaffe/include/jsyscall.h:1.33 kaffe/include/jsyscall.h:1.34
--- kaffe/include/jsyscall.h:1.33   Mon Jan 21 16:25:42 2008
+++ kaffe/include/jsyscall.hTue Jan 22 14:41:00 2008
@@ -55,7 +55,6 @@
 
int (*_open)(const char *, int, int, int *);
int (*_read)(int, void *, size_t, ssize_t *);
-   int (*_lseek)(int, off_t, int, off_t *);
int (*_close)(int);
int (*_fstat)(int, struct stat *);
int (*_stat)(const char *, struct stat *);
Index: kaffe/kaffe/kaffeh/support.c
diff -u kaffe/kaffe/kaffeh/support.c:1.57 kaffe/kaffe/kaffeh/support.c:1.58
--- kaffe/kaffe/kaffeh/support.c:1.57   Mon Jan 21 01:04:36 2008
+++ kaffe/kaffe/kaffeh/support.cTue Jan 22 14:41:00 2008
@@ -71,13 +71,6 @@
return (*out == -1) ? errno : 0;
 }
 
-static int
-klseek(int fd, off_t off, int whence, off_t *out)
-{
-   *out = lseek(fd, off, whence);
-   return (*out == -1) ? errno : 0;
-}
-
 /* With Tru64, stat and fstat() are silly macros, convert them to functions.  
*/
 #if defined(stat)
 static int
@@ -108,7 +101,6 @@
 {
binary_open,
 kread,
-klseek,
 close,
 kfstat,
 kstat,
Index: kaffe/kaffe/kaffevm/systems/beos-native/syscalls.c
diff -u kaffe/kaffe/kaffevm/systems/beos-native/syscalls.c:1.15 
kaffe/kaffe/kaffevm/systems/beos-native/syscalls.c:1.16
--- kaffe/kaffe/kaffevm/systems/beos-native/syscalls.c:1.15 Wed Jan  2 
20:34:02 2008
+++ kaffe/kaffe/kaffevm/systems/beos-native/syscalls.c  Tue Jan 22 14:41:00 2008
@@ -57,13 +57,6 @@
 }
 
 static int
-beos_native_lseek(int f, off_t o, int w, off_t *out)
-{
-   *out = lseek(f, o, w);
-   return (*out < 0) ? errno : 0;
-}
-
-static int
 beos_native_close(int f)
 {
return (close(f) < 0) ? errno : 0;
@@ -84,7 +77,6 @@
 SystemCallInterface Kaffe_SystemCallInterface = {
beos_native_open,
beos_native_read,
-   beos_native_lseek,
beos_native_close,
beos_native_fstat,
beos_native_stat,
Index: kaffe/kaffe/kaffevm/systems/drops-l4threads/syscalls.c
diff -u kaffe/kaffe/kaffevm/systems/drops-l4threads/syscalls.c:1.6 
kaffe/kaffe/kaffevm/systems/drops-l4threads/syscalls.c:1.7
--- kaffe/kaffe/kaffevm/systems/drops-l4threads/syscalls.c:1.6  Wed Jan  2 
20:34:02 2008
+++ kaffe/kaffe/kaffevm/systems/drops-l4threads/syscalls.c  Tue Jan 22 
14:41:01 2008
@@ -48,18 +48,6 @@
   return nReturn;
 }
 
-static int drops_lseek(int fd, off_t o, int type,
-   off_t *out) {
-  int nReturn = 0;
-
-  *out = lseek(fd, o, type);
-
-  if (*out == -1)
-nReturn = errno;
- 
-  return nReturn;
-}
-
 static int drops_close(int fd) {
   int nReturn = 0;
 
@@ -90,7 +78,6 @@
 SystemCallInterface Kaffe_SystemCallInterface = {
drops_open,
drops_read,
-   drops_lseek,
drops_close,
drops_fstat,
drops_stat,
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/syscalls.c
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/syscalls.c:1.15 
kaffe/kaffe/kaffevm/systems/oskit-pthreads/syscalls.c:1.16
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/syscalls.c:1.15  Wed Jan  2 
20:34:02 2008
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/syscalls.c   Tue Jan 22 
14:41:01 2008
@@ -54,13 +54,6 @@
 }
 
 static int
-oskit_pthread_lseek(int f, off_t o, int w, off_t *out)
-{
-   *out = lseek(f, o, w);
-   return (*out == -1) ? errno : 0;
-}
-
-static int
 oskit_pthread_close(int f)
 {
return (close(f) == -1) ? errno : 0;
@@ -81,7 +74,6 @@
 SystemC

[kaffe] CVS kaffe (robilad): removed unused KLSEEK macro

[Kaffe CVS]

PatchSet 7716 
Date: 2008/01/21 16:25:41
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed unused KLSEEK macro

2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

* include/jsyscall.h (KLSEEK): Removed unused macro.

Members: 
ChangeLog:1.5217->1.5218 
TODO:1.45->1.46 
include/jsyscall.h:1.32->1.33 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5217 kaffe/ChangeLog:1.5218
--- kaffe/ChangeLog:1.5217  Mon Jan 21 02:03:31 2008
+++ kaffe/ChangeLog Mon Jan 21 16:25:41 2008
@@ -1,3 +1,9 @@
+2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * TODO: Updated.
+   
+   * include/jsyscall.h (KLSEEK): Removed unused macro.
+
 2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffevm/findInJar.c (getManifestMainAttribute):
Index: kaffe/TODO
diff -u kaffe/TODO:1.45 kaffe/TODO:1.46
--- kaffe/TODO:1.45 Mon Jan 21 01:44:43 2008
+++ kaffe/TODO  Mon Jan 21 16:25:41 2008
@@ -13,6 +13,8 @@
* libjit could use a vmgenned interpreter, too.
 
 * Cleanup
+ * Remove KLSEEK implementations from threading code, syscall interface and 
kaffeh
+ * cleanup JNI library loading to use libltdl exclusively.
  * Remove unused instructions from jits (nop, unimplemented)
 
 * Architectural changes:
@@ -37,6 +39,8 @@
 * continue with native zip libs.
 * findInJar is a bit trickier, as it also deals with directories, regular 
classes
   etc. Maybe it can be largely rewritten in Java in the VMClassLoader? 
+  Alternatively, use zziplib's transparent file access to access class 
files,
+  directories and zip files.
 
 * Missing features
  * Implement support for extension override mechanism, and allow overriding
@@ -72,5 +76,6 @@
   * Switch to autotest for the test suites
 
 * Pending patches 
+  arm flush_dcache from Robert Schuster
   amd64 jit from Eric Anholt (guilhem)
 
Index: kaffe/include/jsyscall.h
diff -u kaffe/include/jsyscall.h:1.32 kaffe/include/jsyscall.h:1.33
--- kaffe/include/jsyscall.h:1.32   Wed Jan  2 21:50:29 2008
+++ kaffe/include/jsyscall.hMon Jan 21 16:25:42 2008
@@ -96,20 +96,6 @@
   (*Kaffe_SystemCallInterface._read)(filedescriptor, buffer, length, bytesRead)
 
 /**
- * Reposition read/write offset in a file in a 
- * platform-independant, thread-safe way.
- *
- * @param filedescriptor filedescriptor to stat
- * @param offset offset to set
- * @param whence how to set the offset
- * @param new_offset new value of read/write offset
- * 
- * @return 0 on success, or errno on failure.
- */
-#defineKLSEEK(filedescriptor, offset, whence, new_offset) \
-  (*Kaffe_SystemCallInterface._lseek)(filedescriptor, offset, whence, 
new_offset)
-
-/**
  * Close a file in a platform-independant, thread-safe way.
  *
  * @param filedescriptor filedescriptor to close

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): small compiler warning fix

[Kaffe CVS]

PatchSet 7715 
Date: 2008/01/21 02:03:31
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
small compiler warning fix

008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/findInJar.c (getManifestMainAttribute):
Fixed type of i to match return type of getUncompressedSize.

Members: 
ChangeLog:1.5216->1.5217 
kaffe/kaffevm/findInJar.c:1.77->1.78 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5216 kaffe/ChangeLog:1.5217
--- kaffe/ChangeLog:1.5216  Mon Jan 21 01:44:43 2008
+++ kaffe/ChangeLog Mon Jan 21 02:03:31 2008
@@ -1,5 +1,10 @@
 2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/kaffevm/findInJar.c (getManifestMainAttribute):
+   Fixed type of i to match return type of getUncompressedSize.
+
+2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
+
* TODO: Updated with some potential jit engine sources.
 
 2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/kaffe/kaffevm/findInJar.c
diff -u kaffe/kaffe/kaffevm/findInJar.c:1.77 
kaffe/kaffe/kaffevm/findInJar.c:1.78
--- kaffe/kaffe/kaffevm/findInJar.c:1.77Mon Jan 21 01:04:37 2008
+++ kaffe/kaffe/kaffevm/findInJar.c Mon Jan 21 02:03:32 2008
@@ -631,7 +631,7 @@
char* mfdata;
char* attrEntry;
char* ret;
-   size_t i;
+   zzip_ssize_t i;
int posAttrValue;
 
/* Locate manifest entry in jar */

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7714 
Date: 2008/01/21 01:44:43
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

Members: 
ChangeLog:1.5215->1.5216 
TODO:1.44->1.45 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5215 kaffe/ChangeLog:1.5216
--- kaffe/ChangeLog:1.5215  Mon Jan 21 01:13:04 2008
+++ kaffe/ChangeLog Mon Jan 21 01:44:43 2008
@@ -1,5 +1,9 @@
 2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * TODO: Updated with some potential jit engine sources.
+
+2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
+
* TODO: Updated.
* FAQ/FAQ.requiredlibraries: Add zziplib.
 
Index: kaffe/TODO
diff -u kaffe/TODO:1.44 kaffe/TODO:1.45
--- kaffe/TODO:1.44 Mon Jan 21 01:13:05 2008
+++ kaffe/TODO  Mon Jan 21 01:44:43 2008
@@ -5,6 +5,12 @@
Variable must be in thread local storage and not globally visible.
  * Add support for gcj-ed code with BC ABI.
  * Merge in Tom Tromey's libjit and llvm based JITs.
+  * libjit targets x86, x86_84, ARM, Alpha
+  * llvm has jit targets for X86, X86-64, PowerPC and PowerPC-64
+  * gnu lightning targets x86, PowerPC32, AMD64, Sparc32
+  * tinycc targets linux-arm, linux-x86, win32-x86 and c67
+   * We could use libjit & try to fiddle in llvm, and the rest into it as 
backends.
+   * libjit could use a vmgenned interpreter, too.
 
 * Cleanup
  * Remove unused instructions from jits (nop, unimplemented)
@@ -16,6 +22,15 @@
  * Make boehm-gc the default engine on platforms that support it
  * Use libltdl directly for JNI, remove wrappers.
  * Swich to glib for data structures, command line option parsing, etc.
+  * debug logging (alternative would be GNU nana)
+  * command line option parsing (our manual code in main.c is rather ugly)
+  * data structures (no need to have our own hashtable, lists, etc.)
+  * fixed size types (without requiring c99, allowing to simplify gtypes, etc.)
+  * atomic functions (which we're now copying and pasting from gnu libc,
+and Guilhem is no longer around to maintain them)
+  * string & utf8 utility functions (allowing us to throw away the 
implementation in kaffe)
+  * timers & counters (making the stats module leaner)
+  * and various little portability/utility functions
  * Switch to libjclassinfo for class file parsing
   * Switch to libzzlib for zip file reading first to be able to kill the 
syscall
 interface in the threading code.

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): documented zziplib requirment

[Kaffe CVS]

PatchSet 7713 
Date: 2008/01/21 01:13:04
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
documented zziplib requirment

2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.
* FAQ/FAQ.requiredlibraries: Add zziplib.

Members: 
ChangeLog:1.5214->1.5215 
TODO:1.43->1.44 
FAQ/FAQ.requiredlibraries:1.14->1.15 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5214 kaffe/ChangeLog:1.5215
--- kaffe/ChangeLog:1.5214  Mon Jan 21 01:04:28 2008
+++ kaffe/ChangeLog Mon Jan 21 01:13:04 2008
@@ -1,5 +1,10 @@
 2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * TODO: Updated.
+   * FAQ/FAQ.requiredlibraries: Add zziplib.
+
+2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/baseClasses.c (initialiseKaffe): Don't initialize
JAR file cache, it's gone.
 
Index: kaffe/TODO
diff -u kaffe/TODO:1.43 kaffe/TODO:1.44
--- kaffe/TODO:1.43 Sun Jan 20 20:03:35 2008
+++ kaffe/TODO  Mon Jan 21 01:13:05 2008
@@ -19,7 +19,7 @@
  * Switch to libjclassinfo for class file parsing
   * Switch to libzzlib for zip file reading first to be able to kill the 
syscall
 interface in the threading code.
-* start with jar.c /jar.h.
+* continue with native zip libs.
 * findInJar is a bit trickier, as it also deals with directories, regular 
classes
   etc. Maybe it can be largely rewritten in Java in the VMClassLoader? 
 
Index: kaffe/FAQ/FAQ.requiredlibraries
diff -u kaffe/FAQ/FAQ.requiredlibraries:1.14 
kaffe/FAQ/FAQ.requiredlibraries:1.15
--- kaffe/FAQ/FAQ.requiredlibraries:1.14Sat Jan 19 22:57:28 2008
+++ kaffe/FAQ/FAQ.requiredlibraries Mon Jan 21 01:13:06 2008
@@ -18,6 +18,12 @@
 distributor uses the RPM packaging format, you should check out
 http://www.rpmfind.net.
 
+zziplib
+---
+
+You'll need zziplib for Kaffe to be able to load classes from JAR files.
+It is available from http://zziplib.sourceforge.net/ .
+
 libltdl
 ---
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): reimplemented jar reading

[Kaffe CVS]

PatchSet 7712 
Date: 2008/01/21 01:04:28
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
reimplemented jar reading

2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/baseClasses.c (initialiseKaffe): Don't initialize
JAR file cache, it's gone.

* kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c:
Rewriten from scratch to use zzip library. Since zzlib
allows transprent access to files and directories as well
as zip files, it could be possible to rewrite findInJar.c
to use jar.c now, regardless of the entry type.

* configure.ac: Check for zzip library and header.

* kaffe/kaffeh/support.c (kaffeh_findClass),
kaffe/kaffevm/findInJar.c (getManifestMainAttribute)
(findClassInJar): Use zziplib types and updated jar interfaces.

* kaffe/kaffevm/classpath.h (_classpathEntry): Use ZZIP_DIR
for a jar entry.

Members: 
ChangeLog:1.5213->1.5214 
configure:1.635->1.636 
configure.ac:1.305->1.306 
config/config.h.in:1.179->1.180 
kaffe/kaffeh/support.c:1.56->1.57 
kaffe/kaffevm/baseClasses.c:1.79->1.80 
kaffe/kaffevm/classpath.h:1.3->1.4 
kaffe/kaffevm/findInJar.c:1.76->1.77 
kaffe/kaffevm/jar.c:1.44->1.45 
kaffe/kaffevm/jar.h:INITIAL->1.11 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5213 kaffe/ChangeLog:1.5214
--- kaffe/ChangeLog:1.5213  Sun Jan 20 20:03:35 2008
+++ kaffe/ChangeLog Mon Jan 21 01:04:28 2008
@@ -1,3 +1,23 @@
+2008-01-21  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/kaffevm/baseClasses.c (initialiseKaffe): Don't initialize
+   JAR file cache, it's gone.
+
+   * kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c: 
+   Rewriten from scratch to use zzip library. Since zzlib
+   allows transprent access to files and directories as well
+   as zip files, it could be possible to rewrite findInJar.c
+   to use jar.c now, regardless of the entry type.
+
+   * configure.ac: Check for zzip library and header.
+
+   * kaffe/kaffeh/support.c (kaffeh_findClass),
+   kaffe/kaffevm/findInJar.c (getManifestMainAttribute)
+   (findClassInJar): Use zziplib types and updated jar interfaces.
+
+   * kaffe/kaffevm/classpath.h (_classpathEntry): Use ZZIP_DIR
+   for a jar entry.
+
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
 
TODO: Updated.
Index: kaffe/configure
diff -u kaffe/configure:1.635 kaffe/configure:1.636
--- kaffe/configure:1.635   Sun Jan 20 19:55:36 2008
+++ kaffe/configure Mon Jan 21 01:04:29 2008
@@ -2176,6 +2176,7 @@
 ac_header_list="$ac_header_list sys/ucontext.h"
 ac_header_list="$ac_header_list unistd.h"
 ac_header_list="$ac_header_list wintypes.h"
+ac_header_list="$ac_header_list zzip/zzip.h"
 ac_header_list="$ac_header_list zlib.h"
 ac_header_list="$ac_header_list asm/sigcontext.h"
 ac_header_list="$ac_header_list asm/ppc_asm.h"
@@ -7032,7 +7033,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7035 "configure"' > conftest.$ac_ext
+  echo '#line 7036 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9592,11 +9593,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9595: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9596: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-   echo "$as_me:9599: \$? = $ac_status" >&5
+   echo "$as_me:9600: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
  # The compiler can only warn and ignore the option if not recognized
  # So say no if there are warnings other than the usual output.
@@ -9882,11 +9883,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9885: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9886: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-   echo "$as_me:9889: \$? = $ac_status" >&5
+   echo "$as_me:9890: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
  # The compiler can only warn and ignore the option if not recognized
  # So say no if there are warnings other than the usual output.
@@ -9986,11 +9987,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9989: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9990: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-   echo "$as_me:9993: \$? = $ac_status" >&5
+   echo "$as_me:9994: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
  # The compiler can only warn and ignore the option if not recogn

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7711 
Date: 2008/01/20 20:03:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

Members: 
ChangeLog:1.5212->1.5213 
TODO:1.42->1.43 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5212 kaffe/ChangeLog:1.5213
--- kaffe/ChangeLog:1.5212  Sun Jan 20 19:55:36 2008
+++ kaffe/ChangeLog Sun Jan 20 20:03:35 2008
@@ -1,5 +1,9 @@
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   TODO: Updated.
+
+2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
* configure.ac: Don't link files for kaffeh.
 
* kaffe/kaffeh/Makefile.am (kaffeh_SOURCES): Added files
Index: kaffe/TODO
diff -u kaffe/TODO:1.42 kaffe/TODO:1.43
--- kaffe/TODO:1.42 Sun Jan 20 18:55:05 2008
+++ kaffe/TODO  Sun Jan 20 20:03:35 2008
@@ -14,10 +14,14 @@
  * Make runtime engine runtime selectable
  * Make gc backend runtime selectable
  * Make boehm-gc the default engine on platforms that support it
+ * Use libltdl directly for JNI, remove wrappers.
  * Swich to glib for data structures, command line option parsing, etc.
  * Switch to libjclassinfo for class file parsing
   * Switch to libzzlib for zip file reading first to be able to kill the 
syscall
 interface in the threading code.
+* start with jar.c /jar.h.
+* findInJar is a bit trickier, as it also deals with directories, regular 
classes
+  etc. Maybe it can be largely rewritten in Java in the VMClassLoader? 
 
 * Missing features
  * Implement support for extension override mechanism, and allow overriding

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): don't link files you can add to _SOURCES

[Kaffe CVS]

PatchSet 7710 
Date: 2008/01/20 19:55:36
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
don't link files you can add to _SOURCES

2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>

* configure.ac: Don't link files for kaffeh.

* kaffe/kaffeh/Makefile.am (kaffeh_SOURCES): Added files
used from kaffevm.

Members: 
ChangeLog:1.5211->1.5212 
configure:1.634->1.635 
configure.ac:1.304->1.305 
kaffe/kaffeh/Makefile.am:1.31->1.32 
kaffe/kaffeh/Makefile.in:1.209->1.210 
kaffe/kaffevm/Makefile.in:1.283->1.284 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5211 kaffe/ChangeLog:1.5212
--- kaffe/ChangeLog:1.5211  Sun Jan 20 18:58:13 2008
+++ kaffe/ChangeLog Sun Jan 20 19:55:36 2008
@@ -1,3 +1,10 @@
+2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * configure.ac: Don't link files for kaffeh.
+
+   * kaffe/kaffeh/Makefile.am (kaffeh_SOURCES): Added files
+   used from kaffevm.
+
 2008-01-20  Robert Schuster  <[EMAIL PROTECTED]>
 
* configure.ac: Require automake 1.9 instead of 1.10.
Index: kaffe/configure
diff -u kaffe/configure:1.634 kaffe/configure:1.635
--- kaffe/configure:1.634   Sun Jan 20 18:10:34 2008
+++ kaffe/configure Sun Jan 20 19:55:36 2008
@@ -42459,19 +42459,6 @@
 ac_config_files="$ac_config_files test/jni/Makefile"
 
 
-ac_config_links="$ac_config_links 
kaffe/kaffeh/constants.c:kaffe/kaffevm/constants.c"
-
-ac_config_links="$ac_config_links kaffe/kaffeh/debug.c:kaffe/kaffevm/debug.c"
-
-ac_config_links="$ac_config_links kaffe/kaffeh/file.c:kaffe/kaffevm/file.c"
-
-ac_config_links="$ac_config_links kaffe/kaffeh/jar.c:kaffe/kaffevm/jar.c"
-
-ac_config_links="$ac_config_links 
kaffe/kaffeh/readClass.c:kaffe/kaffevm/readClass.c"
-
-ac_config_links="$ac_config_links 
kaffe/kaffeh/utf8const.c:kaffe/kaffevm/utf8const.c"
-
-
 if test x"$with_engine" != x"intrp" ; then
   ac_config_links="$ac_config_links config/jit-md.h:$CONFIG_JIT_MD_H"
 
@@ -43326,12 +43313,6 @@
 "test/regression/compiler/Makefile") CONFIG_FILES="$CONFIG_FILES 
test/regression/compiler/Makefile" ;;
 "test/regression/run_time/Makefile") CONFIG_FILES="$CONFIG_FILES 
test/regression/run_time/Makefile" ;;
 "test/jni/Makefile") CONFIG_FILES="$CONFIG_FILES test/jni/Makefile" ;;
-"kaffe/kaffeh/constants.c") CONFIG_LINKS="$CONFIG_LINKS 
kaffe/kaffeh/constants.c:kaffe/kaffevm/constants.c" ;;
-"kaffe/kaffeh/debug.c") CONFIG_LINKS="$CONFIG_LINKS 
kaffe/kaffeh/debug.c:kaffe/kaffevm/debug.c" ;;
-"kaffe/kaffeh/file.c") CONFIG_LINKS="$CONFIG_LINKS 
kaffe/kaffeh/file.c:kaffe/kaffevm/file.c" ;;
-"kaffe/kaffeh/jar.c") CONFIG_LINKS="$CONFIG_LINKS 
kaffe/kaffeh/jar.c:kaffe/kaffevm/jar.c" ;;
-"kaffe/kaffeh/readClass.c") CONFIG_LINKS="$CONFIG_LINKS 
kaffe/kaffeh/readClass.c:kaffe/kaffevm/readClass.c" ;;
-"kaffe/kaffeh/utf8const.c") CONFIG_LINKS="$CONFIG_LINKS 
kaffe/kaffeh/utf8const.c:kaffe/kaffevm/utf8const.c" ;;
 "config/jit-md.h") CONFIG_LINKS="$CONFIG_LINKS 
config/jit-md.h:$CONFIG_JIT_MD_H" ;;
 "config/callKaffeException.h") CONFIG_LINKS="$CONFIG_LINKS 
config/callKaffeException.h:$CONFIG_CALLKAFFEEXCEPTION_H" ;;
 "kaffe/kaffevm/$with_engine/icode.h") CONFIG_LINKS="$CONFIG_LINKS 
kaffe/kaffevm/$with_engine/icode.h:$KAFFEVM_ICODE_H" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.304 kaffe/configure.ac:1.305
--- kaffe/configure.ac:1.304Sun Jan 20 18:58:14 2008
+++ kaffe/configure.ac  Sun Jan 20 19:55:38 2008
@@ -1885,13 +1885,6 @@
 AC_CONFIG_FILES([test/regression/run_time/Makefile])
 AC_CONFIG_FILES([test/jni/Makefile])
 
-AC_CONFIG_LINKS([kaffe/kaffeh/constants.c:kaffe/kaffevm/constants.c])
-AC_CONFIG_LINKS([kaffe/kaffeh/debug.c:kaffe/kaffevm/debug.c])
-AC_CONFIG_LINKS([kaffe/kaffeh/file.c:kaffe/kaffevm/file.c])
-AC_CONFIG_LINKS([kaffe/kaffeh/jar.c:kaffe/kaffevm/jar.c])
-AC_CONFIG_LINKS([kaffe/kaffeh/readClass.c:kaffe/kaffevm/readClass.c])
-AC_CONFIG_LINKS([kaffe/kaffeh/utf8const.c:kaffe/kaffevm/utf8const.c])
-
 if test x"$with_engine" != x"intrp" ; then
   AC_CONFIG_LINKS([config/jit-md.h:$CONFIG_JIT_MD_H])
   AC_CONFIG_LINKS([config/callKaffeException.h:$CONFIG_CALLKAFFEEXCEPTION_H])
Index: kaffe/kaffe/kaffeh/Makefile.am
diff -u kaffe/kaffe/kaffeh/Makefile.am:1.31 kaffe/kaffe/kaffeh/Makefile.am:1.32
--- kaffe/kaffe/kaffeh/Makefile.am:1.31 Sun Jan  6 19:41:27 2008
+++ kaffe/kaffe/kaffeh/Makefile.am  Sun Jan 20 19:55:40 2008
@@ -34,12 +34,11 @@
kaffeh-support.h \
java_lang_ClassLoader.h \
java_lang_Object.h \
-   java_lang_String.h
+   java_lang_String.h \
+   $(top_srcdir)/kaffe/kaffevm/constants.c \
+   $(top_srcdir)/kaffe/kaffevm/debug.c \
+   $(top_srcdir)/kaffe/kaffevm/file.c \
+   $(top_srcdir)/kaffe/kaffevm/jar.c \
+   $(top_srcdir)/kaffe/kaffevm/readClass.c \
+   $(top_srcdir)/kaffe/kaffevm/utf8const.c 
 
-nodist_kaffeh_SOURCES = \
-   constants.c \
-   debug.c \
-   file.c \
-   jar.c \
-   readClass.c \
-   utf8const.

[kaffe] CVS kaffe (robilad): lower automake requirement for OE

[Kaffe CVS]

PatchSet 7709 
Date: 2008/01/20 18:58:13
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
lower automake requirement for OE

2008-01-20  Robert Schuster  <[EMAIL PROTECTED]>

* configure.ac: Require automake 1.9 instead of 1.10.

Members: 
ChangeLog:1.5210->1.5211 
configure.ac:1.303->1.304 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5210 kaffe/ChangeLog:1.5211
--- kaffe/ChangeLog:1.5210  Sun Jan 20 18:55:05 2008
+++ kaffe/ChangeLog Sun Jan 20 18:58:13 2008
@@ -1,3 +1,7 @@
+2008-01-20  Robert Schuster  <[EMAIL PROTECTED]>
+
+   * configure.ac: Require automake 1.9 instead of 1.10.
+
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
 
TODO: Updated.
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.303 kaffe/configure.ac:1.304
--- kaffe/configure.ac:1.303Sun Jan 20 18:50:30 2008
+++ kaffe/configure.ac  Sun Jan 20 18:58:14 2008
@@ -33,7 +33,7 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-AM_INIT_AUTOMAKE([1.10 dist-bzip2 dist-zip tar-ustar])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 dist-zip tar-ustar])
 
 AC_PREFIX_DEFAULT(/usr/local/kaffe)
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7708 
Date: 2008/01/20 18:55:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

Members: 
ChangeLog:1.5209->1.5210 
TODO:1.41->1.42 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5209 kaffe/ChangeLog:1.5210
--- kaffe/ChangeLog:1.5209  Sun Jan 20 18:50:29 2008
+++ kaffe/ChangeLog Sun Jan 20 18:55:05 2008
@@ -1,5 +1,9 @@
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   TODO: Updated.
+
+2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
* configure.ac: Autoupdated. Now requires autoconf 2.61.
 
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/TODO
diff -u kaffe/TODO:1.41 kaffe/TODO:1.42
--- kaffe/TODO:1.41 Sun Jan 20 17:38:14 2008
+++ kaffe/TODO  Sun Jan 20 18:55:05 2008
@@ -7,7 +7,6 @@
  * Merge in Tom Tromey's libjit and llvm based JITs.
 
 * Cleanup
- * Turn developers/autogen.sh into an autoreconf call
  * Remove unused instructions from jits (nop, unimplemented)
 
 * Architectural changes:

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): autoupdated configure.ac

[Kaffe CVS]

PatchSet 7707 
Date: 2008/01/20 18:50:29
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
autoupdated configure.ac

2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>

* configure.ac: Autoupdated. Now requires autoconf 2.61.

Members: 
ChangeLog:1.5208->1.5209 
configure.ac:1.302->1.303 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5208 kaffe/ChangeLog:1.5209
--- kaffe/ChangeLog:1.5208  Sun Jan 20 18:15:29 2008
+++ kaffe/ChangeLog Sun Jan 20 18:50:29 2008
@@ -1,5 +1,9 @@
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * configure.ac: Autoupdated. Now requires autoconf 2.61.
+
+2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
* developers/autogen.sh: Removed version checking logic.
We should simply set the minimum versions necessary in configure.ac.
 
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.302 kaffe/configure.ac:1.303
--- kaffe/configure.ac:1.302Sat Jan 19 22:45:21 2008
+++ kaffe/configure.ac  Sun Jan 20 18:50:30 2008
@@ -1,6 +1,6 @@
 AC_INIT([Kaffe Virtual Machine],[1.1.9-pre],[EMAIL PROTECTED],[kaffe])
 
-AC_PREREQ(2.59)
+AC_PREREQ(2.61)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([scripts])

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed version checking logic from autogen.sh

[Kaffe CVS]

PatchSet 7706 
Date: 2008/01/20 18:15:29
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed version checking logic from autogen.sh

2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>

* developers/autogen.sh: Removed version checking logic.
We should simply set the minimum versions necessary in configure.ac.

Members: 
ChangeLog:1.5207->1.5208 
developers/autogen.sh:1.81->1.82 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5207 kaffe/ChangeLog:1.5208
--- kaffe/ChangeLog:1.5207  Sun Jan 20 18:10:34 2008
+++ kaffe/ChangeLog Sun Jan 20 18:15:29 2008
@@ -1,5 +1,10 @@
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * developers/autogen.sh: Removed version checking logic.
+   We should simply set the minimum versions necessary in configure.ac.
+
+2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
* m4/libtool.m4: Removed.
 
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/developers/autogen.sh
diff -u kaffe/developers/autogen.sh:1.81 kaffe/developers/autogen.sh:1.82
--- kaffe/developers/autogen.sh:1.81Sun Jan 20 17:55:36 2008
+++ kaffe/developers/autogen.sh Sun Jan 20 18:15:31 2008
@@ -1,94 +1,5 @@
 #! /bin/sh
 
-set -e
-
-# This script runs all of the various auto* programs in the correct order.
-# You should run this from the top-level directory.
-# Written by Mo DeJong.
-
-export LC_ALL=C
-
-# Check for versions of various tools to use when regenerating 
-# Makefiles and configure scripts - if you want to use different
-# versions, use --override.  The purpose of these checks is to just
-# make sure that people are using consistent versions of tools
-# when checking into CVS so we have predictable regression.
-
-if [ "$1" != "--override" ]; then
-
-WANTED_AUTOMAKE_VERS="1.10"
-WANTED_AUTOCONF_VERS="2.61"
-WANTED_LIBTOOL_VERS="1.5.24"
-WANTED_AUTOPOINT_VERS="0.16.1"
-
-ACLOCAL_VERS=`aclocal --version | 
-   sed -n 's,^aclocal (GNU automake) \(.*\)$,\1,p'`
-if [ "$ACLOCAL_VERS" != "$WANTED_AUTOMAKE_VERS" ]; then
-   echo "Missing or wrong version for aclocal (from automake)."
-   echo "We want automake $WANTED_AUTOMAKE_VERS"
-   if [ -n "$ACLOCAL_VERS" ]; then
-   echo "We found aclocal from automake $ACLOCAL_VERS"
-   fi
-   exit 1
-fi
- 
-AUTOHEADER_VERS=`autoheader --version | 
-   sed -n 's,^autoheader (GNU Autoconf) \(.*\)$,\1,p'`
-if [ "$AUTOHEADER_VERS" != "$WANTED_AUTOCONF_VERS" ]; then
-   echo "Missing or wrong version for autoheader (from autoconf)."
-   echo "We want autoconf $WANTED_AUTOCONF_VERS"
-   if [ -n "$AUTOHEADER_VERS" ]; then
-   echo "We found autoheader from autoconf $AUTOHEADER_VERS"
-   fi
-   exit 1
-fi
-
-AUTOMAKE_VERS=`automake --version | 
-   sed -n 's,^automake (GNU automake) \(.*\)$,\1,p'`
-if [ "$AUTOMAKE_VERS" != "$WANTED_AUTOMAKE_VERS" ]; then
-   echo "Missing or wrong version for automake."
-   echo "We want automake $WANTED_AUTOMAKE_VERS"
-   if [ -n "$AUTOMAKE_VERS" ]; then
-   echo "We found automake $AUTOMAKE_VERS"
-   fi
-   exit 1
-fi
-
-AUTOCONF_VERS=`autoconf --version | 
-   sed -n 's,^autoconf (GNU Autoconf) \(.*\)$,\1,p'`
-if [ "$AUTOCONF_VERS" != "$WANTED_AUTOCONF_VERS" ]; then
-   echo "Missing or wrong version for autoconf."
-   echo "We want autoconf $WANTED_AUTOCONF_VERS"
-   if [ -n "$AUTOCONF_VERS" ]; then
-   echo "We found autoconf $AUTOCONF_VERS"
-   fi
-   exit 1
-fi
-
-LIBTOOLIZE_VERS=`libtoolize --version | 
-   sed -n 's,^libtoolize (GNU libtool) \(.*\)$,\1,p'`
-if [ "$LIBTOOLIZE_VERS" != "$WANTED_LIBTOOL_VERS" ]; then
-   echo "Missing or wrong version for libtoolize (from libtool)."
-   echo "We want libtool $WANTED_LIBTOOL_VERS"
-   if [ -n "$LIBTOOLIZE_VERS" ]; then
-   echo "We found libtoolize from libtool $LIBTOOLIZE_VERS"
-   fi
-   exit 1
-fi
-
-AUTOPOINT_VERS=`gettext --version |
-sed -n 's,^gettext (GNU gettext-runtime) \(.*\)$,\1,p'`
-if [ "$AUTOPOINT_VERS" != "$WANTED_AUTOPOINT_VERS" ]; then
-echo "Missing or wrong version for autopoint (from gettext)."
-echo "We want autopoint $WANTED_AUTOPOINT_VERS"
-if [ -n "$AUTOPOINT_VERS" ]; then
-echo "We found autopoint from gettext $AUTOPOINT_VERS"
-fi
-exit 1
-fi
-
-fi
-
 autoreconf -f -i # -Wall
 
 # drops specific patches

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed m4/libtool.m4

[Kaffe CVS]

PatchSet 7705 
Date: 2008/01/20 18:10:34
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed m4/libtool.m4

2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>

* m4/libtool.m4: Removed.

Members: 
ChangeLog:1.5206->1.5207 
Makefile.in:1.309->1.310 
aclocal.m4:1.141->1.142 
configure:1.633->1.634 
config/Makefile.in:1.253->1.254 
include/Makefile.in:1.317->1.318 
kaffe/Makefile.in:1.202->1.203 
kaffe/jvmpi/Makefile.in:1.128->1.129 
kaffe/kaffe/Makefile.in:1.227->1.228 
kaffe/kaffeh/Makefile.in:1.208->1.209 
kaffe/kaffevm/Makefile.in:1.282->1.283 
kaffe/kaffevm/boehm-gc/Makefile.in:1.93->1.94 
kaffe/kaffevm/gcj/Makefile.in:1.182->1.183 
kaffe/kaffevm/intrp/Makefile.in:1.191->1.192 
kaffe/kaffevm/jit/Makefile.in:1.201->1.202 
kaffe/kaffevm/jit3/Makefile.in:1.171->1.172 
kaffe/kaffevm/kaffe-gc/Makefile.in:1.91->1.92 
kaffe/kaffevm/systems/Makefile.in:1.191->1.192 
kaffe/kaffevm/systems/beos-native/Makefile.in:1.182->1.183 
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.46->1.47 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.188->1.189 
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.192->1.193 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.168->1.169 
kaffe/man/Makefile.in:1.189->1.190 
kaffe/scripts/Makefile.in:1.235->1.236 
kaffe/scripts/bat/Makefile.in:1.182->1.183 
kaffe/scripts/compat/Makefile.in:1.210->1.211 
kaffe/xprof/Makefile.in:1.158->1.159 
libraries/Makefile.in:1.185->1.186 
libraries/clib/Makefile.in:1.207->1.208 
libraries/clib/awt/Makefile.in:1.200->1.201 
libraries/clib/awt/X/Makefile.in:1.196->1.197 
libraries/clib/awt/nano-X/Makefile.in:1.67->1.68 
libraries/clib/awt/qt/Makefile.in:1.148->1.149 
libraries/clib/awt/xynth/Makefile.in:1.23->1.24 
libraries/clib/math/Makefile.in:1.198->1.199 
libraries/clib/zip/Makefile.in:1.203->1.204 
libraries/javalib/Makefile.in:1.598->1.599 
libraries/javalib/awt-implementations/Makefile.in:1.79->1.80 
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.102->1.103 
libraries/javalib/gmp-math/Makefile.in:1.88->1.89 
libraries/javalib/vmspecific/Makefile.in:1.31->1.32 
libraries/javalib/zlib-zip/Makefile.in:1.25->1.26 
m4/libtool.m4:1.30->1.31(DEAD) 
replace/Makefile.in:1.145->1.146 
test/Makefile.in:1.194->1.195 
test/internal/Makefile.in:1.170->1.171 
test/jni/Makefile.in:1.102->1.103 
test/regression/Makefile.in:1.273->1.274 
test/regression/compile_time/Makefile.in:1.122->1.123 
test/regression/compiler/Makefile.in:1.106->1.107 
test/regression/run_time/Makefile.in:1.121->1.122 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5206 kaffe/ChangeLog:1.5207
--- kaffe/ChangeLog:1.5206  Sun Jan 20 17:55:34 2008
+++ kaffe/ChangeLog Sun Jan 20 18:10:34 2008
@@ -1,5 +1,9 @@
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * m4/libtool.m4: Removed.
+
+2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
* developers/autogen.sh: Replaced the complicated 
invocations of autotools with a single autoreconf call.
 
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.309 kaffe/Makefile.in:1.310
--- kaffe/Makefile.in:1.309 Sat Jan 19 22:53:06 2008
+++ kaffe/Makefile.in   Sun Jan 20 18:10:34 2008
@@ -67,9 +67,9 @@
$(top_srcdir)/m4/gwqt.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-   $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/nls.m4 \
-   $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-   $(top_srcdir)/m4/semaphore.m4 $(top_srcdir)/m4/size_max.m4 \
+   $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+   $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/semaphore.m4 \
+   $(top_srcdir)/m4/size_max.m4 \
$(top_srcdir)/m4/solarispthread.m4 $(top_srcdir)/m4/valist.m4 \
$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.141 kaffe/aclocal.m4:1.142
--- kaffe/aclocal.m4:1.141  Sun Jan  6 19:05:14 2008
+++ kaffe/aclocal.m4Sun Jan 20 18:10:34 2008
@@ -16,6 +16,6990 @@
 You have another version of autoconf.  If you want to use that,
 you should regenerate the build system entirely.], [63])])
 
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 51 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# ---
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+ [],
+

[kaffe] CVS kaffe (robilad): cleaned up autogen.sh

[Kaffe CVS]

PatchSet 7704 
Date: 2008/01/20 17:55:34
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cleaned up autogen.sh

2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>

* developers/autogen.sh: Replaced the complicated
invocations of autotools with a single autoreconf call.

Members: 
ChangeLog:1.5205->1.5206 
developers/autogen.sh:1.80->1.81 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5205 kaffe/ChangeLog:1.5206
--- kaffe/ChangeLog:1.5205  Sun Jan 20 17:38:14 2008
+++ kaffe/ChangeLog Sun Jan 20 17:55:34 2008
@@ -1,5 +1,10 @@
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * developers/autogen.sh: Replaced the complicated 
+   invocations of autotools with a single autoreconf call.
+
+2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
TODO: Updated.
 
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
Index: kaffe/developers/autogen.sh
diff -u kaffe/developers/autogen.sh:1.80 kaffe/developers/autogen.sh:1.81
--- kaffe/developers/autogen.sh:1.80Sat Jan 19 22:45:23 2008
+++ kaffe/developers/autogen.sh Sun Jan 20 17:55:36 2008
@@ -89,29 +89,7 @@
 
 fi
 
-# Delete old files to make sure we regenerate things
-# automake things
-rm -f depcomp missing config.guess config.sub install-sh
-# libtool things
-rm -f aclocal.m4 ltmain.sh libtool.m4 ltconfig
-
-# autoconf things
-rm -f aclocal.m4 configure
-rm -f config/config.h.in
-find . -type f -name 'Makefile.in' | xargs rm -f
-
-# Now regenerate autotools
-libtoolize --automake --copy --force
-
-# gettextize kaffe
-# commented out due to bugs in gettextize
-##gettextize -c -f --intl
-
-autopoint -f
-aclocal -I m4
-autoheader # -Wall
-automake --add-missing --force-missing --copy # -Wall || true  # ignore 
warnings
-autoconf # -Wall
+autoreconf -f -i # -Wall
 
 # drops specific patches
 (

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7703 
Date: 2008/01/20 17:38:14
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

Members: 
ChangeLog:1.5204->1.5205 
TODO:1.40->1.41 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5204 kaffe/ChangeLog:1.5205
--- kaffe/ChangeLog:1.5204  Sun Jan 20 17:33:21 2008
+++ kaffe/ChangeLog Sun Jan 20 17:38:14 2008
@@ -1,5 +1,9 @@
 2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   TODO: Updated.
+
+2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/xprof/Makefile.am (AM_CPPFLAGS),
* kaffe/jvmpi/Makefile.am (AM_CPPFLAGS), 
* kaffe/kaffevm/Makefile.am (AM_CPPFLAGS), 
Index: kaffe/TODO
diff -u kaffe/TODO:1.40 kaffe/TODO:1.41
--- kaffe/TODO:1.40 Sat Jan 19 23:01:54 2008
+++ kaffe/TODO  Sun Jan 20 17:38:14 2008
@@ -8,7 +8,6 @@
 
 * Cleanup
  * Turn developers/autogen.sh into an autoreconf call
- * Remove libltdl from C(PP)FLAGS in all Makefile.ams.
  * Remove unused instructions from jits (nop, unimplemented)
 
 * Architectural changes:

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed libltdl from include path

[Kaffe CVS]

PatchSet 7702 
Date: 2008/01/20 17:33:21
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed libltdl from include path

2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/xprof/Makefile.am (AM_CPPFLAGS),
* kaffe/jvmpi/Makefile.am (AM_CPPFLAGS),
* kaffe/kaffevm/Makefile.am (AM_CPPFLAGS),
* test/jni/Makefile.am (AM_CPPFLAGS),
* kaffe/kaffe/Makefile.am (AM_CPPFLAGS):
Removed libltdl from include path.

Members: 
ChangeLog:1.5203->1.5204 
kaffe/jvmpi/Makefile.am:1.13->1.14 
kaffe/jvmpi/Makefile.in:1.127->1.128 
kaffe/kaffe/Makefile.am:1.39->1.40 
kaffe/kaffe/Makefile.in:1.226->1.227 
kaffe/kaffevm/Makefile.am:1.110->1.111 
kaffe/kaffevm/Makefile.in:1.281->1.282 
kaffe/xprof/Makefile.am:1.16->1.17 
kaffe/xprof/Makefile.in:1.157->1.158 
test/jni/Makefile.am:1.22->1.23 
test/jni/Makefile.in:1.101->1.102 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5203 kaffe/ChangeLog:1.5204
--- kaffe/ChangeLog:1.5203  Sat Jan 19 23:01:54 2008
+++ kaffe/ChangeLog Sun Jan 20 17:33:21 2008
@@ -1,3 +1,12 @@
+2008-01-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/xprof/Makefile.am (AM_CPPFLAGS),
+   * kaffe/jvmpi/Makefile.am (AM_CPPFLAGS), 
+   * kaffe/kaffevm/Makefile.am (AM_CPPFLAGS), 
+   * test/jni/Makefile.am (AM_CPPFLAGS),
+   * kaffe/kaffe/Makefile.am (AM_CPPFLAGS): 
+   Removed libltdl from include path.
+   
 2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
 
* TODO: Updated.
Index: kaffe/kaffe/jvmpi/Makefile.am
diff -u kaffe/kaffe/jvmpi/Makefile.am:1.13 kaffe/kaffe/jvmpi/Makefile.am:1.14
--- kaffe/kaffe/jvmpi/Makefile.am:1.13  Sat Jan 19 22:45:25 2008
+++ kaffe/kaffe/jvmpi/Makefile.am   Sun Jan 20 17:33:23 2008
@@ -3,7 +3,6 @@
 AM_CPPFLAGS = \
-I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \
$(ENGINE_INCLUDES) \
-   -I$(top_srcdir)/libltdl \
$(ENGINE_DEFS) \
-I$(top_srcdir)/kaffe/kaffevm \
-I$(top_builddir)/include \
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.127 kaffe/kaffe/jvmpi/Makefile.in:1.128
--- kaffe/kaffe/jvmpi/Makefile.in:1.127 Sat Jan 19 22:45:25 2008
+++ kaffe/kaffe/jvmpi/Makefile.in   Sun Jan 20 17:33:24 2008
@@ -294,7 +294,6 @@
 AM_CPPFLAGS = \
-I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \
$(ENGINE_INCLUDES) \
-   -I$(top_srcdir)/libltdl \
$(ENGINE_DEFS) \
-I$(top_srcdir)/kaffe/kaffevm \
-I$(top_builddir)/include \
Index: kaffe/kaffe/kaffe/Makefile.am
diff -u kaffe/kaffe/kaffe/Makefile.am:1.39 kaffe/kaffe/kaffe/Makefile.am:1.40
--- kaffe/kaffe/kaffe/Makefile.am:1.39  Mon Jul  2 02:58:28 2007
+++ kaffe/kaffe/kaffe/Makefile.am   Sun Jan 20 17:33:24 2008
@@ -37,7 +37,6 @@
 AM_CPPFLAGS = \
-I../kaffevm \
-I$(srcdir)/../kaffevm \
-   -I$(top_srcdir)/libltdl \
-I$(top_srcdir)/kaffe/jvmpi \
-I$(top_srcdir)/kaffe/xprof \
-I$(top_srcdir)/kaffe/kaffevm/jni \
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.226 kaffe/kaffe/kaffe/Makefile.in:1.227
--- kaffe/kaffe/kaffe/Makefile.in:1.226 Sat Jan 19 22:45:25 2008
+++ kaffe/kaffe/kaffe/Makefile.in   Sun Jan 20 17:33:24 2008
@@ -303,7 +303,6 @@
 AM_CPPFLAGS = \
-I../kaffevm \
-I$(srcdir)/../kaffevm \
-   -I$(top_srcdir)/libltdl \
-I$(top_srcdir)/kaffe/jvmpi \
-I$(top_srcdir)/kaffe/xprof \
-I$(top_srcdir)/kaffe/kaffevm/jni \
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.110 
kaffe/kaffe/kaffevm/Makefile.am:1.111
--- kaffe/kaffe/kaffevm/Makefile.am:1.110   Sat Jan 19 22:45:26 2008
+++ kaffe/kaffe/kaffevm/Makefile.am Sun Jan 20 17:33:25 2008
@@ -24,7 +24,6 @@
-I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \
-I$(top_srcdir)/kaffe/kaffevm/jni \
$(ENGINE_INCLUDES) \
-   -I$(top_srcdir)/libltdl \
$(ENGINE_DEFS) \
-I$(top_srcdir)/kaffe/jvmpi \
-I$(top_srcdir)/kaffe/xprof \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.281 
kaffe/kaffe/kaffevm/Makefile.in:1.282
--- kaffe/kaffe/kaffevm/Makefile.in:1.281   Sat Jan 19 22:45:26 2008
+++ kaffe/kaffe/kaffevm/Makefile.in Sun Jan 20 17:33:25 2008
@@ -371,7 +371,6 @@
-I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \
-I$(top_srcdir)/kaffe/kaffevm/jni \
$(ENGINE_INCLUDES) \
-   -I$(top_srcdir)/libltdl \
$(ENGINE_DEFS) \
-I$(top_srcdir)/kaffe/jvmpi \
-I$(top_srcdir)/kaffe/xprof \
Index: kaffe/kaffe/xprof/Makefile.am
diff -u kaffe/kaffe/xprof/Makefile.am:1.16 kaffe/kaffe/xprof/Makefile.am:1.17
--- kaffe/kaffe/xprof/Makefile.am:1.16  Sat Jan 19 22:45:35 2008
+++ kaffe/kaffe/xprof/Makefile.am   Sun Jan 20 17:33:26 2008
@@ -17,7 +17,6 @@
 AM_CPPFLAGS = \
-I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \
$(ENGINE_IN

[kaffe] CVS kaffe (robilad): updated TODO list

[Kaffe CVS]

PatchSet 7701 
Date: 2008/01/19 23:01:54
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO list

2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

Members: 
ChangeLog:1.5202->1.5203 
TODO:1.39->1.40 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5202 kaffe/ChangeLog:1.5203
--- kaffe/ChangeLog:1.5202  Sat Jan 19 22:57:25 2008
+++ kaffe/ChangeLog Sat Jan 19 23:01:54 2008
@@ -1,5 +1,9 @@
 2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * TODO: Updated.
+
+2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
+
* WHATSNEW: Document purge of libltdl.
* FAQ/FAQ.required-libraries: Add information on libltdl.
 
Index: kaffe/TODO
diff -u kaffe/TODO:1.39 kaffe/TODO:1.40
--- kaffe/TODO:1.39 Sat Jan 19 15:16:53 2008
+++ kaffe/TODO  Sat Jan 19 23:01:54 2008
@@ -5,6 +5,10 @@
Variable must be in thread local storage and not globally visible.
  * Add support for gcj-ed code with BC ABI.
  * Merge in Tom Tromey's libjit and llvm based JITs.
+
+* Cleanup
+ * Turn developers/autogen.sh into an autoreconf call
+ * Remove libltdl from C(PP)FLAGS in all Makefile.ams.
  * Remove unused instructions from jits (nop, unimplemented)
 
 * Architectural changes:
@@ -14,6 +18,8 @@
  * Make boehm-gc the default engine on platforms that support it
  * Swich to glib for data structures, command line option parsing, etc.
  * Switch to libjclassinfo for class file parsing
+  * Switch to libzzlib for zip file reading first to be able to kill the 
syscall
+interface in the threading code.
 
 * Missing features
  * Implement support for extension override mechanism, and allow overriding

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): documented libltdl purge

[Kaffe CVS]

PatchSet 7700 
Date: 2008/01/19 22:57:25
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
documented libltdl purge

2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>

* WHATSNEW: Document purge of libltdl.
* FAQ/FAQ.required-libraries: Add information on libltdl.

Members: 
ChangeLog:1.5201->1.5202 
WHATSNEW:1.73->1.74 
FAQ/FAQ.requiredlibraries:1.13->1.14 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5201 kaffe/ChangeLog:1.5202
--- kaffe/ChangeLog:1.5201  Sat Jan 19 22:53:06 2008
+++ kaffe/ChangeLog Sat Jan 19 22:57:25 2008
@@ -1,5 +1,10 @@
 2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * WHATSNEW: Document purge of libltdl.
+   * FAQ/FAQ.required-libraries: Add information on libltdl.
+
+2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
+
* developers/config2.patch: Removed.
 
* Makefile.am (EXTRA_DIST): Removed developers/config2.patch.
Index: kaffe/WHATSNEW
diff -u kaffe/WHATSNEW:1.73 kaffe/WHATSNEW:1.74
--- kaffe/WHATSNEW:1.73 Sun Jan  6 19:07:07 2008
+++ kaffe/WHATSNEW  Sat Jan 19 22:57:25 2008
@@ -1,6 +1,8 @@
 What's New Since Kaffe 1.1.8
 
 
+* Removed libltdl. Kaffe uses an existing installation 
+  exclusively now.
 * Removed gnu-inet, dnsjava, Tritonus and binreloc.
 * Removed GNU Classpath tools. Kaffe uses an installed javap
   as javap when it's available.
Index: kaffe/FAQ/FAQ.requiredlibraries
diff -u kaffe/FAQ/FAQ.requiredlibraries:1.13 
kaffe/FAQ/FAQ.requiredlibraries:1.14
--- kaffe/FAQ/FAQ.requiredlibraries:1.13Tue Jan  1 22:28:31 2008
+++ kaffe/FAQ/FAQ.requiredlibraries Sat Jan 19 22:57:28 2008
@@ -18,6 +18,13 @@
 distributor uses the RPM packaging format, you should check out
 http://www.rpmfind.net.
 
+libltdl
+---
+
+You'll need GNU libtool's libltdl library for Kaffe to be able to
+dynamically open JNI libraries. It is available from 
+http://www.gnu.org/software/libtool/ .
+
 GNU Classpath
 -
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed no longer needed config.sub patch

[Kaffe CVS]

PatchSet 7699 
Date: 2008/01/19 22:53:06
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed no longer needed config.sub patch

2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>

* developers/config2.patch: Removed.

* Makefile.am (EXTRA_DIST): Removed developers/config2.patch.

Members: 
ChangeLog:1.5200->1.5201 
Makefile.am:1.149->1.150 
Makefile.in:1.308->1.309 
developers/config2.patch:1.1->1.2(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5200 kaffe/ChangeLog:1.5201
--- kaffe/ChangeLog:1.5200  Sat Jan 19 22:45:20 2008
+++ kaffe/ChangeLog Sat Jan 19 22:53:06 2008
@@ -1,5 +1,11 @@
 2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * developers/config2.patch: Removed.
+
+   * Makefile.am (EXTRA_DIST): Removed developers/config2.patch.
+
+2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
+
* developers/autogen.sh: Don't libtoolize with --ltdl. Removed 
workarounds
and patches for libltdl.
 
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.149 kaffe/Makefile.am:1.150
--- kaffe/Makefile.am:1.149 Sat Jan 19 22:45:20 2008
+++ kaffe/Makefile.am   Sat Jan 19 22:53:06 2008
@@ -117,7 +117,6 @@
developers/auto-build.conf \
developers/autogen.sh \
developers/config1.patch \
-   developers/config2.patch \
developers/gdbinit \
developers/geteh_from_libgcc2 \
developers/glibc-2.1.1-signal.patch \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.308 kaffe/Makefile.in:1.309
--- kaffe/Makefile.in:1.308 Sat Jan 19 22:45:20 2008
+++ kaffe/Makefile.in   Sat Jan 19 22:53:06 2008
@@ -408,7 +408,6 @@
developers/auto-build.conf \
developers/autogen.sh \
developers/config1.patch \
-   developers/config2.patch \
developers/gdbinit \
developers/geteh_from_libgcc2 \
developers/glibc-2.1.1-signal.patch \
===
Checking out kaffe/developers/config2.patch
RCS:  /home/cvs/kaffe/kaffe/developers/Attic/config2.patch,v
VERS: 1.1
***
--- kaffe/developers/config2.patch  Sat Jan 19 22:54:50 2008
+++ /dev/null   Sun Aug  4 19:57:58 2002
@@ -1,17 +0,0 @@
-Index: config.sub
-===
-RCS file: /cvs/kaffe/kaffe/libltdl/config.sub,v
-retrieving revision 1.17
-diff -u -r1.17 config.sub
 config.sub 25 Oct 2005 15:43:20 -  1.17
-+++ config.sub 1 Dec 2005 23:06:41 -
-@@ -1309,6 +1309,9 @@
-   -kaos*)
-   os=-kaos
-   ;;
-+  -*drops)
-+  os=-drops
-+  ;;
-   -zvmoe)
-   os=-zvmoe
-   ;;

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): removed libltdl

[Kaffe CVS]

PatchSet 7698 
Date: 2008/01/19 22:45:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed libltdl

2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>

* developers/autogen.sh: Don't libtoolize with --ltdl. Removed workarounds
and patches for libltdl.

* libltdl/COPYING.LIB, libltdl/Makefile.am, libltdl/Makefile.in,
libltdl/README, libltdl/acinclude.m4, libltdl/aclocal.m4, libltdl/config-h.in,
libltdl/config.guess, libltdl/config.sub, libltdl/configure,
libltdl/configure.ac, libltdl/install-sh, libltdl/ltdl.c, libltdl/ltdl.h,
libltdl/ltmain.sh libltdl/missing: Removed.

* configure.ac: (AC_LIBLTDL_CONVENIENCE, LIBTOOL_DEPS, LIBLTDL)
Removed. Check for ltdl.h and libltdl and if not found error out.
Don't attempt to configure libltdl.

* test/internal/Makefile.am (jitBasic_LDADD),
test/jni/Makefile.am (jniBase_LDADD, jniExecClass_LDADD)
(jniReflect_LDADD, libjniweaklib_la_LDADD),
kaffe/xprof/Makefile.am (libkaffexprof_la_LIBADD),
kaffe/jvmpi/Makefile.am (libkaffejvmpi_la_DEPENDENCIES),
kaffe/kaffevm/Makefile.am (libkaffe_la_DEPENDENCIES): Removed
LIBLTDL.

* test/internal/jit_stub.c: Include system ltdl.h.

* Makefile.am (SUBDIRS, DIST_SUBDIRS): Removed libltdl.
(noinst_SCRIPTS): Removed libtool. (libtool) Removed.
(install-exec-local) Make sure the target directory exists
prior to symlinking.

Members: 
ChangeLog:1.5199->1.5200 
Makefile.am:1.148->1.149 
Makefile.in:1.307->1.308 
configure:1.632->1.633 
configure.ac:1.301->1.302 
config/Makefile.in:1.252->1.253 
developers/autogen.sh:1.79->1.80 
include/Makefile.in:1.316->1.317 
kaffe/Makefile.in:1.201->1.202 
kaffe/jvmpi/Makefile.am:1.12->1.13 
kaffe/jvmpi/Makefile.in:1.126->1.127 
kaffe/kaffe/Makefile.in:1.225->1.226 
kaffe/kaffeh/Makefile.in:1.207->1.208 
kaffe/kaffevm/Makefile.am:1.109->1.110 
kaffe/kaffevm/Makefile.in:1.280->1.281 
kaffe/kaffevm/boehm-gc/Makefile.in:1.92->1.93 
kaffe/kaffevm/gcj/Makefile.in:1.181->1.182 
kaffe/kaffevm/intrp/Makefile.in:1.190->1.191 
kaffe/kaffevm/jit/Makefile.in:1.200->1.201 
kaffe/kaffevm/jit3/Makefile.in:1.170->1.171 
kaffe/kaffevm/kaffe-gc/Makefile.in:1.90->1.91 
kaffe/kaffevm/systems/Makefile.in:1.190->1.191 
kaffe/kaffevm/systems/beos-native/Makefile.in:1.181->1.182 
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.45->1.46 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.187->1.188 
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.191->1.192 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.167->1.168 
kaffe/man/Makefile.in:1.188->1.189 
kaffe/scripts/Makefile.in:1.234->1.235 
kaffe/scripts/bat/Makefile.in:1.181->1.182 
kaffe/scripts/compat/Makefile.in:1.209->1.210 
kaffe/xprof/Makefile.am:1.15->1.16 
kaffe/xprof/Makefile.in:1.156->1.157 
libltdl/COPYING.LIB:1.7->1.8(DEAD) 
libltdl/Makefile.am:1.25->1.26(DEAD) 
libltdl/Makefile.in:1.64->1.65(DEAD) 
libltdl/README:1.3->1.4(DEAD) 
libltdl/acinclude.m4:1.53->1.54(DEAD) 
libltdl/aclocal.m4:1.62->1.63(DEAD) 
libltdl/config-h.in:1.21->1.22(DEAD) 
libltdl/config.guess:1.29->1.30(DEAD) 
libltdl/config.sub:1.34->1.35(DEAD) 
libltdl/configure:1.115->1.116(DEAD) 
libltdl/configure.ac:1.4->1.5(DEAD) 
libltdl/install-sh:1.16->1.17(DEAD) 
libltdl/ltdl.c:1.64->1.65(DEAD) 
libltdl/ltdl.h:1.21->1.22(DEAD) 
libltdl/ltmain.sh:1.32->1.33(DEAD) 
libltdl/missing:1.6->1.7(DEAD) 
libraries/Makefile.in:1.184->1.185 
libraries/clib/Makefile.in:1.206->1.207 
libraries/clib/awt/Makefile.in:1.199->1.200 
libraries/clib/awt/X/Makefile.in:1.195->1.196 
libraries/clib/awt/nano-X/Makefile.in:1.66->1.67 
libraries/clib/awt/qt/Makefile.in:1.147->1.148 
libraries/clib/awt/xynth/Makefile.in:1.22->1.23 
libraries/clib/math/Makefile.in:1.197->1.198 
libraries/clib/zip/Makefile.in:1.202->1.203 
libraries/javalib/Makefile.in:1.597->1.598 
libraries/javalib/awt-implementations/Makefile.in:1.78->1.79 
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.101->1.102 
libraries/javalib/gmp-math/Makefile.in:1.87->1.88 
libraries/javalib/vmspecific/Makefile.in:1.30->1.31 
libraries/javalib/zlib-zip/Makefile.in:1.24->1.25 
replace/Makefile.in:1.144->1.145 
test/Makefile.in:1.193->1.194 
test/internal/Makefile.am:1.37->1.38 
test/internal/Makefile.in:1.169->1.170 
test/internal/jit_stub.c:1.14->1.15 
test/jni/Makefile.am:1.21->1.22 
test/jni/Makefile.in:1.100->1.101 
test/regression/Makefile.in:1.272->1.273 
test/regression/compile_time/Makefile.in:1.121->1.122 
test/regression/compiler/Makefile.in:1.105->1.106 
 

[kaffe] CVS kaffe (robilad): always force symlinks on installation

[Kaffe CVS]

PatchSet 7697 
Date: 2008/01/19 19:35:38
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
always force symlinks on installation

2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/scripts/Makefile.am (install-exec-local),
Makefile.am (install-exec-local),
libraries/javalib/Makefile.am (install-data-local):
Always use force option when symlinking. Don't test
for existence of target.

Members: 
ChangeLog:1.5198->1.5199 
Makefile.am:1.147->1.148 
Makefile.in:1.306->1.307 
kaffe/scripts/Makefile.am:1.23->1.24 
kaffe/scripts/Makefile.in:1.233->1.234 
libraries/javalib/Makefile.am:1.466->1.467 
libraries/javalib/Makefile.in:1.596->1.597 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5198 kaffe/ChangeLog:1.5199
--- kaffe/ChangeLog:1.5198  Sat Jan 19 18:44:48 2008
+++ kaffe/ChangeLog Sat Jan 19 19:35:38 2008
@@ -1,3 +1,11 @@
+2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/scripts/Makefile.am (install-exec-local),
+   Makefile.am (install-exec-local),
+   libraries/javalib/Makefile.am (install-data-local):
+   Always use force option when symlinking. Don't test
+   for existence of target.
+
 2008-01-19  Robert Schuster  <[EMAIL PROTECTED]>
 
* kaffe/scripts/Makefile.am: Add force option to all ln invocations
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.147 kaffe/Makefile.am:1.148
--- kaffe/Makefile.am:1.147 Thu Jan  3 00:48:26 2008
+++ kaffe/Makefile.am   Sat Jan 19 19:35:38 2008
@@ -175,9 +175,7 @@
cd test && $(MAKE) check
 
 install-exec-local:
-   if ! test -f $(DESTDIR)${toolslibdir}/tools.jar ; then \
-$(LN_S) $(CLASSPATH_PREFIX)/share/classpath/tools.zip 
$(DESTDIR)${toolslibdir}/tools.jar ; \
-fi
+   $(LN_S) -f $(CLASSPATH_PREFIX)/share/classpath/tools.zip 
$(DESTDIR)${toolslibdir}/tools.jar
 
 uninstall-local:
$(RM) $(DESTDIR)${toolslibdir}/tools.jar 
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.306 kaffe/Makefile.in:1.307
--- kaffe/Makefile.in:1.306 Sat Jan 19 18:23:34 2008
+++ kaffe/Makefile.in   Sat Jan 19 19:35:38 2008
@@ -901,9 +901,7 @@
cd test && $(MAKE) check
 
 install-exec-local:
-   if ! test -f $(DESTDIR)${toolslibdir}/tools.jar ; then \
-$(LN_S) $(CLASSPATH_PREFIX)/share/classpath/tools.zip 
$(DESTDIR)${toolslibdir}/tools.jar ; \
-fi
+   $(LN_S) -f $(CLASSPATH_PREFIX)/share/classpath/tools.zip 
$(DESTDIR)${toolslibdir}/tools.jar
 
 uninstall-local:
$(RM) $(DESTDIR)${toolslibdir}/tools.jar 
Index: kaffe/kaffe/scripts/Makefile.am
diff -u kaffe/kaffe/scripts/Makefile.am:1.23 
kaffe/kaffe/scripts/Makefile.am:1.24
--- kaffe/kaffe/scripts/Makefile.am:1.23Sat Jan 19 18:44:49 2008
+++ kaffe/kaffe/scripts/Makefile.am Sat Jan 19 19:35:39 2008
@@ -43,9 +43,7 @@
 
 install-exec-local:
for app in $(CLASSPATH_APPS); do \
-   if ! test -f $(DESTDIR)$(bindir)/$$app ; then \
-   $(LN_S) -f $(CLASSPATH_PREFIX)/bin/g$$app 
$(DESTDIR)$(bindir)/$$app ; \
-   fi ; \
+   $(LN_S) -f $(CLASSPATH_PREFIX)/bin/g$$app 
$(DESTDIR)$(bindir)/$$app ; \
done
if test x"@JAVADOC@" != x"" ; then \
$(LN_S) -f @JAVADOC@  $(DESTDIR)$(bindir)/javadoc$(EXEEXT) ; \
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.233 
kaffe/kaffe/scripts/Makefile.in:1.234
--- kaffe/kaffe/scripts/Makefile.in:1.233   Sat Jan 19 18:44:50 2008
+++ kaffe/kaffe/scripts/Makefile.in Sat Jan 19 19:35:40 2008
@@ -681,9 +681,7 @@
 
 install-exec-local:
for app in $(CLASSPATH_APPS); do \
-   if ! test -f $(DESTDIR)$(bindir)/$$app ; then \
-   $(LN_S) -f $(CLASSPATH_PREFIX)/bin/g$$app 
$(DESTDIR)$(bindir)/$$app ; \
-   fi ; \
+   $(LN_S) -f $(CLASSPATH_PREFIX)/bin/g$$app 
$(DESTDIR)$(bindir)/$$app ; \
done
if test x"@JAVADOC@" != x"" ; then \
$(LN_S) -f @JAVADOC@  $(DESTDIR)$(bindir)/javadoc$(EXEEXT) ; \
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.466 
kaffe/libraries/javalib/Makefile.am:1.467
--- kaffe/libraries/javalib/Makefile.am:1.466   Sat Jan 19 18:23:56 2008
+++ kaffe/libraries/javalib/Makefile.am Sat Jan 19 19:35:40 2008
@@ -37,9 +37,7 @@
 logging.properties
 
 install-data-local: installdirs
-   if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
-   $(LN_S) $(TARGET_CLASSPATH_CLASSES) 
$(DESTDIR)${jrelibdir}/rt.jar ; \
-   fi
+   $(LN_S) -f $(TARGET_CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar
 
 uninstall-local:
$(RM) $(DESTDIR)${jrelibdir}/rt.jar
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.596 
kaffe/libraries/javalib/Makefile.in:1.597
--- kaffe/libraries/javalib/Makefile.in:1.596   Sat Jan 19 18:23:57 2008
+++ kaffe/libraries/javalib/Makefil

[kaffe] CVS kaffe (robilad): enforce the reinstallation of the symlinks

[Kaffe CVS]

PatchSet 7696 
Date: 2008/01/19 18:44:48
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
enforce the reinstallation of the symlinks

2008-01-19  Robert Schuster  <[EMAIL PROTECTED]>

* kaffe/scripts/Makefile.am: Add force option to all ln invocations
in target install-exec-local.

Members: 
ChangeLog:1.5197->1.5198 
kaffe/scripts/Makefile.am:1.22->1.23 
kaffe/scripts/Makefile.in:1.232->1.233 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5197 kaffe/ChangeLog:1.5198
--- kaffe/ChangeLog:1.5197  Sat Jan 19 18:23:34 2008
+++ kaffe/ChangeLog Sat Jan 19 18:44:48 2008
@@ -1,5 +1,10 @@
 2008-01-19  Robert Schuster  <[EMAIL PROTECTED]>
 
+   * kaffe/scripts/Makefile.am: Add force option to all ln invocations
+   in target install-exec-local.
+
+2008-01-19  Robert Schuster  <[EMAIL PROTECTED]>
+
Added --with-target-classpath-classes option to support having glib.zip
in a different location on target environment.
 
Index: kaffe/kaffe/scripts/Makefile.am
diff -u kaffe/kaffe/scripts/Makefile.am:1.22 
kaffe/kaffe/scripts/Makefile.am:1.23
--- kaffe/kaffe/scripts/Makefile.am:1.22Tue Jan  1 22:21:23 2008
+++ kaffe/kaffe/scripts/Makefile.am Sat Jan 19 18:44:49 2008
@@ -44,14 +44,14 @@
 install-exec-local:
for app in $(CLASSPATH_APPS); do \
if ! test -f $(DESTDIR)$(bindir)/$$app ; then \
-   $(LN_S) $(CLASSPATH_PREFIX)/bin/g$$app 
$(DESTDIR)$(bindir)/$$app ; \
+   $(LN_S) -f $(CLASSPATH_PREFIX)/bin/g$$app 
$(DESTDIR)$(bindir)/$$app ; \
fi ; \
done
if test x"@JAVADOC@" != x"" ; then \
-   $(LN_S) @JAVADOC@  $(DESTDIR)$(bindir)/javadoc$(EXEEXT) ; \
+   $(LN_S) -f @JAVADOC@  $(DESTDIR)$(bindir)/javadoc$(EXEEXT) ; \
fi
if test x"@JAVAP@" != x"" ; then \
-   $(LN_S) @JAVAP@  $(DESTDIR)$(bindir)/javap$(EXEEXT) ; \
+   $(LN_S) -f @JAVAP@  $(DESTDIR)$(bindir)/javap$(EXEEXT) ; \
fi
 
 uninstall-local:
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.232 
kaffe/kaffe/scripts/Makefile.in:1.233
--- kaffe/kaffe/scripts/Makefile.in:1.232   Sat Jan 19 18:23:50 2008
+++ kaffe/kaffe/scripts/Makefile.in Sat Jan 19 18:44:50 2008
@@ -682,14 +682,14 @@
 install-exec-local:
for app in $(CLASSPATH_APPS); do \
if ! test -f $(DESTDIR)$(bindir)/$$app ; then \
-   $(LN_S) $(CLASSPATH_PREFIX)/bin/g$$app 
$(DESTDIR)$(bindir)/$$app ; \
+   $(LN_S) -f $(CLASSPATH_PREFIX)/bin/g$$app 
$(DESTDIR)$(bindir)/$$app ; \
fi ; \
done
if test x"@JAVADOC@" != x"" ; then \
-   $(LN_S) @JAVADOC@  $(DESTDIR)$(bindir)/javadoc$(EXEEXT) ; \
+   $(LN_S) -f @JAVADOC@  $(DESTDIR)$(bindir)/javadoc$(EXEEXT) ; \
fi
if test x"@JAVAP@" != x"" ; then \
-   $(LN_S) @JAVAP@  $(DESTDIR)$(bindir)/javap$(EXEEXT) ; \
+   $(LN_S) -f @JAVAP@  $(DESTDIR)$(bindir)/javap$(EXEEXT) ; \
fi
 
 uninstall-local:

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): added support for having glibj.zip in a different location on install

[Kaffe CVS]

PatchSet 7695 
Date: 2008/01/19 18:23:34
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
added support for having glibj.zip in a different location on install

2008-01-19  Robert Schuster  <[EMAIL PROTECTED]>

Added --with-target-classpath-classes option to support having glib.zip
in a different location on target environment.

* libraries/javalib/Makefile.am (install-data-local):
Link TARGET_CLASSPATH_CLASSES as rt.jar.

* m4/classpath.m4 (AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES): Added.

* configure.ac: Use AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES.

Members: 
ChangeLog:1.5196->1.5197 
Makefile.in:1.305->1.306 
configure:1.631->1.632 
configure.ac:1.300->1.301 
config/Makefile.in:1.251->1.252 
include/Makefile.in:1.315->1.316 
kaffe/Makefile.in:1.200->1.201 
kaffe/jvmpi/Makefile.in:1.125->1.126 
kaffe/kaffe/Makefile.in:1.224->1.225 
kaffe/kaffeh/Makefile.in:1.206->1.207 
kaffe/kaffevm/Makefile.in:1.279->1.280 
kaffe/kaffevm/boehm-gc/Makefile.in:1.91->1.92 
kaffe/kaffevm/gcj/Makefile.in:1.180->1.181 
kaffe/kaffevm/intrp/Makefile.in:1.189->1.190 
kaffe/kaffevm/jit/Makefile.in:1.199->1.200 
kaffe/kaffevm/jit3/Makefile.in:1.169->1.170 
kaffe/kaffevm/kaffe-gc/Makefile.in:1.89->1.90 
kaffe/kaffevm/systems/Makefile.in:1.189->1.190 
kaffe/kaffevm/systems/beos-native/Makefile.in:1.180->1.181 
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.44->1.45 
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.186->1.187 
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.190->1.191 
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.166->1.167 
kaffe/man/Makefile.in:1.187->1.188 
kaffe/scripts/Makefile.in:1.231->1.232 
kaffe/scripts/bat/Makefile.in:1.180->1.181 
kaffe/scripts/compat/Makefile.in:1.208->1.209 
kaffe/xprof/Makefile.in:1.155->1.156 
libraries/Makefile.in:1.183->1.184 
libraries/clib/Makefile.in:1.205->1.206 
libraries/clib/awt/Makefile.in:1.198->1.199 
libraries/clib/awt/X/Makefile.in:1.194->1.195 
libraries/clib/awt/nano-X/Makefile.in:1.65->1.66 
libraries/clib/awt/qt/Makefile.in:1.146->1.147 
libraries/clib/awt/xynth/Makefile.in:1.21->1.22 
libraries/clib/math/Makefile.in:1.196->1.197 
libraries/clib/zip/Makefile.in:1.201->1.202 
libraries/javalib/Makefile.am:1.465->1.466 
libraries/javalib/Makefile.in:1.595->1.596 
libraries/javalib/awt-implementations/Makefile.in:1.77->1.78 
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.100->1.101 
libraries/javalib/gmp-math/Makefile.in:1.86->1.87 
libraries/javalib/vmspecific/Makefile.in:1.29->1.30 
libraries/javalib/zlib-zip/Makefile.in:1.23->1.24 
m4/classpath.m4:1.2->1.3 
replace/Makefile.in:1.143->1.144 
test/Makefile.in:1.192->1.193 
test/internal/Makefile.in:1.168->1.169 
test/jni/Makefile.in:1.99->1.100 
test/regression/Makefile.in:1.271->1.272 
test/regression/compile_time/Makefile.in:1.120->1.121 
test/regression/compiler/Makefile.in:1.104->1.105 
test/regression/run_time/Makefile.in:1.119->1.120 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5196 kaffe/ChangeLog:1.5197
--- kaffe/ChangeLog:1.5196  Sat Jan 19 15:16:52 2008
+++ kaffe/ChangeLog Sat Jan 19 18:23:34 2008
@@ -1,3 +1,15 @@
+2008-01-19  Robert Schuster  <[EMAIL PROTECTED]>
+
+   Added --with-target-classpath-classes option to support having glib.zip
+   in a different location on target environment.
+
+   * libraries/javalib/Makefile.am (install-data-local): 
+   Link TARGET_CLASSPATH_CLASSES as rt.jar. 
+
+   * m4/classpath.m4 (AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES): Added.
+
+   * configure.ac: Use AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES.
+
 2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
 
* TODO: Updated.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.305 kaffe/Makefile.in:1.306
--- kaffe/Makefile.in:1.305 Sun Jan  6 19:05:14 2008
+++ kaffe/Makefile.in   Sat Jan 19 18:23:34 2008
@@ -226,6 +226,7 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_CLASSPATH_CLASSES = @TARGET_CLASSPATH_CLASSES@
 THREAD_DIR = @THREAD_DIR@
 THREAD_SYSTEM = @THREAD_SYSTEM@
 UIC = @UIC@
Index: kaffe/configure
diff -u kaffe/configure:1.631 kaffe/configure:1.632
--- kaffe/configure:1.631   Fri Jan 18 18:49:00 2008
+++ kaffe/configure Sat Jan 19 18:23:34 2008
@@ -953,6 +953,7 @@
 VM_LIBS
 CLASSPATH_PREFIX
 CLASSPATH_CLASSES
+TARGET_CLASSPATH_CLASSES
 CLASSPATH_LIBDIR
 GLIBJ_ZIP
 JAVAC
@@ -1706,6 +1707,10 @@
   path to Java core library classes (includes the name
   of the file and may be flat)
   
[default=/

[kaffe] CVS kaffe (robilad): updated todo

[Kaffe CVS]

PatchSet 7694 
Date: 2008/01/19 15:16:52
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated todo

2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

Members: 
ChangeLog:1.5195->1.5196 
TODO:1.38->1.39 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5195 kaffe/ChangeLog:1.5196
--- kaffe/ChangeLog:1.5195  Sat Jan 19 15:15:28 2008
+++ kaffe/ChangeLog Sat Jan 19 15:16:52 2008
@@ -1,5 +1,9 @@
 2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * TODO: Updated.
+
+2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
+
*  config/alpha/jit-alpha.def,
config/alpha/jit-icode.h,
config/alpha/linux/md.c,
Index: kaffe/TODO
diff -u kaffe/TODO:1.38 kaffe/TODO:1.39
--- kaffe/TODO:1.38 Fri Jan 18 23:22:52 2008
+++ kaffe/TODO  Sat Jan 19 15:16:53 2008
@@ -12,7 +12,6 @@
  * Make runtime engine runtime selectable
  * Make gc backend runtime selectable
  * Make boehm-gc the default engine on platforms that support it
- * Switch back to a shared gc-refs.c
  * Swich to glib for data structures, command line option parsing, etc.
  * Switch to libjclassinfo for class file parsing
 
@@ -44,8 +43,8 @@
 * Build system: (dalibor)
   * Remove convenience libraries (gc, engine, threading) and make them part of 
libkaffe_la_SOURCES
   * Remove symlinked files, and replace them by adding the 'right' file to 
SOURCES
-  * make sure all noinst_HEADERS are partof _SOURCES.
-  * Use AC_IF and AS_CASE all over the configure script.
+  * make sure all noinst_HEADERS are part of _SOURCES.
+  * Use AS_IF and AS_CASE all over the configure script.
   * Non-recursive build, single Makefile.am for kaffe.
   * Switch to autotest for the test suites
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): added the changelog

[Kaffe CVS]

PatchSet 7693 
Date: 2008/01/19 15:15:28
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
added the changelog

Members: 
ChangeLog:1.5194->1.5195 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5194 kaffe/ChangeLog:1.5195
--- kaffe/ChangeLog:1.5194  Fri Jan 18 23:22:52 2008
+++ kaffe/ChangeLog Sat Jan 19 15:15:28 2008
@@ -1,5 +1,95 @@
 2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   *  config/alpha/jit-alpha.def,
+   config/alpha/jit-icode.h,
+   config/alpha/linux/md.c,
+   config/alpha/netbsd1/md.c,
+   config/alpha/osf/md.c,
+   config/arm/jit-arm.def,
+   config/arm/jit3-arm.def,
+   config/bfin/jit-bfin.def,
+   config/bfin/jit3-bfin.def,
+   config/ia64/linux/md.h,
+   config/m68k/jit3-m68k.def,
+   config/mips/mips.c,
+   config/powerpc/callmethod_ppc.h,
+   config/powerpc/jit3-icode.h,
+   config/powerpc/jit3-powerpc.def,
+   config/powerpc/netbsd1/md.c,
+   config/sparc/jit-sparc.def.
+   kaffe/kaffevm/classMethod.c,
+   kaffe/kaffevm/classPool.c,
+   kaffe/kaffevm/exception.c,
+   kaffe/kaffevm/findInJar.c,
+   kaffe/kaffevm/kaffe.def,
+   kaffe/kaffevm/soft.c,
+   kaffe/kaffevm/string.c,
+   kaffe/kaffevm/gcj/eh.c,
+   kaffe/kaffevm/gcj/gcj-glue.c,
+   kaffe/kaffevm/jit/labels.c,
+   kaffe/kaffevm/jit/methodcalls.c,
+   kaffe/kaffevm/jit/native-wrapper.c,
+   kaffe/kaffevm/jit3/icode.c,
+   kaffe/kaffevm/jit3/machine.c,
+   kaffe/kaffevm/jit3/registers.h,
+   kaffe/kaffevm/jni/jni.c,
+   kaffe/kaffevm/systems/oskit-pthreads/pjthread.c,
+   kaffe/kaffevm/systems/unix-jthreads/jthread.c,
+   kaffe/kaffevm/systems/win32/winio.c,
+   kaffe/xprof/xprofiler.c,
+   libraries/clib/native/Class.c:
+   Removed ifdef-ed out code.
+
+   * config/i386/callKaffeException.h,
+   config/i386/common.h, 
+   config/i386/sysdepCallMethod.h: 
+   Use __asm__ instead of asm.
+
+   * kaffe/kaffevm/Makefile.am (libkaffe_la_SOURCES): Added gc-refs.c.
+
+   * kaffe/kaffevm/gc-refs.c: New file. Moved most of the code from
+   kaffe/kaffevm/kaffe-gc/gc-refs.c here, and added KaffeGC_markAllRefs.
+
+   * kaffe/kaffevm/kaffe-gc/gc-refs.c, kaffe/kaffevm/boehm-gc/gc-refs.c:
+   Removed.
+
+   * kaffe/kaffevm/kaffe-gc/gc-krefs.c: New file. Moved over the thread 
+   walking functions necessary for kaffe-gc that don't fit into the shared
+   gc-refs.c implementation. 
+
+   * kaffe/kaffevm/boehm-gc/gc-brefs.c,
+   kaffe/kaffevm/boehm-gc/gc-brefs.h: New files.
+
+   * kaffe/kaffevm/gc-refs.h (KaffeGC_walkRefs) Removed.
+   (KaffeGC_markAllRefs) Added.
+
+   * kaffe/kaffevm/jar.c (openJarFile) Use S_ISDIR.
+
+   * kaffe/kaffevm/kaffe.def (FIELD_IS_CONSTANT): Removed.
+   (GETSTATIC) Removed uses of FIELD_IS_CONSTANT.
+
+   * kaffe/kaffevm/soft.c: Removed inline statements.
+
+   * kaffe/kaffevm/utf8const.c: Spell out unsigned int.
+
+   * kaffe/kaffevm/boehm-gc/Makefile.am (libkaffegc_la_SOURCES):
+   Removed gc-refs.c, added gc-brefs.c and gc-brefs.h.
+
+   * kaffe/kaffevm/boehm-gc/gc2.c: Include gc-brefs.h.
+   (GarbageCollectorInterface_Ops) Use BoehmGC_addRef and BoehmGC_rmRef
+   wrappers instead of using KaffeGC_addRef and KaffeGC_rmRef directly.
+
+   * kaffe/kaffevm/kaffe-gc/Makefile.am (libkaffegc_la_SOURCES): 
+   Removed gc-refs.c. Added gc-krefs.c.
+
+   * kaffe/kaffevm/kaffe-gc/gc-incremental.h (KaffeGC_walkRefs): 
+   Added prototype.
+
+   * kaffe/kaffevm/systems/unix-pthreads/thread-impl.c 
(resume_signal_handler,
+   jthread_unsuspendall) Declare status variable in the scope it is used.
+
+2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
+
* TODO: Updated.
 
 2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): cleaned out dead code, fixed build for --std=gnu99 and unified gc-refs.c

[Kaffe CVS]

PatchSet 7692 
Date: 2008/01/19 15:13:36
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cleaned out dead code, fixed build for --std=gnu99 and unified gc-refs.c

2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>

*  config/alpha/jit-alpha.def,
config/alpha/jit-icode.h,
config/alpha/linux/md.c,
config/alpha/netbsd1/md.c,
config/alpha/osf/md.c,
config/arm/jit-arm.def,
config/arm/jit3-arm.def,
config/bfin/jit-bfin.def,
config/bfin/jit3-bfin.def,
config/ia64/linux/md.h,
config/m68k/jit3-m68k.def,
config/mips/mips.c,
config/powerpc/callmethod_ppc.h,
config/powerpc/jit3-icode.h,
config/powerpc/jit3-powerpc.def,
config/powerpc/netbsd1/md.c,
config/sparc/jit-sparc.def.
kaffe/kaffevm/classMethod.c,
kaffe/kaffevm/classPool.c,
kaffe/kaffevm/exception.c,
kaffe/kaffevm/findInJar.c,
kaffe/kaffevm/kaffe.def,
kaffe/kaffevm/soft.c,
kaffe/kaffevm/string.c,
kaffe/kaffevm/gcj/eh.c,
kaffe/kaffevm/gcj/gcj-glue.c,
kaffe/kaffevm/jit/labels.c,
kaffe/kaffevm/jit/methodcalls.c,
kaffe/kaffevm/jit/native-wrapper.c,
kaffe/kaffevm/jit3/icode.c,
kaffe/kaffevm/jit3/machine.c,
kaffe/kaffevm/jit3/registers.h,
kaffe/kaffevm/jni/jni.c,
kaffe/kaffevm/systems/oskit-pthreads/pjthread.c,
kaffe/kaffevm/systems/unix-jthreads/jthread.c,
kaffe/kaffevm/systems/win32/winio.c,
kaffe/xprof/xprofiler.c,
libraries/clib/native/Class.c:
Removed ifdef-ed out code.

* config/i386/callKaffeException.h,
config/i386/common.h,
config/i386/sysdepCallMethod.h:
Use __asm__ instead of asm.

* kaffe/kaffevm/Makefile.am (libkaffe_la_SOURCES): Added gc-refs.c.

* kaffe/kaffevm/gc-refs.c: New file. Moved most of the code from
kaffe/kaffevm/kaffe-gc/gc-refs.c here, and added KaffeGC_markAllRefs.

* kaffe/kaffevm/kaffe-gc/gc-refs.c, kaffe/kaffevm/boehm-gc/gc-refs.c:
Removed.

* kaffe/kaffevm/kaffe-gc/gc-krefs.c: New file. Moved over the thread
walking functions necessary for kaffe-gc that don't fit into the shared
gc-refs.c implementation.

* kaffe/kaffevm/boehm-gc/gc-brefs.c,
kaffe/kaffevm/boehm-gc/gc-brefs.h: New files.

* kaffe/kaffevm/gc-refs.h (KaffeGC_walkRefs) Removed.
(KaffeGC_markAllRefs) Added.

* kaffe/kaffevm/jar.c (openJarFile) Use S_ISDIR.

* kaffe/kaffevm/kaffe.def (FIELD_IS_CONSTANT): Removed.
(GETSTATIC) Removed uses of FIELD_IS_CONSTANT.

* kaffe/kaffevm/soft.c: Removed inline statements.

* kaffe/kaffevm/utf8const.c: Spell out unsigned int.

* kaffe/kaffevm/boehm-gc/Makefile.am (libkaffegc_la_SOURCES):
Removed gc-refs.c, added gc-brefs.c and gc-brefs.h.

* kaffe/kaffevm/boehm-gc/gc2.c: Include gc-brefs.h.
(GarbageCollectorInterface_Ops) Use BoehmGC_addRef and BoehmGC_rmRef
wrappers instead of using KaffeGC_addRef and KaffeGC_rmRef directly.

* kaffe/kaffevm/kaffe-gc/Makefile.am (libkaffegc_la_SOURCES):
Removed gc-refs.c. Added gc-krefs.c.

* kaffe/kaffevm/kaffe-gc/gc-incremental.h (KaffeGC_walkRefs):
Added prototype.

* kaffe/kaffevm/systems/unix-pthreads/thread-impl.c (resume_signal_handler,
jthread_unsuspendall) Declare status variable in the scope it is used.

Members: 
config/alpha/jit-alpha.def:1.14->1.15 
config/alpha/jit-icode.h:INITIAL->1.5 
config/alpha/linux/md.c:1.5->1.6 
config/alpha/netbsd1/md.c:1.3->1.4 
config/alpha/osf/md.c:1.10->1.11 
config/arm/jit-arm.def:1.9->1.10 
config/arm/jit3-arm.def:1.10->1.11 
config/bfin/jit-bfin.def:1.1->1.2 
config/bfin/jit3-bfin.def:1.1->1.2 
config/i386/callKaffeException.h:1.1->1.2 
config/i386/common.h:1.22->1.23 
config/i386/sysdepCallMethod.h:INITIAL->1.4 
config/ia64/linux/md.h:1.2->1.3 
config/m68k/jit3-m68k.def:1.16->1.17 
config/mips/mips.c:INITIAL->1.15 
config/powerpc/callmethod_ppc.h:1.5->1.6 
config/powerpc/jit3-icode.h:1.4->1.5 
config/powerpc/jit3-powerpc.def:1.11->1.12 
config/powerpc/netbsd1/md.c:1.4->1.5 
config/sparc/jit-sparc.def:1.16->1.17 
kaffe/kaffevm/Makefile.am:1.108->1.109 
kaffe/kaffevm/Makefile.in:1.278->1.279 
kaffe/kaffevm/classMethod.c:1.161->1.162 
kaffe/kaffevm/classPool.c:1.42->1.43 
kaffe/kaffevm/exception.c:1.109->1.110 
kaffe/kaffevm/findInJar.c:1.75->1.76 
kaffe/kaffevm/gc-refs.c:INITIAL->1.1 
kaffe/kaffevm/gc-refs.h:1.1->1.2 
kaffe/kaffevm/jar.c:1.43->1.44 
kaffe/kaffevm/kaffe.def:1.45->1.46 
kaffe/kaffevm/soft.c:1.82->1.83 
kaffe/kaffevm/string.c:1.51->1.52 
kaffe/kaffevm/utf8const.c:1.53->1.54 
kaffe/kaffevm/boehm-gc/Makefile.am:1.14->1.15 
kaffe/kaffevm/boehm-gc/Makefile.in:1.90->1.91 
kaffe/kaffevm/boehm-gc/gc-brefs.c:INITIAL->1.1 
kaffe/kaffevm/boehm-gc/gc-brefs.h:INITIAL->1.1 
kaffe/kaffevm/boehm-gc/gc-refs.c:1.10->1.11(DEAD) 
kaffe/kaffevm/boehm-gc/gc2.c:1.17->1.18 
kaffe/kaffevm/gcj/eh.c:1.5->1.6 
kaffe/kaffevm/gcj/gcj-glue.c:1.12->1.13 
kaffe/kaffevm/jit/labels.c:1.15->1.16 
kaffe/kaffevm/jit/methodcalls.c:1.14->1.15 
   

[kaffe] CVS kaffe (robilad): updated TODO

[Kaffe CVS]

PatchSet 7691 
Date: 2008/01/18 23:22:52
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
updated TODO

2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>

* TODO: Updated.

Members: 
ChangeLog:1.5193->1.5194 
TODO:1.37->1.38 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5193 kaffe/ChangeLog:1.5194
--- kaffe/ChangeLog:1.5193  Fri Jan 18 23:08:51 2008
+++ kaffe/ChangeLog Fri Jan 18 23:22:52 2008
@@ -1,5 +1,9 @@
 2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * TODO: Updated.
+
+2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/boehm-gc/gc-refs.c: Added debugging code from kaffe-gc
version. Use KaffeGC_malloc & KaffeGC_free instead of boehm-specific
macros. Rearranged functions to match layout in kaffe-gc version in 
Index: kaffe/TODO
diff -u kaffe/TODO:1.37 kaffe/TODO:1.38
--- kaffe/TODO:1.37 Fri Jan 18 03:13:03 2008
+++ kaffe/TODO  Fri Jan 18 23:22:52 2008
@@ -12,6 +12,7 @@
  * Make runtime engine runtime selectable
  * Make gc backend runtime selectable
  * Make boehm-gc the default engine on platforms that support it
+ * Switch back to a shared gc-refs.c
  * Swich to glib for data structures, command line option parsing, etc.
  * Switch to libjclassinfo for class file parsing
 
@@ -23,16 +24,28 @@
  * Implement hooks for JVMTI from GNU Classpath. 
 
 * Integration issues
- * Remove jikes from checked compiler list.
+ * Remove jikes from checked compiler list. Otoh, it's the only real option on 
Cygwin atm. 
+   So the answer is probably to avoid having any 1.5+ Java code in 
vmreference, and to avoid
+   any deviation from Classpath's VM interface.
  * Update java.lang.ref vminterface to latest version.
  * Switch over to GNU Classpath's javah and remove kaffeh
   * Replace native library code using KNI with code using JNI
 
+* Unmerging work
+  * Remove GNU MP big math
+  * Remove old Kaffe AWT implementations
+
 * Merging work:
+  * sun.misc.Unsafe native implementation from openjdk/cacao for full jsr166 
support.
+  * zip library from openjdk
   * verifier from gcj (rob gonzalez)
   * SkyOS port
 
 * Build system: (dalibor)
+  * Remove convenience libraries (gc, engine, threading) and make them part of 
libkaffe_la_SOURCES
+  * Remove symlinked files, and replace them by adding the 'right' file to 
SOURCES
+  * make sure all noinst_HEADERS are partof _SOURCES.
+  * Use AC_IF and AS_CASE all over the configure script.
   * Non-recursive build, single Makefile.am for kaffe.
   * Switch to autotest for the test suites
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): made boehm-gc gc-refs.c implementation closer to kaffe-gc one

[Kaffe CVS]

PatchSet 7690 
Date: 2008/01/18 23:08:51
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
made boehm-gc gc-refs.c implementation closer to kaffe-gc one

2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/kaffevm/boehm-gc/gc-refs.c: Added debugging code from kaffe-gc
version. Use KaffeGC_malloc & KaffeGC_free instead of boehm-specific
macros. Rearranged functions to match layout in kaffe-gc version in
preparation for unifying them again.

Members: 
ChangeLog:1.5192->1.5193 
kaffe/kaffevm/boehm-gc/gc-refs.c:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5192 kaffe/ChangeLog:1.5193
--- kaffe/ChangeLog:1.5192  Fri Jan 18 22:19:54 2008
+++ kaffe/ChangeLog Fri Jan 18 23:08:51 2008
@@ -1,3 +1,10 @@
+2008-01-19  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * kaffe/kaffevm/boehm-gc/gc-refs.c: Added debugging code from kaffe-gc
+   version. Use KaffeGC_malloc & KaffeGC_free instead of boehm-specific
+   macros. Rearranged functions to match layout in kaffe-gc version in 
+   preparation for unifying them again.
+
 2008-01-18  Dalibor Topic  <[EMAIL PROTECTED]>
 
* kaffe/kaffevm/Makefile.am (DIST_SUBDIRS): Removed jni and verifier 
dirs.
Index: kaffe/kaffe/kaffevm/boehm-gc/gc-refs.c
diff -u kaffe/kaffe/kaffevm/boehm-gc/gc-refs.c:1.9 
kaffe/kaffe/kaffevm/boehm-gc/gc-refs.c:1.10
--- kaffe/kaffe/kaffevm/boehm-gc/gc-refs.c:1.9  Tue Aug  7 01:44:49 2007
+++ kaffe/kaffe/kaffevm/boehm-gc/gc-refs.c  Fri Jan 18 23:08:53 2008
@@ -27,8 +27,6 @@
 #include "java_lang_Thread.h"
 #include "gc2.h"
 
-#include 
-
 #defineREFOBJHASHSZ128
 typedef struct _strongRefObject {
   const void*  mem;
@@ -71,6 +69,10 @@
   uint32 idx;
   strongRefObject* obj;
 
+
+  DBG(REFERENCE, dprintf("Adding persistent reference for object %p\n",
+ mem); );
+
   idx = REFOBJHASH(mem);
   for (obj = strongRefObjects.hash[idx]; obj != 0; obj = obj->next) {
 /* Found it - just increase reference */
@@ -81,7 +83,7 @@
   }
 
   /* Not found - create a new one */
-  obj = (strongRefObject*)GC_MALLOC_UNCOLLECTABLE(sizeof(strongRefObject));
+  obj = (strongRefObject*)KGC_malloc(collector, sizeof(strongRefObject), 
KGC_ALLOC_REF);
   if (!obj)
 return false;

@@ -94,6 +96,44 @@
   return true;
 }
 
+/*
+ * Remove a persistent reference to an object.  If the count becomes
+ * zero then the reference is removed.
+ */
+bool
+KaffeGC_rmRef(Collector *collector UNUSED, void* mem)
+{
+  uint32 idx;
+  strongRefObject** objp;
+  strongRefObject* obj;
+
+
+  DBG(REFERENCE, dprintf("Removing persistent reference for object %p\n",
+ mem); );
+
+  idx = REFOBJHASH(mem);
+  mem = ALIGN_BACKWARD(mem);
+
+  lockStaticMutex(&strongRefLock);
+  for (objp = &strongRefObjects.hash[idx]; *objp != 0; objp = &obj->next) {
+obj = *objp;
+/* Found it - just decrease reference */
+if (obj->mem == mem) {
+  obj->ref--;
+  if (obj->ref == 0) {
+   *objp = obj->next;
+   KGC_free(collector, obj);
+  }
+  unlockStaticMutex(&strongRefLock);
+  return true;
+}
+  }
+  unlockStaticMutex(&strongRefLock);
+
+  /* Not found!! */
+  return false;
+}
+
 /**
  * Grow the weak reference list for a weakly referenced object.
  * Assert: weakRefLock is held by the calling thread.
@@ -121,7 +161,7 @@
 {
   previousSize = obj->allRefSize;
   unlockStaticMutex(&weakRefLock);
-  refs = GC_MALLOC_UNCOLLECTABLE(size * sizeof(void **));
+  refs = KGC_malloc(collector, size * sizeof(void **), 
KGC_ALLOC_VMWEAKREF);
   lockStaticMutex(&weakRefLock);
   if (refs == NULL)
{
@@ -133,7 +173,7 @@
   if (previousSize != obj->allRefSize)
{
  unlockStaticMutex(&weakRefLock);
- GC_FREE(refs);
+ KGC_free(collector, refs);
  lockStaticMutex(&weakRefLock);
  continue;
}
@@ -147,7 +187,7 @@
  memcpy(refs, oldRefs, sizeof(void **) * obj->ref);
   
  unlockStaticMutex(&weakRefLock);
- GC_FREE(oldRefs);
+ KGC_free(collector, oldRefs);
  lockStaticMutex(&weakRefLock);
}
 
@@ -157,82 +197,90 @@
   while (1);
 }
 
-/*
- * Remove a persistent reference to an object.  If the count becomes
- * zero then the reference is removed.
- */
-bool
-KaffeGC_rmRef(Collector *collector UNUSED, void* mem)
+
+static weakRefObject *
+findWeakRefObject(void *mem)
 {
-  uint32 idx;
-  strongRefObject** objp;
-  strongRefObject* obj;
+  int idx;
+  weakRefObject* obj;
 
   idx = REFOBJHASH(mem);
-  mem = ALIGN_BACKWARD(mem);
 
-  lockStaticMutex(&strongRefLock);
-  for (objp = &strongRefObjects.hash[idx]; *objp != 0; objp = &obj->next) {
-obj = *objp;
-/* Found it - just decrease reference */
-if (obj->mem == mem) {
-  obj->ref--;
-  if (obj->ref == 0) {
-   *objp = obj->next;
-   GC_FREE(obj);
-  }
-  unlockStaticMutex(&strongRefLock);
-  return true;
-}
+