[kaffe] CVS kaffe (robilad): Removed unused files
Kaffe CVS
cvs-commits at kaffe.org
Sun Feb 6 10:50:27 PST 2005
PatchSet 5486
Date: 2005/02/06 18:45:40
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Removed unused files
2005-02-06 Dalibor Topic <robilad at kaffe.org>
* libraries/clib/native/DateFormat.c,
libraries/clib/native/Arrays.c:
Removed unused files.
* libraries/clib/native/Makefile.am:
Removed DateFormat.c and Arrays.c.
* include/Makefile.am:
Don't create headers for DateFormat and Arrays.
Members:
ChangeLog:1.3531->1.3532
include/Makefile.am:1.88->1.89
include/Makefile.in:1.211->1.212
libraries/clib/native/Arrays.c:1.7->1.8(DEAD)
libraries/clib/native/DateFormat.c:1.6->1.7(DEAD)
libraries/clib/native/Makefile.am:1.39->1.40
libraries/clib/native/Makefile.in:1.170->1.171
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3531 kaffe/ChangeLog:1.3532
--- kaffe/ChangeLog:1.3531 Sun Feb 6 15:50:40 2005
+++ kaffe/ChangeLog Sun Feb 6 18:45:40 2005
@@ -1,5 +1,17 @@
2005-02-06 Dalibor Topic <robilad at kaffe.org>
+ * libraries/clib/native/DateFormat.c,
+ libraries/clib/native/Arrays.c:
+ Removed unused files.
+
+ * libraries/clib/native/Makefile.am:
+ Removed DateFormat.c and Arrays.c.
+
+ * include/Makefile.am:
+ Don't create headers for DateFormat and Arrays.
+
+2005-02-06 Dalibor Topic <robilad at kaffe.org>
+
* config/powerpc/aix/md.c,
config/powerpc/linux/md.c,
config/powerpc/machten/md.c:
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.88 kaffe/include/Makefile.am:1.89
--- kaffe/include/Makefile.am:1.88 Sun Jan 30 12:42:37 2005
+++ kaffe/include/Makefile.am Sun Feb 6 18:45:43 2005
@@ -79,8 +79,6 @@
java_net_SocketImpl.h \
java_net_SocketOptions.h \
java_security_VMAccessController.h \
- java_text_DateFormat.h \
- java_util_Arrays.h \
java_util_Comparator.h \
java_util_VMTimeZone.h \
java_util_Vector.h \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.211 kaffe/include/Makefile.in:1.212
--- kaffe/include/Makefile.in:1.211 Sat Feb 5 17:46:26 2005
+++ kaffe/include/Makefile.in Sun Feb 6 18:45:43 2005
@@ -443,8 +443,6 @@
java_net_SocketImpl.h \
java_net_SocketOptions.h \
java_security_VMAccessController.h \
- java_text_DateFormat.h \
- java_util_Arrays.h \
java_util_Comparator.h \
java_util_VMTimeZone.h \
java_util_Vector.h \
===================================================================
Checking out kaffe/libraries/clib/native/Arrays.c
RCS: /home/cvs/kaffe/kaffe/libraries/clib/native/Attic/Arrays.c,v
VERS: 1.7
***************
--- kaffe/libraries/clib/native/Arrays.c Sun Feb 6 18:50:27 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,211 +0,0 @@
-
-/*
- * java.util.Arrays.c
- *
- * Copyright (c) 1999
- * Archie L. Cobbs. All rights reserved.
- * Copyright (c) 1999
- * Transvirtual Technologies, Inc. All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- *
- * Author: Archie L. Cobbs <archie at whistle.com>
- */
-
-#include "config.h"
-#include "config-std.h"
-#include "native.h"
-#include "gtypes.h"
-#include "fp.h"
-#include "support.h"
-#include "java_util_Comparator.h"
-#include "java_util_Arrays.h"
-
-/*
- * Sorting functions
- *
- * We rely on libc routines to do the sorting because they are already
- * highly optimized and debugged.
- *
- * Note that these routines assume the bounds checking has already been
- * done in Java.
- */
-
-static int
-cmpByte(const void *p1, const void *p2)
-{
- return (int)*((const jbyte *) p1) - (int)*((const jbyte *) p2);
-}
-
-static int
-cmpChar(const void *p1, const void *p2)
-{
- return (int)*((const jchar *) p1) - (int)*((const jchar *) p2);
-}
-
-static int
-cmpDouble(const void *p1, const void *p2)
-{
- const jlong bits1 = doubleToLong(*((const jdouble *) p1));
- const jlong bits2 = doubleToLong(*((const jdouble *) p2));
-
- return (bits1 == bits2) ? 0 : (bits1 < bits2) ? -1 : 1;
-}
-
-static int
-cmpFloat(const void *p1, const void *p2)
-{
- const jint bits1 = floatToInt(*((const jfloat *) p1));
- const jint bits2 = floatToInt(*((const jfloat *) p2));
-
- return (bits1 == bits2) ? 0 : (bits1 < bits2) ? -1 : 1;
-}
-
-static int
-cmpInt(const void *p1, const void *p2)
-{
- const jint int1 = *((const jint *) p1);
- const jint int2 = *((const jint *) p2);
-
- return (int1 == int2) ? 0 : (int1 < int2) ? -1 : 1;
-}
-
-static int
-cmpShort(const void *p1, const void *p2)
-{
- return (int)*((const jshort *) p1) - (int)*((const jshort *) p2);
-}
-
-static int
-cmpLong(const void *p1, const void *p2)
-{
- const jlong long1 = *((const jlong *) p1);
- const jlong long2 = *((const jlong *) p2);
-
- return (long1 == long2) ? 0 : (long1 < long2) ? -1 : 1;
-}
-
-void
-java_util_Arrays_sortByte(HArrayOfByte *a, jint fromIndex, jint toIndex)
-{
- qsort(&unhand_array(a)->body[fromIndex], (size_t)(toIndex - fromIndex),
- sizeof(*unhand_array(a)->body), cmpByte);
-}
-
-void
-java_util_Arrays_sortChar(HArrayOfChar *a, jint fromIndex, jint toIndex)
-{
- qsort(&unhand_array(a)->body[fromIndex], (size_t)(toIndex - fromIndex),
- sizeof(*unhand_array(a)->body), cmpChar);
-}
-
-void
-java_util_Arrays_sortDouble(HArrayOfDouble *a, jint fromIndex, jint toIndex)
-{
- qsort(&unhand_array(a)->body[fromIndex], (size_t)(toIndex - fromIndex),
- sizeof(*unhand_array(a)->body), cmpDouble);
-}
-
-void
-java_util_Arrays_sortFloat(HArrayOfFloat *a, jint fromIndex, jint toIndex)
-{
- qsort(&unhand_array(a)->body[fromIndex], (size_t)(toIndex - fromIndex),
- sizeof(*unhand_array(a)->body), cmpFloat);
-}
-
-void
-java_util_Arrays_sortInt(HArrayOfInt *a, jint fromIndex, jint toIndex)
-{
- qsort(&unhand_array(a)->body[fromIndex], (size_t)(toIndex - fromIndex),
- sizeof(*unhand_array(a)->body), cmpInt);
-}
-
-void
-java_util_Arrays_sortShort(HArrayOfShort *a, jint fromIndex, jint toIndex)
-{
- qsort(&unhand_array(a)->body[fromIndex], (size_t)(toIndex - fromIndex),
- sizeof(*unhand_array(a)->body), cmpShort);
-}
-
-void
-java_util_Arrays_sortLong(HArrayOfLong *a, jint fromIndex, jint toIndex)
-{
- qsort(&unhand_array(a)->body[fromIndex], (size_t)(toIndex - fromIndex),
- sizeof(*unhand_array(a)->body), cmpLong);
-}
-
-/*
- * Sorting object arrays with a Comparator
- *
- * This is less than elegant. We want to use the libc mergesort(), but we
- * get a race condition if we store the Comparator in a static variable.
- * So we allocate a "shadow" array and sort that instead, then copy the
- * object pointers back into the original array.
- */
-
-/* Shadow array element */
-struct objcmpinfo {
- struct Hjava_lang_Object *obj; /* the Object */
- struct Hjava_util_Comparator *cmp; /* the Comparator */
-};
-
-static int
-cmpObject(const void *p1, const void *p2)
-{
- const struct objcmpinfo *const o1 = (const struct objcmpinfo *) p1;
- const struct objcmpinfo *const o2 = (const struct objcmpinfo *) p2;
- jvalue rtn;
-
- do_execute_java_method(&rtn, o1->cmp, "compare",
- "(Ljava/lang/Object;Ljava/lang/Object;)I",
- NULL, false, o1->obj, o2->obj);
- return rtn.i;
-}
-
-void
-java_util_Arrays_sortObject(HArrayOfObject *a, jint fromIndex, jint toIndex, struct Hjava_util_Comparator *c)
-{
- int slen = toIndex - fromIndex;
- unsigned int len;
- struct objcmpinfo *ilist;
- errorInfo info;
- unsigned int k;
-
- if (slen <= 1) {
- return;
- }
- len = slen;
-
- /* Prepare shadow array */
- ilist = KMALLOC(len * sizeof(*ilist));
- if (ilist == NULL) {
- goto nomem;
- }
- for (k = 0; k < len; k++) {
- ilist[k].obj = unhand_array(a)->body[fromIndex + k];
- ilist[k].cmp = c;
- }
-
- /* Do the sort */
-#ifdef HAVE_MERGESORT
- if (mergesort(ilist, len, sizeof(*ilist), cmpObject) < 0) {
- KFREE(ilist);
- goto nomem;
- }
-#else
- qsort(ilist, len, sizeof(*ilist), cmpObject);
-#endif
-
- /* Copy back sorted results */
- for (k = 0; k < len; k++) {
- unhand_array(a)->body[fromIndex + k] = ilist[k].obj;
- }
- KFREE(ilist);
- return;
-
-nomem:
- postOutOfMemory(&info);
- throwError(&info);
-}
-
===================================================================
Checking out kaffe/libraries/clib/native/DateFormat.c
RCS: /home/cvs/kaffe/kaffe/libraries/clib/native/Attic/DateFormat.c,v
VERS: 1.6
***************
--- kaffe/libraries/clib/native/DateFormat.c Sun Feb 6 18:50:27 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,46 +0,0 @@
-/*
- * java.text.DateFormat.c
- *
- * Copyright (c) 1996, 1997, 1998
- * 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 "java_text_DateFormat.h"
-#include <time.h>
-
-#if defined(HAVE_STRFTIME)
-#define SIMPLETIME(S, T) strftime(S, sizeof(S), "%a %h %d %H:%M:%S %Z %Y", T)
-#define LOCALETIME(S, T) strftime(S, sizeof(S), "%a %h %d %H:%M:%S %Y", T)
-#define GMTTIME(S, T) strftime(S, sizeof(S), "%d %h %Y %H:%M:%S GMT", T)
-#else
-#define SIMPLETIME(S, T) strcpy(S, asctime(T)); S[strlen(S)-1] = 0
-#define LOCALETIME(S, T) strcpy(S, asctime(T)); S[strlen(S)-1] = 0
-#define GMTTIME(S, T) strcpy(S, asctime(T)); S[strlen(S)-1] = 0
-#endif
-
-Hjava_lang_String*
-java_text_DateFormat_format0(jlong _time, int fmt)
-{
- time_t date;
- char str[64];
-
- date = _time / 1000;
- switch (fmt) {
- case 0:
- SIMPLETIME(str, localtime(&date));
- break;
- case 1:
- LOCALETIME(str, localtime(&date));
- break;
- case 2:
- default:
- GMTTIME(str, localtime(&date));
- break;
- }
- return (checkPtr(stringC2Java(str)));
-}
Index: kaffe/libraries/clib/native/Makefile.am
diff -u kaffe/libraries/clib/native/Makefile.am:1.39 kaffe/libraries/clib/native/Makefile.am:1.40
--- kaffe/libraries/clib/native/Makefile.am:1.39 Sun Jan 30 12:42:45 2005
+++ kaffe/libraries/clib/native/Makefile.am Sun Feb 6 18:45:44 2005
@@ -53,14 +53,10 @@
SECURITY_SRCS = \
AccessController.c
-TEXT_SRCS = \
- DateFormat.c
-
TEST_SRCS = \
TestNative.c
UTIL_SRCS = \
- Arrays.c \
TimeZone.c
libnative_la_CFLAGS = \
@@ -79,6 +75,13 @@
libnative_la_LIBADD = $(M_LIBS) $(LTLIBICONV) \
$(libnative_la_DEPENDENCIES)
-libnative_la_SOURCES = $(IO_SRCS) $(LANG_SRCS) $(REFLECT_SRCS) $(SECURITY_SRCS) $(TEXT_SRCS) $(TEST_SRCS) $(UTIL_SRCS) $(REF_SRCS)
+libnative_la_SOURCES = \
+ $(IO_SRCS) \
+ $(LANG_SRCS) \
+ $(REFLECT_SRCS) \
+ $(SECURITY_SRCS) \
+ $(TEST_SRCS) \
+ $(UTIL_SRCS) \
+ $(REF_SRCS)
CLEANFILES = so_locations
Index: kaffe/libraries/clib/native/Makefile.in
diff -u kaffe/libraries/clib/native/Makefile.in:1.170 kaffe/libraries/clib/native/Makefile.in:1.171
--- kaffe/libraries/clib/native/Makefile.in:1.170 Sat Feb 5 17:47:29 2005
+++ kaffe/libraries/clib/native/Makefile.in Sun Feb 6 18:45:44 2005
@@ -110,13 +110,12 @@
am__objects_3 = libnative_la-Array.lo libnative_la-Constructor.lo \
libnative_la-Field.lo libnative_la-Method.lo
am__objects_4 = libnative_la-AccessController.lo
-am__objects_5 = libnative_la-DateFormat.lo
-am__objects_6 = libnative_la-TestNative.lo
-am__objects_7 = libnative_la-Arrays.lo libnative_la-TimeZone.lo
-am__objects_8 = libnative_la-java_lang_ref_Reference.lo
+am__objects_5 = libnative_la-TestNative.lo
+am__objects_6 = libnative_la-TimeZone.lo
+am__objects_7 = libnative_la-java_lang_ref_Reference.lo
am_libnative_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3) $(am__objects_4) $(am__objects_5) \
- $(am__objects_6) $(am__objects_7) $(am__objects_8)
+ $(am__objects_6) $(am__objects_7)
libnative_la_OBJECTS = $(am_libnative_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
@@ -452,14 +451,10 @@
SECURITY_SRCS = \
AccessController.c
-TEXT_SRCS = \
- DateFormat.c
-
TEST_SRCS = \
TestNative.c
UTIL_SRCS = \
- Arrays.c \
TimeZone.c
libnative_la_CFLAGS = \
@@ -478,7 +473,15 @@
libnative_la_LIBADD = $(M_LIBS) $(LTLIBICONV) \
$(libnative_la_DEPENDENCIES)
-libnative_la_SOURCES = $(IO_SRCS) $(LANG_SRCS) $(REFLECT_SRCS) $(SECURITY_SRCS) $(TEXT_SRCS) $(TEST_SRCS) $(UTIL_SRCS) $(REF_SRCS)
+libnative_la_SOURCES = \
+ $(IO_SRCS) \
+ $(LANG_SRCS) \
+ $(REFLECT_SRCS) \
+ $(SECURITY_SRCS) \
+ $(TEST_SRCS) \
+ $(UTIL_SRCS) \
+ $(REF_SRCS)
+
CLEANFILES = so_locations
all: all-am
@@ -551,7 +554,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-AccessController.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-Array.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-Arrays.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-ByteToCharDefault.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-ByteToCharIconv.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-CharToByteDefault.Plo at am__quote@
@@ -559,7 +561,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-Class.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-ClassLoader.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-Constructor.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-DateFormat.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-Double.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-Field.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnative_la-Float.Plo at am__quote@
@@ -784,26 +785,12 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnative_la_CFLAGS) $(CFLAGS) -c -o libnative_la-AccessController.lo `test -f 'AccessController.c' || echo '$(srcdir)/'`AccessController.c
-libnative_la-DateFormat.lo: DateFormat.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnative_la_CFLAGS) $(CFLAGS) -MT libnative_la-DateFormat.lo -MD -MP -MF "$(DEPDIR)/libnative_la-DateFormat.Tpo" -c -o libnative_la-DateFormat.lo `test -f 'DateFormat.c' || echo '$(srcdir)/'`DateFormat.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnative_la-DateFormat.Tpo" "$(DEPDIR)/libnative_la-DateFormat.Plo"; else rm -f "$(DEPDIR)/libnative_la-DateFormat.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='DateFormat.c' object='libnative_la-DateFormat.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnative_la_CFLAGS) $(CFLAGS) -c -o libnative_la-DateFormat.lo `test -f 'DateFormat.c' || echo '$(srcdir)/'`DateFormat.c
-
libnative_la-TestNative.lo: TestNative.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnative_la_CFLAGS) $(CFLAGS) -MT libnative_la-TestNative.lo -MD -MP -MF "$(DEPDIR)/libnative_la-TestNative.Tpo" -c -o libnative_la-TestNative.lo `test -f 'TestNative.c' || echo '$(srcdir)/'`TestNative.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnative_la-TestNative.Tpo" "$(DEPDIR)/libnative_la-TestNative.Plo"; else rm -f "$(DEPDIR)/libnative_la-TestNative.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='TestNative.c' object='libnative_la-TestNative.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnative_la_CFLAGS) $(CFLAGS) -c -o libnative_la-TestNative.lo `test -f 'TestNative.c' || echo '$(srcdir)/'`TestNative.c
-
-libnative_la-Arrays.lo: Arrays.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnative_la_CFLAGS) $(CFLAGS) -MT libnative_la-Arrays.lo -MD -MP -MF "$(DEPDIR)/libnative_la-Arrays.Tpo" -c -o libnative_la-Arrays.lo `test -f 'Arrays.c' || echo '$(srcdir)/'`Arrays.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnative_la-Arrays.Tpo" "$(DEPDIR)/libnative_la-Arrays.Plo"; else rm -f "$(DEPDIR)/libnative_la-Arrays.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Arrays.c' object='libnative_la-Arrays.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnative_la_CFLAGS) $(CFLAGS) -c -o libnative_la-Arrays.lo `test -f 'Arrays.c' || echo '$(srcdir)/'`Arrays.c
libnative_la-TimeZone.lo: TimeZone.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnative_la_CFLAGS) $(CFLAGS) -MT libnative_la-TimeZone.lo -MD -MP -MF "$(DEPDIR)/libnative_la-TimeZone.Tpo" -c -o libnative_la-TimeZone.lo `test -f 'TimeZone.c' || echo '$(srcdir)/'`TimeZone.c; \
More information about the kaffe
mailing list