From: Godmar Back (gback@cs.utah.edu)
Date: Sat Feb 13 1999 - 03:22:08 EST
Tim,
I append the diffs for your perusal. With these changes, it passes
the Alias test on Solaris. The drawback is that we now have to use
unhand_array instead of unhand for arrays. I tagged the cvs tree
before checking that stuff in.
- Godmar
cvs server: Diffing .
cvs server: Diffing FAQ
cvs server: Diffing NOTES
cvs server: Diffing config
cvs server: Diffing config/alpha
cvs server: Diffing config/alpha/linux
cvs server: Diffing config/alpha/netbsd1
cvs server: Diffing config/alpha/osf
cvs server: Diffing config/arm
cvs server: Diffing config/arm/linux
cvs server: Diffing config/arm/netbsd1
cvs server: Diffing config/i386
cvs server: Diffing config/i386/beos
cvs server: Diffing config/i386/bsdi
cvs server: Diffing config/i386/cygwin32
cvs server: Diffing config/i386/dgux
cvs server: Diffing config/i386/freebsd2
cvs server: Diffing config/i386/linux
cvs server: Diffing config/i386/netbsd1
cvs server: Diffing config/i386/nextstep3
cvs server: Diffing config/i386/openbsd2
cvs server: Diffing config/i386/oskit
cvs server: Diffing config/i386/qnx
cvs server: Diffing config/i386/sco3.2v5
cvs server: Diffing config/i386/solaris2
cvs server: Diffing config/i386/univel_svr4
cvs server: Diffing config/i386/win32
cvs server: Diffing config/i386/win32/cygnus
cvs server: Diffing config/m68k
cvs server: Diffing config/m68k/a-ux
cvs server: Diffing config/m68k/amigaos
cvs server: Diffing config/m68k/linux
cvs server: Diffing config/m68k/netbsd1
cvs server: Diffing config/m68k/nextstep3
cvs server: Diffing config/m68k/openbsd2
cvs server: Diffing config/m68k/sunos4
cvs server: Diffing config/mips
cvs server: Diffing config/mips/irix5
cvs server: Diffing config/mips/linux
cvs server: Diffing config/mips/netbsd1
cvs server: Diffing config/mips/ultrix4
cvs server: Diffing config/parisc
cvs server: Diffing config/parisc/hpux
cvs server: Diffing config/powerpc
cvs server: Diffing config/powerpc/aix
cvs server: Diffing config/powerpc/linux
cvs server: Diffing config/powerpc/machten
cvs server: Diffing config/sparc
cvs server: Diffing config/sparc/bsdi3
cvs server: Diffing config/sparc/linux
cvs server: Diffing config/sparc/netbsd1
cvs server: Diffing config/sparc/nextstep3
cvs server: Diffing config/sparc/openbsd2
cvs server: Diffing config/sparc/solaris2
cvs server: Diffing config/sparc/sunos4
cvs server: Diffing config/sparc/uxpds
cvs server: Diffing developers
cvs server: Diffing include
Index: include/Arrays.h
===================================================================
RCS file: /home/cvspublic/kaffe/include/Arrays.h,v
retrieving revision 1.2
diff -u -r1.2 Arrays.h
--- Arrays.h 1999/01/26 17:31:07 1.2
+++ Arrays.h 1999/02/13 09:15:12
@@ -28,5 +28,6 @@
/* Get length of arrays */
#define obj_length(_obj) ((_obj)->length)
+#define unhand_array(_arr) ((_arr)->data)
#endif
Index: include/java_lang_String.h
===================================================================
RCS file: /home/cvspublic/kaffe/include/java_lang_String.h,v
retrieving revision 1.2
diff -u -r1.2 java_lang_String.h
--- java_lang_String.h 1998/12/20 01:06:09 1.2
+++ java_lang_String.h 1999/02/13 09:15:12
@@ -10,14 +10,14 @@
/* Header for class java_lang_String */
-typedef struct Classjava_lang_String {
+typedef struct Hjava_lang_String {
+ Hjava_lang_Object base;
HArrayOfChar* value;
jint offset;
jint count;
jint hash;
jbool interned;
-} Classjava_lang_String;
-HandleTo(java_lang_String);
+} Hjava_lang_String;
extern struct Hjava_lang_String* java_lang_String_intern0(struct Hjava_lang_String*);
extern void java_lang_String_unintern0(struct Hjava_lang_String*);
Index: include/native.h
===================================================================
RCS file: /home/cvspublic/kaffe/include/native.h,v
retrieving revision 1.4
diff -u -r1.4 native.h
--- native.h 1998/12/22 07:43:04 1.4
+++ native.h 1999/02/13 09:15:12
@@ -40,15 +40,8 @@
#include <java_lang_Object.h>
-/* Build an object handle */
-#define HandleTo(class) \
- typedef struct H##class { \
- Hjava_lang_Object base; \
- struct Class##class data[1]; \
- } H##class
-
/* Turn a handle into the real thing */
-#define unhand(o) ((o)->data)
+#define unhand(o) (o)
/* Include array types */
#include "Arrays.h"
cvs server: Diffing kaffe
cvs server: Diffing kaffe/kaffe
cvs server: Diffing kaffe/kaffeh
Index: kaffe/kaffeh/support.c
===================================================================
RCS file: /home/cvspublic/kaffe/kaffe/kaffeh/support.c,v
retrieving revision 1.17
diff -u -r1.17 support.c
--- support.c 1999/02/08 21:12:35 1.17
+++ support.c 1999/02/13 09:15:12
@@ -194,7 +194,8 @@
fprintf(include, "\n");
fprintf(include, "/* Header for class %s */\n", className);
fprintf(include, "\n");
- fprintf(include, "typedef struct Class%s {\n", className);
+ fprintf(include, "typedef struct H%s {\n", className);
+ fprintf(include, " Hjava_lang_Object base;\n");
}
/*
@@ -279,11 +280,12 @@
}
if (objectDepth == 0) {
+#if 0
if (argpos == 0) {
fprintf(include, "\tint __DUMMY__;\n");
}
- fprintf(include, "} Class%s;\n", className);
- fprintf(include, "HandleTo(%s);\n\n", className);
+#endif
+ fprintf(include, "} H%s;\n\n", className);
}
}
cvs server: Diffing kaffe/kaffevm
Index: kaffe/kaffevm/classMethod.c
===================================================================
RCS file: /home/cvspublic/kaffe/kaffe/kaffevm/classMethod.c,v
retrieving revision 1.41
diff -u -r1.41 classMethod.c
--- classMethod.c 1999/02/06 07:31:32 1.41
+++ classMethod.c 1999/02/13 09:15:13
@@ -1020,9 +1020,12 @@
maxalign = fsize;
}
}
-
+#if 0
/* Align start of this class's data */
- offset = ((offset + maxalign - 1) / maxalign) * maxalign;
+ if (oldoffset == 0) {
+ offset = ((offset + maxalign - 1) / maxalign) * maxalign;
+ }
+#endif
/* Now work out where to put each field */
fld = CLASS_IFIELDS(class);
@@ -1059,8 +1062,12 @@
}
class->gc_layout = map;
+#if 0
/* Find and align start of object */
- offset = ((offset + maxalign - 1) / maxalign) * maxalign;
+ if (oldoffset == 0) {
+ offset = ((offset + maxalign - 1) / maxalign) * maxalign;
+ }
+#endif
nbits = offset/ALIGNMENTOF_VOIDP;
DBG(GCPRECISE,
Index: kaffe/kaffevm/jni.c
===================================================================
RCS file: /home/cvspublic/kaffe/kaffe/kaffevm/jni.c,v
retrieving revision 1.29
diff -u -r1.29 jni.c
--- jni.c 1999/02/03 01:57:26 1.29
+++ jni.c 1999/02/13 09:15:13
@@ -2543,7 +2543,7 @@
unhand(str)->count = len;
unhand(str)->value = (HArrayOfChar*)newArray(TYPE_CLASS(TYPE_Char), len);
unhand(str)->interned = 0;
- memcpy(unhand(unhand(str)->value)->body, data, len * sizeof(jchar));
+ memcpy(STRING_DATA(str), data, len * sizeof(jchar));
END_EXCEPTION_HANDLING();
return (str);
@@ -2703,7 +2703,7 @@
/* I assume this is what init is for */
for (i = 0; i < len; i++) {
- unhand(obj)->body[i] = (Hjava_lang_Object*)init;
+ unhand_array(obj)->body[i] = (Hjava_lang_Object*)init;
}
ADD_REF(obj);
@@ -2721,7 +2721,7 @@
if (elem >= obj_length((HArrayOfObject*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- obj = unhand((HArrayOfObject*)arr)->body[elem];
+ obj = unhand_array((HArrayOfObject*)arr)->body[elem];
ADD_REF(obj);
END_EXCEPTION_HANDLING();
@@ -2736,7 +2736,7 @@
if (elem >= obj_length((HArrayOfObject*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- unhand((HArrayOfObject*)arr)->body[elem] = (Hjava_lang_Object*)val;
+ unhand_array((HArrayOfObject*)arr)->body[elem] = (Hjava_lang_Object*)val;
END_EXCEPTION_HANDLING();
}
@@ -2862,7 +2862,7 @@
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
}
- ret = unhand((HArrayOfBoolean*)arr)->body;
+ ret = unhand_array((HArrayOfBoolean*)arr)->body;
END_EXCEPTION_HANDLING();
return (ret);
@@ -2877,7 +2877,7 @@
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
}
- ret = unhand((HArrayOfByte*)arr)->body;
+ ret = unhand_array((HArrayOfByte*)arr)->body;
END_EXCEPTION_HANDLING();
return (ret);
@@ -2892,7 +2892,7 @@
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
}
- ret = unhand((HArrayOfChar*)arr)->body;
+ ret = unhand_array((HArrayOfChar*)arr)->body;
END_EXCEPTION_HANDLING();
return (ret);
@@ -2907,7 +2907,7 @@
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
}
- ret = unhand((HArrayOfShort*)arr)->body;
+ ret = unhand_array((HArrayOfShort*)arr)->body;
END_EXCEPTION_HANDLING();
return (ret);
@@ -2922,7 +2922,7 @@
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
}
- ret = unhand((HArrayOfInt*)arr)->body;
+ ret = unhand_array((HArrayOfInt*)arr)->body;
END_EXCEPTION_HANDLING();
return (ret);
@@ -2937,7 +2937,7 @@
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
}
- ret = unhand((HArrayOfLong*)arr)->body;
+ ret = unhand_array((HArrayOfLong*)arr)->body;
END_EXCEPTION_HANDLING();
return (ret);
@@ -2952,7 +2952,7 @@
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
}
- ret = unhand((HArrayOfFloat*)arr)->body;
+ ret = unhand_array((HArrayOfFloat*)arr)->body;
END_EXCEPTION_HANDLING();
return (ret);
@@ -2967,7 +2967,7 @@
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
}
- ret = unhand((HArrayOfDouble*)arr)->body;
+ ret = unhand_array((HArrayOfDouble*)arr)->body;
END_EXCEPTION_HANDLING();
return (ret);
@@ -2978,13 +2978,13 @@
{
BEGIN_EXCEPTION_HANDLING_VOID();
- if (elems != unhand((HArrayOfBoolean*)arr)->body) {
+ if (elems != unhand_array((HArrayOfBoolean*)arr)->body) {
switch (mode) {
case JNI_COMMIT:
- memcpy(unhand((HArrayOfBoolean*)arr)->body, elems, obj_length((HArrayOfBoolean*)arr) * sizeof(jboolean));
+ memcpy(unhand_array((HArrayOfBoolean*)arr)->body, elems, obj_length((HArrayOfBoolean*)arr) * sizeof(jboolean));
break;
case 0:
- memcpy(unhand((HArrayOfBoolean*)arr)->body, elems, obj_length((HArrayOfBoolean*)arr) * sizeof(jboolean));
+ memcpy(unhand_array((HArrayOfBoolean*)arr)->body, elems, obj_length((HArrayOfBoolean*)arr) * sizeof(jboolean));
KFREE(elems);
break;
case JNI_ABORT:
@@ -3000,13 +3000,13 @@
{
BEGIN_EXCEPTION_HANDLING_VOID();
- if (elems != unhand((HArrayOfByte*)arr)->body) {
+ if (elems != unhand_array((HArrayOfByte*)arr)->body) {
switch (mode) {
case JNI_COMMIT:
- memcpy(unhand((HArrayOfByte*)arr)->body, elems, obj_length((HArrayOfByte*)arr) * sizeof(jbyte));
+ memcpy(unhand_array((HArrayOfByte*)arr)->body, elems, obj_length((HArrayOfByte*)arr) * sizeof(jbyte));
break;
case 0:
- memcpy(unhand((HArrayOfByte*)arr)->body, elems, obj_length((HArrayOfByte*)arr) * sizeof(jbyte));
+ memcpy(unhand_array((HArrayOfByte*)arr)->body, elems, obj_length((HArrayOfByte*)arr) * sizeof(jbyte));
KFREE(elems);
break;
case JNI_ABORT:
@@ -3022,13 +3022,13 @@
{
BEGIN_EXCEPTION_HANDLING_VOID();
- if (elems != unhand((HArrayOfChar*)arr)->body) {
+ if (elems != unhand_array((HArrayOfChar*)arr)->body) {
switch (mode) {
case JNI_COMMIT:
- memcpy(unhand((HArrayOfChar*)arr)->body, elems, obj_length((HArrayOfChar*)arr) * sizeof(jchar));
+ memcpy(unhand_array((HArrayOfChar*)arr)->body, elems, obj_length((HArrayOfChar*)arr) * sizeof(jchar));
break;
case 0:
- memcpy(unhand((HArrayOfChar*)arr)->body, elems, obj_length((HArrayOfChar*)arr) * sizeof(jchar));
+ memcpy(unhand_array((HArrayOfChar*)arr)->body, elems, obj_length((HArrayOfChar*)arr) * sizeof(jchar));
KFREE(elems);
break;
case JNI_ABORT:
@@ -3044,13 +3044,13 @@
{
BEGIN_EXCEPTION_HANDLING_VOID();
- if (elems != unhand((HArrayOfShort*)arr)->body) {
+ if (elems != unhand_array((HArrayOfShort*)arr)->body) {
switch (mode) {
case JNI_COMMIT:
- memcpy(unhand((HArrayOfShort*)arr)->body, elems, obj_length((HArrayOfShort*)arr) * sizeof(jshort));
+ memcpy(unhand_array((HArrayOfShort*)arr)->body, elems, obj_length((HArrayOfShort*)arr) * sizeof(jshort));
break;
case 0:
- memcpy(unhand((HArrayOfShort*)arr)->body, elems, obj_length((HArrayOfShort*)arr) * sizeof(jshort));
+ memcpy(unhand_array((HArrayOfShort*)arr)->body, elems, obj_length((HArrayOfShort*)arr) * sizeof(jshort));
KFREE(elems);
break;
case JNI_ABORT:
@@ -3066,13 +3066,13 @@
{
BEGIN_EXCEPTION_HANDLING_VOID();
- if (elems != unhand((HArrayOfInt*)arr)->body) {
+ if (elems != unhand_array((HArrayOfInt*)arr)->body) {
switch (mode) {
case JNI_COMMIT:
- memcpy(unhand((HArrayOfInt*)arr)->body, elems, obj_length((HArrayOfInt*)arr) * sizeof(jint));
+ memcpy(unhand_array((HArrayOfInt*)arr)->body, elems, obj_length((HArrayOfInt*)arr) * sizeof(jint));
break;
case 0:
- memcpy(unhand((HArrayOfInt*)arr)->body, elems, obj_length((HArrayOfInt*)arr) * sizeof(jint));
+ memcpy(unhand_array((HArrayOfInt*)arr)->body, elems, obj_length((HArrayOfInt*)arr) * sizeof(jint));
KFREE(elems);
break;
case JNI_ABORT:
@@ -3088,13 +3088,13 @@
{
BEGIN_EXCEPTION_HANDLING_VOID();
- if (elems != unhand((HArrayOfLong*)arr)->body) {
+ if (elems != unhand_array((HArrayOfLong*)arr)->body) {
switch (mode) {
case JNI_COMMIT:
- memcpy(unhand((HArrayOfLong*)arr)->body, elems, obj_length((HArrayOfLong*)arr) * sizeof(jlong));
+ memcpy(unhand_array((HArrayOfLong*)arr)->body, elems, obj_length((HArrayOfLong*)arr) * sizeof(jlong));
break;
case 0:
- memcpy(unhand((HArrayOfLong*)arr)->body, elems, obj_length((HArrayOfLong*)arr) * sizeof(jlong));
+ memcpy(unhand_array((HArrayOfLong*)arr)->body, elems, obj_length((HArrayOfLong*)arr) * sizeof(jlong));
KFREE(elems);
break;
case JNI_ABORT:
@@ -3110,13 +3110,13 @@
{
BEGIN_EXCEPTION_HANDLING_VOID();
- if (elems != unhand((HArrayOfFloat*)arr)->body) {
+ if (elems != unhand_array((HArrayOfFloat*)arr)->body) {
switch (mode) {
case JNI_COMMIT:
- memcpy(unhand((HArrayOfFloat*)arr)->body, elems, obj_length((HArrayOfFloat*)arr) * sizeof(jfloat));
+ memcpy(unhand_array((HArrayOfFloat*)arr)->body, elems, obj_length((HArrayOfFloat*)arr) * sizeof(jfloat));
break;
case 0:
- memcpy(unhand((HArrayOfFloat*)arr)->body, elems, obj_length((HArrayOfFloat*)arr) * sizeof(jfloat));
+ memcpy(unhand_array((HArrayOfFloat*)arr)->body, elems, obj_length((HArrayOfFloat*)arr) * sizeof(jfloat));
KFREE(elems);
break;
case JNI_ABORT:
@@ -3132,13 +3132,13 @@
{
BEGIN_EXCEPTION_HANDLING_VOID();
- if (elems != unhand((HArrayOfDouble*)arr)->body) {
+ if (elems != unhand_array((HArrayOfDouble*)arr)->body) {
switch (mode) {
case JNI_COMMIT:
- memcpy(unhand((HArrayOfDouble*)arr)->body, elems, obj_length((HArrayOfDouble*)arr) * sizeof(jdouble));
+ memcpy(unhand_array((HArrayOfDouble*)arr)->body, elems, obj_length((HArrayOfDouble*)arr) * sizeof(jdouble));
break;
case 0:
- memcpy(unhand((HArrayOfDouble*)arr)->body, elems, obj_length((HArrayOfDouble*)arr) * sizeof(jdouble));
+ memcpy(unhand_array((HArrayOfDouble*)arr)->body, elems, obj_length((HArrayOfDouble*)arr) * sizeof(jdouble));
KFREE(elems);
break;
case JNI_ABORT:
@@ -3157,7 +3157,7 @@
if (start >= obj_length((HArrayOfBoolean*)arr) || start + len > obj_length((HArrayOfBoolean*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(data, &unhand((HArrayOfBoolean*)arr)->body[start], len * sizeof(jboolean));
+ memcpy(data, &unhand_array((HArrayOfBoolean*)arr)->body[start], len * sizeof(jboolean));
END_EXCEPTION_HANDLING();
}
@@ -3170,7 +3170,7 @@
if (start >= obj_length((HArrayOfByte*)arr) || start + len > obj_length((HArrayOfByte*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(data, &unhand((HArrayOfByte*)arr)->body[start], len * sizeof(jbyte));
+ memcpy(data, &unhand_array((HArrayOfByte*)arr)->body[start], len * sizeof(jbyte));
END_EXCEPTION_HANDLING();
}
@@ -3183,7 +3183,7 @@
if (start >= obj_length((HArrayOfChar*)arr) || start + len > obj_length((HArrayOfChar*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(data, &unhand((HArrayOfChar*)arr)->body[start], len * sizeof(jchar));
+ memcpy(data, &unhand_array((HArrayOfChar*)arr)->body[start], len * sizeof(jchar));
END_EXCEPTION_HANDLING();
}
@@ -3196,7 +3196,7 @@
if (start >= obj_length((HArrayOfShort*)arr) || start + len > obj_length((HArrayOfShort*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(data, &unhand((HArrayOfShort*)arr)->body[start], len * sizeof(jshort));
+ memcpy(data, &unhand_array((HArrayOfShort*)arr)->body[start], len * sizeof(jshort));
END_EXCEPTION_HANDLING();
}
@@ -3209,7 +3209,7 @@
if (start >= obj_length((HArrayOfInt*)arr) || start + len > obj_length((HArrayOfInt*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(data, &unhand((HArrayOfInt*)arr)->body[start], len * sizeof(jint));
+ memcpy(data, &unhand_array((HArrayOfInt*)arr)->body[start], len * sizeof(jint));
END_EXCEPTION_HANDLING();
}
@@ -3222,7 +3222,7 @@
if (start >= obj_length((HArrayOfLong*)arr) || start + len > obj_length((HArrayOfLong*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(data, &unhand((HArrayOfLong*)arr)->body[start], len * sizeof(jlong));
+ memcpy(data, &unhand_array((HArrayOfLong*)arr)->body[start], len * sizeof(jlong));
END_EXCEPTION_HANDLING();
}
@@ -3235,7 +3235,7 @@
if (start >= obj_length((HArrayOfFloat*)arr) || start + len > obj_length((HArrayOfFloat*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(data, &unhand((HArrayOfFloat*)arr)->body[start], len * sizeof(jfloat));
+ memcpy(data, &unhand_array((HArrayOfFloat*)arr)->body[start], len * sizeof(jfloat));
END_EXCEPTION_HANDLING();
}
@@ -3248,7 +3248,7 @@
if (start >= obj_length((HArrayOfDouble*)arr) || start + len > obj_length((HArrayOfDouble*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(data, &unhand((HArrayOfDouble*)arr)->body[start], len * sizeof(jdouble));
+ memcpy(data, &unhand_array((HArrayOfDouble*)arr)->body[start], len * sizeof(jdouble));
END_EXCEPTION_HANDLING();
}
@@ -3261,7 +3261,7 @@
if (start >= obj_length((HArrayOfBoolean*)arr) || start+len > obj_length((HArrayOfBoolean*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(&unhand((HArrayOfBoolean*)arr)->body[start], data, len * sizeof(jboolean));
+ memcpy(&unhand_array((HArrayOfBoolean*)arr)->body[start], data, len * sizeof(jboolean));
END_EXCEPTION_HANDLING();
}
@@ -3274,7 +3274,7 @@
if (start >= obj_length((HArrayOfByte*)arr) || start+len > obj_length((HArrayOfByte*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(&unhand((HArrayOfByte*)arr)->body[start], data, len * sizeof(jbyte));
+ memcpy(&unhand_array((HArrayOfByte*)arr)->body[start], data, len * sizeof(jbyte));
END_EXCEPTION_HANDLING();
}
@@ -3287,7 +3287,7 @@
if (start >= obj_length((HArrayOfChar*)arr) || start+len > obj_length((HArrayOfChar*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(&unhand((HArrayOfChar*)arr)->body[start], data, len * sizeof(jchar));
+ memcpy(&unhand_array((HArrayOfChar*)arr)->body[start], data, len * sizeof(jchar));
END_EXCEPTION_HANDLING();
}
@@ -3300,7 +3300,7 @@
if (start >= obj_length((HArrayOfShort*)arr) || start+len > obj_length((HArrayOfShort*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(&unhand((HArrayOfShort*)arr)->body[start], data, len * sizeof(jshort));
+ memcpy(&unhand_array((HArrayOfShort*)arr)->body[start], data, len * sizeof(jshort));
END_EXCEPTION_HANDLING();
}
@@ -3313,7 +3313,7 @@
if (start >= obj_length((HArrayOfInt*)arr) || start+len > obj_length((HArrayOfInt*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(&unhand((HArrayOfInt*)arr)->body[start], data, len * sizeof(jint));
+ memcpy(&unhand_array((HArrayOfInt*)arr)->body[start], data, len * sizeof(jint));
END_EXCEPTION_HANDLING();
}
@@ -3326,7 +3326,7 @@
if (start >= obj_length((HArrayOfLong*)arr) || start+len > obj_length((HArrayOfLong*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(&unhand((HArrayOfLong*)arr)->body[start], data, len * sizeof(jlong));
+ memcpy(&unhand_array((HArrayOfLong*)arr)->body[start], data, len * sizeof(jlong));
END_EXCEPTION_HANDLING();
}
@@ -3339,7 +3339,7 @@
if (start >= obj_length((HArrayOfFloat*)arr) || start+len > obj_length((HArrayOfFloat*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(&unhand((HArrayOfFloat*)arr)->body[start], data, len * sizeof(jfloat));
+ memcpy(&unhand_array((HArrayOfFloat*)arr)->body[start], data, len * sizeof(jfloat));
END_EXCEPTION_HANDLING();
}
@@ -3352,7 +3352,7 @@
if (start >= obj_length((HArrayOfDouble*)arr) || start+len > obj_length((HArrayOfDouble*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
}
- memcpy(&unhand((HArrayOfDouble*)arr)->body[start], data, len * sizeof(jdouble));
+ memcpy(&unhand_array((HArrayOfDouble*)arr)->body[start], data, len * sizeof(jdouble));
END_EXCEPTION_HANDLING();
}
Index: kaffe/kaffevm/string.c
===================================================================
RCS file: /home/cvspublic/kaffe/kaffe/kaffevm/string.c,v
retrieving revision 1.12
diff -u -r1.12 string.c
--- string.c 1999/01/25 18:26:31 1.12
+++ string.c 1999/02/13 09:15:14
@@ -117,7 +117,7 @@
/* Convert C chars to Java chars */
for (k = 0; k < len; k++) {
- unhand(ary)->body[k] = (unsigned char) cs[k];
+ unhand_array(ary)->body[k] = (unsigned char) cs[k];
}
return(ary);
}
@@ -338,7 +338,7 @@
fakeAry = (HArrayOfChar*)buf;
}
memset(fakeAry, 0, sizeof(*fakeAry));
- memcpy(unhand(fakeAry)->body, data, len * sizeof(*data));
+ memcpy(unhand_array(fakeAry)->body, data, len * sizeof(*data));
obj_length(fakeAry) = len;
/* Attach fake array to fake string */
Index: kaffe/kaffevm/stringSupport.h
===================================================================
RCS file: /home/cvspublic/kaffe/kaffe/kaffevm/stringSupport.h,v
retrieving revision 1.6
diff -u -r1.6 stringSupport.h
--- stringSupport.h 1999/01/25 18:26:31 1.6
+++ stringSupport.h 1999/02/13 09:15:14
@@ -20,7 +20,7 @@
#define STRING_SIZE(STR) (unhand(STR)->count)
#define STRING_DATA(STR) \
- (&(unhand(unhand(STR)->value)->body[unhand(STR)->offset]))
+ (&(unhand_array(unhand(STR)->value)->body[unhand(STR)->offset]))
/* Create a String object from the supplied C (not UTF-8!) string */
extern Hjava_lang_String* stringC2Java(const char*);
cvs server: Diffing kaffe/kaffevm/intrp
cvs server: Diffing kaffe/kaffevm/jit
cvs server: Diffing kaffe/kaffevm/mem
Index: kaffe/kaffevm/mem/gc-mem.c
===================================================================
RCS file: /home/cvspublic/kaffe/kaffe/kaffevm/mem/gc-mem.c,v
retrieving revision 1.24
diff -u -r1.24 gc-mem.c
--- gc-mem.c 1999/02/04 07:33:26 1.24
+++ gc-mem.c 1999/02/13 09:15:14
@@ -107,7 +107,8 @@
static void
printslack(void)
{
- printf("allocated %d small objects, total slack %d, slack/per "
+ fprintf(stderr,
+ "allocated %d small objects, total slack %d, slack/per "
"object %8.2f\n",
totalsmallobjs, totalslack, totalslack/(double)totalsmallobjs);
}
@@ -122,7 +123,7 @@
for (i = 0; i < NR_FREELISTS; i++) {
gc_block* blk = freelist[i].list;
- if (blk == 0 || blk == 0xffffffff) {
+ if (blk == 0 || blk == (gc_block*)0xffffffff) {
continue;
} else {
gc_freeobj* mem = blk->free;
cvs server: Diffing kaffe/kaffevm/mem/block.new
cvs server: Diffing kaffe/kaffevm/mem/block.old
cvs server: Diffing kaffe/kaffevm/systems
cvs server: Diffing kaffe/kaffevm/systems/beos-native
cvs server: Diffing kaffe/kaffevm/systems/linux-threads
cvs server: Diffing kaffe/kaffevm/systems/oskit-pthreads
cvs server: Diffing kaffe/kaffevm/systems/unix-internal
cvs server: Diffing kaffe/kaffevm/systems/unix-jthreads
cvs server: Diffing kaffe/man
cvs server: Diffing kaffe/scripts
cvs server: Diffing kaffe/scripts/bat
cvs server: Diffing kaffe/scripts/compat
cvs server: Diffing libltdl
cvs server: Diffing libraries
cvs server: Diffing libraries/clib
cvs server: Diffing libraries/clib/awt
cvs server: Diffing libraries/clib/awt/X
cvs server: Diffing libraries/clib/io
Index: libraries/clib/io/File.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/io/File.c,v
retrieving revision 1.8
diff -u -r1.8 File.c
--- File.c 1999/02/08 05:07:15 1.8
+++ File.c 1999/02/13 09:15:15
@@ -266,7 +266,7 @@
for (i = 0; i < count; i++) {
mentry = dirlist;
dirlist = mentry->next;
- unhand(array)->body[i] = (Hjava_lang_Object*)stringC2Java(mentry->name);
+ unhand_array(array)->body[i] = (Hjava_lang_Object*)stringC2Java(mentry->name);
KFREE(mentry);
}
Index: libraries/clib/io/FileInputStream.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/io/FileInputStream.c,v
retrieving revision 1.7
diff -u -r1.7 FileInputStream.c
--- FileInputStream.c 1999/02/08 05:07:15 1.7
+++ FileInputStream.c 1999/02/13 09:15:15
@@ -65,7 +65,7 @@
int rc;
ssize_t ret;
- rc = KREAD(unhand(unhand(fh)->fd)->fd, &unhand(bytes)->body[off], len, &ret);
+ rc = KREAD(unhand(unhand(fh)->fd)->fd, &unhand_array(bytes)->body[off], len, &ret);
if (rc) {
SignalError("java.io.IOException", SYS_ERROR(rc));
}
Index: libraries/clib/io/FileOutputStream.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/io/FileOutputStream.c,v
retrieving revision 1.6
diff -u -r1.6 FileOutputStream.c
--- FileOutputStream.c 1999/02/08 05:07:16 1.6
+++ FileOutputStream.c 1999/02/13 09:15:15
@@ -88,7 +88,7 @@
ssize_t bwritten;
fd = unhand(unhand(fh)->fd)->fd;
- r = KWRITE(fd, &unhand(byteArray)->body[start], len, &bwritten);
+ r = KWRITE(fd, &unhand_array(byteArray)->body[start], len, &bwritten);
if (r) {
SignalError("java.io.IOException", SYS_ERROR(r));
}
Index: libraries/clib/io/RandomAccessFile.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/io/RandomAccessFile.c,v
retrieving revision 1.6
diff -u -r1.6 RandomAccessFile.c
--- RandomAccessFile.c 1999/02/08 05:07:17 1.6
+++ RandomAccessFile.c 1999/02/13 09:15:15
@@ -85,7 +85,7 @@
/* Adjust length */
len = (len < obj_length(bytes) - off ? len : obj_length(bytes) - off);
- rc = KREAD(unhand(unhand(this)->fd)->fd, &unhand(bytes)->body[off], len, &ret);
+ rc = KREAD(unhand(unhand(this)->fd)->fd, &unhand_array(bytes)->body[off], len, &ret);
if (rc) {
SignalError("java.io.IOException", SYS_ERROR(rc));
}
@@ -137,7 +137,7 @@
int rc;
ssize_t bwritten;
- rc = KWRITE(unhand(unhand(this)->fd)->fd, &unhand(bytes)->body[off], len, &bwritten);
+ rc = KWRITE(unhand(unhand(this)->fd)->fd, &unhand_array(bytes)->body[off], len, &bwritten);
if (rc) {
SignalError("java.io.IOException", SYS_ERROR(rc));
}
cvs server: Diffing libraries/clib/management
cvs server: Diffing libraries/clib/math
cvs server: Diffing libraries/clib/native
Index: libraries/clib/native/Array.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/native/Array.c,v
retrieving revision 1.12
diff -u -r1.12 Array.c
--- Array.c 1999/02/12 13:37:50 1.12
+++ Array.c 1999/02/13 09:15:15
@@ -53,7 +53,7 @@
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
return execute_java_constructor(0,javaLangIntegerClass,"(I)V",
- (jint)(unhand(arr)->body[elem]));
+ (jint)(unhand_array(arr)->body[elem]));
}
else if ( clazz == shortClass ) {
HArrayOfShort *arr = (HArrayOfShort *)obj;
@@ -61,7 +61,7 @@
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
return execute_java_constructor(0,javaLangShortClass,"(S)V",
- (jint)(unhand(arr)->body[elem]));
+ (jint)(unhand_array(arr)->body[elem]));
}
else if ( clazz == longClass ) {
HArrayOfLong *arr = (HArrayOfLong *)obj;
@@ -69,7 +69,7 @@
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
return execute_java_constructor(0,javaLangLongClass,"(J)V",
- (jlong)(unhand(arr)->body[elem]));
+ (jlong)(unhand_array(arr)->body[elem]));
}
else if ( clazz == byteClass ) {
HArrayOfByte *arr = (HArrayOfByte *)obj;
@@ -77,7 +77,7 @@
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
return execute_java_constructor(0,javaLangByteClass,"(B)V",
- (jint)(unhand(arr)->body[elem]));
+ (jint)(unhand_array(arr)->body[elem]));
}
else if ( clazz == booleanClass ) {
HArrayOfBoolean *arr = (HArrayOfBoolean *)obj;
@@ -85,7 +85,7 @@
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
return execute_java_constructor(0,javaLangBooleanClass,"(Z)V",
- (jint)(unhand(arr)->body[elem]));
+ (jint)(unhand_array(arr)->body[elem]));
}
else if ( clazz == charClass ) {
HArrayOfChar *arr = (HArrayOfChar *)obj;
@@ -93,7 +93,7 @@
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
return execute_java_constructor(0,javaLangCharacterClass,"(C)V",
- (jint)(unhand(arr)->body[elem]));
+ (jint)(unhand_array(arr)->body[elem]));
}
else if ( clazz == floatClass ) {
HArrayOfFloat *arr = (HArrayOfFloat *)obj;
@@ -101,7 +101,7 @@
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
return execute_java_constructor(0,javaLangFloatClass,"(F)V",
- (jfloat)(unhand(arr)->body[elem]));
+ (jfloat)(unhand_array(arr)->body[elem]));
}
else if ( clazz == doubleClass ) {
HArrayOfDouble *arr = (HArrayOfDouble *)obj;
@@ -109,7 +109,7 @@
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
return execute_java_constructor(0,javaLangDoubleClass,"(D)V",
- (jdouble)(unhand(arr)->body[elem]));
+ (jdouble)(unhand_array(arr)->body[elem]));
}
else {
/* If clazz isn't one of the above then it's either a
@@ -120,7 +120,7 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
}
}
@@ -139,7 +139,7 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -160,7 +160,7 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -181,13 +181,13 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == byteClass ) {
HArrayOfByte *arr = (HArrayOfByte *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -208,13 +208,13 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == byteClass ) {
HArrayOfByte *arr = (HArrayOfByte *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -235,25 +235,25 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == shortClass ) {
HArrayOfShort *arr = (HArrayOfShort *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == charClass ) {
HArrayOfChar *arr = (HArrayOfChar *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == byteClass ) {
HArrayOfByte *arr = (HArrayOfByte *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -274,31 +274,31 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == intClass ) {
HArrayOfInt *arr = (HArrayOfInt *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == shortClass ) {
HArrayOfShort *arr = (HArrayOfShort *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == charClass ) {
HArrayOfChar *arr = (HArrayOfChar *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == byteClass ) {
HArrayOfByte *arr = (HArrayOfByte *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -319,37 +319,37 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == longClass ) {
HArrayOfLong *arr = (HArrayOfLong *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == intClass ) {
HArrayOfInt *arr = (HArrayOfInt *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == shortClass ) {
HArrayOfShort *arr = (HArrayOfShort *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == charClass ) {
HArrayOfChar *arr = (HArrayOfChar *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == byteClass ) {
HArrayOfByte *arr = (HArrayOfByte *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -370,43 +370,43 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == floatClass ) {
HArrayOfFloat *arr = (HArrayOfFloat *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == longClass ) {
HArrayOfLong *arr = (HArrayOfLong *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == intClass ) {
HArrayOfInt *arr = (HArrayOfInt *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == shortClass ) {
HArrayOfShort *arr = (HArrayOfShort *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == charClass ) {
HArrayOfChar *arr = (HArrayOfChar *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else if ( clazz == byteClass ) {
HArrayOfByte *arr = (HArrayOfByte *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- return unhand(arr)->body[elem];
+ return unhand_array(arr)->body[elem];
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -426,7 +426,7 @@
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
if (val == NULL || soft_instanceof(CLASS_ELEMENT_TYPE(OBJECT_CLASS(obj)), val)) {
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -478,7 +478,7 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -499,43 +499,43 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == shortClass ) {
HArrayOfShort *arr = (HArrayOfShort *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == charClass ) {
HArrayOfChar *arr = (HArrayOfChar *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == intClass ) {
HArrayOfInt *arr = (HArrayOfInt *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == longClass ) {
HArrayOfLong *arr = (HArrayOfLong *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == floatClass ) {
HArrayOfFloat *arr = (HArrayOfFloat *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == doubleClass ) {
HArrayOfDouble *arr = (HArrayOfDouble *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -556,31 +556,31 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == intClass ) {
HArrayOfInt *arr = (HArrayOfInt *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == longClass ) {
HArrayOfLong *arr = (HArrayOfLong *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == floatClass ) {
HArrayOfFloat *arr = (HArrayOfFloat *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == doubleClass ) {
HArrayOfDouble *arr = (HArrayOfDouble *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -601,31 +601,31 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == intClass ) {
HArrayOfInt *arr = (HArrayOfInt *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == longClass ) {
HArrayOfLong *arr = (HArrayOfLong *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == floatClass ) {
HArrayOfFloat *arr = (HArrayOfFloat *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == doubleClass ) {
HArrayOfDouble *arr = (HArrayOfDouble *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -646,25 +646,25 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == longClass ) {
HArrayOfLong *arr = (HArrayOfLong *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == floatClass ) {
HArrayOfFloat *arr = (HArrayOfFloat *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == doubleClass ) {
HArrayOfDouble *arr = (HArrayOfDouble *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -685,19 +685,19 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == floatClass ) {
HArrayOfFloat *arr = (HArrayOfFloat *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == doubleClass ) {
HArrayOfDouble *arr = (HArrayOfDouble *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -718,13 +718,13 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else if ( clazz == doubleClass ) {
HArrayOfDouble *arr = (HArrayOfDouble *)obj;
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -745,7 +745,7 @@
if (elem < 0 || elem >= obj_length(arr))
SignalError("java.lang.ArrayIndexOutOfBoundsException", "");
- unhand(arr)->body[elem] = val;
+ unhand_array(arr)->body[elem] = val;
} else {
SignalError("java.lang.IllegalArgumentException", "");
}
@@ -779,7 +779,7 @@
/* Copy dimentions into array */
for( i = 0; i < s; i++ ) {
- dims[i] = unhand(sizes)->body[i];
+ dims[i] = unhand_array(sizes)->body[i];
if (dims[i] < 0) {
SignalError("java.lang.NegativeArraySizeException", "");
}
Index: libraries/clib/native/Class.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/native/Class.c,v
retrieving revision 1.34
diff -u -r1.34 Class.c
--- Class.c 1999/02/08 05:07:18 1.34
+++ Class.c 1999/02/13 09:15:16
@@ -235,7 +235,7 @@
nr = 0;
obj = (HArrayOfObject*)AllocObjectArray(nr, "Ljava/lang/Class");
- ifaces = (struct Hjava_lang_Class**)unhand(obj)->body;
+ ifaces = (struct Hjava_lang_Class**)unhand_array(obj)->body;
for (i = 0; i < nr; i++) {
ifaces[i] = this->interfaces[i];
}
@@ -298,7 +298,7 @@
{
jchar* chrs;
- chrs = &unhand(unhand(name)->value)->body[unhand(name)->offset];
+ chrs = STRING_DATA(name);
switch (chrs[0]) {
case 'b':
if (chrs[1] == 'y') {
@@ -384,7 +384,7 @@
if (clazz == 0) {
throwError(&info);
}
- unhand(array)->body[i] = &clazz->head;
+ unhand_array(array)->body[i] = &clazz->head;
}
return (array);
@@ -426,7 +426,7 @@
nr = meth->ndeclared_exceptions;
array = (HArrayOfObject*)AllocObjectArray(nr, "Ljava/lang/Class;");
- ptr = (Hjava_lang_Class**)&unhand(array)->body[0];
+ ptr = (Hjava_lang_Class**)&unhand_array(array)->body[0];
for (i = 0; i < nr; i++) {
errorInfo info;
Hjava_lang_Class* clazz;
@@ -567,7 +567,7 @@
}
array = (HArrayOfObject*)AllocObjectArray(count, "Ljava/lang/reflect/Method;");
- ptr = (Hjava_lang_reflect_Method**)&unhand(array)->body[0];
+ ptr = (Hjava_lang_reflect_Method**)&unhand_array(array)->body[0];
addMethods(this, declared, &ptr);
if (!declared) {
@@ -607,7 +607,7 @@
}
}
array = (HArrayOfObject*)AllocObjectArray(count, "Ljava/lang/reflect/Method;");
- ptr = (Hjava_lang_reflect_Method**)&unhand(array)->body[0];
+ ptr = (Hjava_lang_reflect_Method**)&unhand_array(array)->body[0];
for (clas = this; clas != NULL; clas = clas->superclass) {
addMethods(clas, declared, &ptr);
@@ -639,7 +639,7 @@
}
}
array = (HArrayOfObject*)AllocObjectArray(count, "Ljava/lang/reflect/Constructor;");
- ptr = (Hjava_lang_reflect_Constructor**)&unhand(array)->body[0];
+ ptr = (Hjava_lang_reflect_Constructor**)&unhand_array(array)->body[0];
clas = this;
mth = CLASS_METHODS(clas);
for (i = CLASS_NMETHODS(clas)-1; i >= 0; i--) {
@@ -676,7 +676,7 @@
}
}
array = (HArrayOfObject*)AllocObjectArray(count, "Ljava/lang/reflect/Field;");
- ptr = (Hjava_lang_reflect_Field**)&unhand(array)->body[0];
+ ptr = (Hjava_lang_reflect_Field**)&unhand_array(array)->body[0];
for (clas = clazz; clas != NULL; clas = clas->superclass) {
fld = CLASS_FIELDS(clas);
for (i = CLASS_NFIELDS(clas)-1; i >= 0; i--) {
Index: libraries/clib/native/ClassLoader.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/native/ClassLoader.c,v
retrieving revision 1.20
diff -u -r1.20 ClassLoader.c
--- ClassLoader.c 1999/02/04 06:59:40 1.20
+++ ClassLoader.c 1999/02/13 09:15:16
@@ -38,7 +38,7 @@
classEntry *centry;
errorInfo info;
- hand.base = &unhand(data)->body[offset];
+ hand.base = &unhand_array(data)->body[offset];
hand.buf = hand.base;
hand.size = length;
@@ -206,7 +206,7 @@
* to avoid this copy but we cannot for the moment.
*/
data = (HArrayOfByte*)AllocArray(hand.size, TYPE_Byte);
- memcpy(unhand(data)->body, hand.buf, hand.size);
+ memcpy(unhand_array(data)->body, hand.buf, hand.size);
if (hand.base != NULL) {
KFREE(hand.base);
}
Index: libraries/clib/native/Method.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/native/Method.c,v
retrieving revision 1.21
diff -u -r1.21 Method.c
--- Method.c 1999/02/08 05:07:19 1.21
+++ Method.c 1999/02/13 09:15:16
@@ -95,7 +95,7 @@
meth = &clazz->methods[slot];
len = argobj ? obj_length(argobj) : 0;
- body = argobj ? (Hjava_lang_Object**)unhand(argobj)->body : 0;
+ body = argobj ? OBJARRAY_DATA(argobj) : 0;
for (sig = meth->signature->data + 1, i = j = 0;
*sig != ')' && i < len; ++sig, ++i, ++j) {
a = body[i] ? OBJECT_CLASS(body[i]) : 0;
Index: libraries/clib/native/ObjectStreamClassImpl.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/native/ObjectStreamClassImpl.c,v
retrieving revision 1.1
diff -u -r1.1 ObjectStreamClassImpl.c
--- ObjectStreamClassImpl.c 1999/02/10 05:01:14 1.1
+++ ObjectStreamClassImpl.c 1999/02/13 09:15:16
@@ -69,7 +69,7 @@
if (unhand(cls)->fields == 0) {
unhand(cls)->fields = getFields(cls);
}
- fld = (Field**)unhand(unhand(cls)->fields)->body;
+ fld = (Field**)unhand_array(unhand(cls)->fields)->body;
len = obj_length(unhand(cls)->fields);
if (unhand(cls)->iclazz != unhand(cls)->clazz) {
@@ -130,7 +130,7 @@
if (unhand(cls)->fields == 0) {
unhand(cls)->fields = getFields(cls);
}
- fld = (Field**)unhand(unhand(cls)->fields)->body;
+ fld = (Field**)unhand_array(unhand(cls)->fields)->body;
len = obj_length(unhand(cls)->fields);
if (unhand(cls)->iclazz != unhand(cls)->clazz) {
@@ -194,7 +194,7 @@
if (unhand(cls)->fields == 0) {
unhand(cls)->fields = getFields(cls);
}
- fld = (Field**)unhand(unhand(cls)->fields)->body;
+ fld = (Field**)unhand_array(unhand(cls)->fields)->body;
len = obj_length(unhand(cls)->fields);
do_execute_java_method(out, "writeShort", "(I)V", 0, 0, len);
@@ -399,12 +399,12 @@
if ((fld->accflags & ACC_TRANSIENT) != 0) {
continue;
}
- unhand(array)->body[cnt] = (void*)fld;
+ unhand_array(array)->body[cnt] = (void*)fld;
cnt++;
}
/* Sort the array */
- qsort(unhand(array)->body, cnt, sizeof(void*), compare);
+ qsort(unhand_array(array)->body, cnt, sizeof(void*), compare);
return (array);
}
Index: libraries/clib/native/SecurityManager.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/native/SecurityManager.c,v
retrieving revision 1.5
diff -u -r1.5 SecurityManager.c
--- SecurityManager.c 1999/02/08 05:07:19 1.5
+++ SecurityManager.c 1999/02/13 09:15:16
@@ -49,7 +49,7 @@
cnt = 0;
for (i = 0; info[i].meth != ENDOFSTACK; i++) {
if (info[i].meth != 0 && info[i].meth->class != 0) {
- unhand(array)->body[cnt] = (Hjava_lang_Object*)info[i].meth->class;
+ unhand_array(array)->body[cnt] = (Hjava_lang_Object*)info[i].meth->class;
cnt++;
}
}
Index: libraries/clib/native/ZipFile.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/native/ZipFile.c,v
retrieving revision 1.5
diff -u -r1.5 ZipFile.c
--- ZipFile.c 1999/02/08 05:07:20 1.5
+++ ZipFile.c 1999/02/13 09:15:16
@@ -74,7 +74,7 @@
return (0);
}
array = (HArrayOfByte*)AllocArray(unhand(zentry)->size, TYPE_Byte);
- memcpy(unhand(array)->body, buf, unhand(zentry)->size);
+ memcpy(unhand_array(array)->body, buf, unhand(zentry)->size);
return (array);
}
@@ -89,7 +89,7 @@
zfile = (jarFile*)zip;
vec = (Hjava_util_Vector*)execute_java_constructor("java.util.Vector", 0, "(I)V", zfile->count);
- elems = unhand(unhand(vec)->elementData)->body;
+ elems = unhand_array(unhand(vec)->elementData)->body;
for (i = 0, entry = zfile->head; i < zfile->count; i++, entry = entry->next) {
elems[i] = (HObject*)makeZipEntry(entry);
}
cvs server: Diffing libraries/clib/net
Index: libraries/clib/net/InetAddressImpl.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/net/InetAddressImpl.c,v
retrieving revision 1.7
diff -u -r1.7 InetAddressImpl.c
--- InetAddressImpl.c 1999/02/08 05:07:21 1.7
+++ InetAddressImpl.c 1999/02/13 09:15:16
@@ -97,7 +97,7 @@
for (i = 0; i < alength; i++) {
/* Copy in the network address */
- unhand(array)->body[i] = ntohl(*(jint*)ent->h_addr_list[i]);
+ unhand_array(array)->body[i] = ntohl(*(jint*)ent->h_addr_list[i]);
}
return (array);
Index: libraries/clib/net/PlainDatagramSocketImpl.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/net/PlainDatagramSocketImpl.c,v
retrieving revision 1.12
diff -u -r1.12 PlainDatagramSocketImpl.c
--- PlainDatagramSocketImpl.c 1999/02/08 05:07:21 1.12
+++ PlainDatagramSocketImpl.c 1999/02/13 09:15:16
@@ -117,7 +117,7 @@
addr.sin_port = htons(unhand(pkt)->port);
addr.sin_addr.s_addr = htonl(unhand(unhand(pkt)->address)->address);
- rc = KSENDTO(unhand(unhand(this)->fd)->fd, unhand(unhand(pkt)->buf)->body, unhand(pkt)->length, 0, (struct sockaddr*)&addr, sizeof(addr), &bsent);
+ rc = KSENDTO(unhand(unhand(this)->fd)->fd, unhand_array(unhand(pkt)->buf)->body, unhand(pkt)->length, 0, (struct sockaddr*)&addr, sizeof(addr), &bsent);
if (rc) {
SignalError("java.net.SocketException", SYS_ERROR(rc));
}
@@ -152,7 +152,7 @@
/* Which port am I receiving from */
addr.sin_port = htons(unhand(this)->localPort);
- rc = KRECVFROM(unhand(unhand(this)->fd)->fd, unhand(unhand(pkt)->buf)->body, unhand(pkt)->length, 0, (struct sockaddr*)&addr, &alen, unhand(this)->timeout, &r);
+ rc = KRECVFROM(unhand(unhand(this)->fd)->fd, unhand_array(unhand(pkt)->buf)->body, unhand(pkt)->length, 0, (struct sockaddr*)&addr, &alen, unhand(this)->timeout, &r);
if (rc) {
SignalError("java.net.SocketException", SYS_ERROR(rc));
}
Index: libraries/clib/net/PlainSocketImpl.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/net/PlainSocketImpl.c,v
retrieving revision 1.11
diff -u -r1.11 PlainSocketImpl.c
--- PlainSocketImpl.c 1999/02/08 09:07:48 1.11
+++ PlainSocketImpl.c 1999/02/13 09:15:16
@@ -341,7 +341,7 @@
SignalError("java.io.IOException", "fd invalid");
}
- rc = KSOCKREAD(fd, &unhand(buf)->body[offset], len, unhand(this)->timeout, &r);
+ rc = KSOCKREAD(fd, &unhand_array(buf)->body[offset], len, unhand(this)->timeout, &r);
if (rc == EINTR) {
SignalError("java.io.InterruptedIOException",
"Read timed out or was interrupted");
@@ -365,7 +365,7 @@
fd = unhand(unhand(this)->fd)->fd;
if (fd >= 0) {
- int rc = KSOCKWRITE(fd, &unhand(buf)->body[offset], len, &r);
+ int rc = KSOCKWRITE(fd, &unhand_array(buf)->body[offset], len, &r);
if (rc) {
SignalError("java.io.IOException", SYS_ERROR(rc));
}
cvs server: Diffing libraries/clib/zip
Index: libraries/clib/zip/Adler32.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/zip/Adler32.c,v
retrieving revision 1.3
diff -u -r1.3 Adler32.c
--- Adler32.c 1999/02/08 05:07:22 1.3
+++ Adler32.c 1999/02/13 09:15:16
@@ -21,7 +21,7 @@
void
java_util_zip_Adler32_update(struct Hjava_util_zip_Adler32* this, HArrayOfByte* buf, jint from, jint len)
{
- unhand(this)->adler = adler32(unhand(this)->adler, &unhand(buf)->body[from], len);
+ unhand(this)->adler = adler32(unhand(this)->adler, &unhand_array(buf)->body[from], len);
}
Index: libraries/clib/zip/CRC32.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/zip/CRC32.c,v
retrieving revision 1.3
diff -u -r1.3 CRC32.c
--- CRC32.c 1999/02/08 05:07:22 1.3
+++ CRC32.c 1999/02/13 09:15:16
@@ -99,7 +99,7 @@
void
java_util_zip_CRC32_update(struct Hjava_util_zip_CRC32* this, HArrayOfByte* buf, jint from, jint len)
{
- unhand(this)->crc = crc32(unhand(this)->crc, &unhand(buf)->body[from], len);
+ unhand(this)->crc = crc32(unhand(this)->crc, &unhand_array(buf)->body[from], len);
}
void
Index: libraries/clib/zip/Deflater.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/zip/Deflater.c,v
retrieving revision 1.7
diff -u -r1.7 Deflater.c
--- Deflater.c 1999/02/08 05:07:22 1.7
+++ Deflater.c 1999/02/13 09:15:16
@@ -33,7 +33,7 @@
dstream = GET_STREAM(this);
- r = deflateSetDictionary (dstream, &unhand(buf)->body[from], len);
+ r = deflateSetDictionary (dstream, &unhand_array(buf)->body[from], len);
if (r < 0) {
SignalError("java.lang.Error", dstream->msg ? dstream->msg : "unknown error");
}
@@ -50,10 +50,10 @@
ilen = unhand(this)->len;
- dstream->next_in = &unhand(unhand(this)->buf)->body[unhand(this)->off];
+ dstream->next_in = &unhand_array(unhand(this)->buf)->body[unhand(this)->off];
dstream->avail_in = ilen;
- dstream->next_out = &unhand(buf)->body[off];
+ dstream->next_out = &unhand_array(buf)->body[off];
dstream->avail_out = len;
r = deflate(dstream, unhand(this)->finish ? Z_FINISH : Z_NO_FLUSH);
Index: libraries/clib/zip/Inflater.c
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/clib/zip/Inflater.c,v
retrieving revision 1.6
diff -u -r1.6 Inflater.c
--- Inflater.c 1999/02/08 05:07:22 1.6
+++ Inflater.c 1999/02/13 09:15:16
@@ -32,7 +32,7 @@
z_stream* dstream;
dstream = GET_STREAM(this);
- r = inflateSetDictionary (dstream, &unhand(buf)->body[from], len);
+ r = inflateSetDictionary (dstream, &unhand_array(buf)->body[from], len);
if (r < 0) {
SignalError("java.lang.Error", dstream->msg ? dstream->msg : "unknown error");
}
@@ -54,10 +54,10 @@
return (0);
}
- dstream->next_in = &unhand(unhand(this)->buf)->body[unhand(this)->off];
+ dstream->next_in = &unhand_array(unhand(this)->buf)->body[unhand(this)->off];
dstream->avail_in = ilen;
- dstream->next_out = &unhand(buf)->body[off];
+ dstream->next_out = &unhand_array(buf)->body[off];
dstream->avail_out = len;
r = inflate(dstream, Z_PARTIAL_FLUSH);
cvs server: Diffing libraries/javalib
cvs server: Diffing libraries/javalib/java
cvs server: Diffing libraries/javalib/java/applet
cvs server: Diffing libraries/javalib/java/awt
cvs server: Diffing libraries/javalib/java/awt/datatransfer
cvs server: Diffing libraries/javalib/java/awt/event
cvs server: Diffing libraries/javalib/java/awt/image
cvs server: Diffing libraries/javalib/java/awt/peer
cvs server: Diffing libraries/javalib/java/awt/widgets
cvs server: Diffing libraries/javalib/java/beans
cvs server: Diffing libraries/javalib/java/io
cvs server: Diffing libraries/javalib/java/lang
cvs server: Diffing libraries/javalib/java/lang/ref
cvs server: Diffing libraries/javalib/java/lang/reflect
cvs server: Diffing libraries/javalib/java/math
cvs server: Diffing libraries/javalib/java/net
cvs server: Diffing libraries/javalib/java/sql
cvs server: Diffing libraries/javalib/java/text
cvs server: Diffing libraries/javalib/java/util
cvs server: Diffing libraries/javalib/java/util/mime
cvs server: Diffing libraries/javalib/java/util/zip
cvs server: Diffing libraries/javalib/kaffe
cvs server: Diffing libraries/javalib/kaffe/applet
cvs server: Diffing libraries/javalib/kaffe/awt
cvs server: Diffing libraries/javalib/kaffe/beans
cvs server: Diffing libraries/javalib/kaffe/beans/editors
cvs server: Diffing libraries/javalib/kaffe/beans/infos
cvs server: Diffing libraries/javalib/kaffe/io
cvs server: Diffing libraries/javalib/kaffe/jar
cvs server: Diffing libraries/javalib/kaffe/lang
cvs server: Diffing libraries/javalib/kaffe/management
cvs server: Diffing libraries/javalib/kaffe/net
cvs server: Diffing libraries/javalib/kaffe/net/www
cvs server: Diffing libraries/javalib/kaffe/net/www/protocol
cvs server: Diffing libraries/javalib/kaffe/net/www/protocol/file
cvs server: Diffing libraries/javalib/kaffe/net/www/protocol/http
cvs server: Diffing libraries/javalib/kaffe/net/www/protocol/system
cvs server: Diffing libraries/javalib/kaffe/text
cvs server: Diffing libraries/javalib/kaffe/text/collator
cvs server: Diffing libraries/javalib/kaffe/text/dateformat
cvs server: Diffing libraries/javalib/kaffe/text/numberformat
cvs server: Diffing libraries/javalib/kaffe/util
cvs server: Diffing libraries/javalib/kaffe/util/log
cvs server: Diffing libraries/javalib/kaffe/util/zip
cvs server: Diffing test
cvs server: Diffing test/awt
cvs server: Diffing test/awt/Calc
cvs server: Diffing test/awt/TextEdit
cvs server: Diffing test/awt/TextEdit/doc
cvs server: Diffing test/awt/TextEdit/jars
cvs server: Diffing test/awt/TextEdit/src
cvs server: Diffing test/awt/Unico
cvs server: Diffing test/awt/WidgetsDemo
cvs server: Diffing test/regression
This archive was generated by hypermail 2b29 : Sat Sep 23 2000 - 19:58:08 EDT