[kaffe] CVS kaffe (guilhem): SIGNAL_ARGS implementation for i386 architectures using EXCEPTIONPROTO
PatchSet 3984 Date: 2003/08/27 07:04:17 Author: guilhem Branch: HEAD Tag: (none) Log: SIGNAL_ARGS implementation for i386 architectures using EXCEPTIONPROTO Members: ChangeLog:1.1581-1.1582 config/i386/beos/jit-md.h:1.2-1.3 config/i386/beos/md.h:1.4-1.5 config/i386/bsdi/md.h:1.2-1.3 config/i386/cygwin32/md.h:1.1-1.2 config/i386/dgux/jit-md.h:1.1-1.2 config/i386/dgux/md.h:1.1-1.2 config/i386/freebsd2/jit-md.h:1.1-1.2 config/i386/gnu/jit-md.h:1.1-1.2 config/i386/gnu/md.h:1.1-1.2 config/i386/linux/jit-md.h:1.3-1.4 config/i386/linux/md.h:1.4-1.5 config/i386/netbsd1/jit-md.h:1.1-1.2 config/i386/nextstep3/jit-md.h:1.1-1.2 config/i386/nextstep3/md.h:1.2-1.3 config/i386/openbsd2/jit-md.h:1.1-1.2 config/i386/oskit/jit-md.h:1.2-1.3 config/i386/oskit/md.h:1.3-1.4 config/i386/qnx/jit-md.h:1.1-1.2 config/i386/qnx/md.h:1.3-1.4 config/i386/sco3.2v5/jit-md.h:1.1-1.2 config/i386/sco3.2v5/md.h:1.1-1.2 config/i386/solaris2/jit-md.h:1.1-1.2 config/i386/solaris2/md.h:1.1-1.2 config/i386/univel_svr4/jit-md.h:1.1-1.2 config/i386/univel_svr4/md.h:1.3-1.4 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.1581 kaffe/ChangeLog:1.1582 --- kaffe/ChangeLog:1.1581 Tue Aug 26 15:39:07 2003 +++ kaffe/ChangeLog Wed Aug 27 07:04:17 2003 @@ -1,3 +1,28 @@ +2003-08-28 Guilhem Lavaux [EMAIL PROTECTED] + + * config/i386/beos/md.h, config/i386/bsdi/md.h, + config/i386/cygwin32/md.h, config/i386/dgux/md.h, + config/i386/freebsd2/md.h, config/i386/gnu/md.h, + config/i386/linux/md.h, config/i386/netbsd1/md.h, + config/i386/nextstep3/md.h, config/i386/openbsd2/md.h, + config/i386/oskit/md.h, config/i386/qnx/md.h, + config/i386/sco3.2v5/md.h, config/i386/solaris2/md.h, + config/i386/univel_svr4/md.h, config/i386/win32/md.h, + config/i386/beos/jit-md.h, config/i386/bsdi/jit-md.h, + config/i386/cygwin32/jit-md.h, config/i386/dgux/jit-md.h, + config/i386/freebsd2/jit-md.h, config/i386/gnu/jit-md.h, + config/i386/linux/jit-md.h, config/i386/netbsd1/jit-md.h, + config/i386/nextstep3/jit-md.h, config/i386/openbsd2/jit-md.h, + config/i386/oskit/jit-md.h, config/i386/qnx/jit-md.h, + config/i386/sco3.2v5/jit-md.h, config/i386/solaris2/jit-md.h, + config/i386/univel_svr4/jit-md.h, config/i386/win32/jit-md.h: + Defined SIGNAL_ARGS using informations from EXCEPTIONPROTO. + Redefined EXCEPTIONPROTO as SIGNAL_ARGS(sig, ctx) + Moved some code from jit-md.h to md.h and defined + SIGNAL_CONTEXT_POINTER, GET_SIGNAL_CONTEXT_POINTER, SIGNAL_PC + wherever possible (not in win32). + CygWin32 fails completely for the moment. + 2003-08-26 Bernhard Rosenkraenzer [EMAIL PROTECTED] * gwqt.m4: Index: kaffe/config/i386/beos/jit-md.h diff -u kaffe/config/i386/beos/jit-md.h:1.2 kaffe/config/i386/beos/jit-md.h:1.3 --- kaffe/config/i386/beos/jit-md.h:1.2 Thu Sep 9 18:02:29 1999 +++ kaffe/config/i386/beos/jit-md.h Wed Aug 27 07:04:19 2003 @@ -22,8 +22,7 @@ /**/ /* Function prototype for signal handlers */ -#defineEXCEPTIONPROTO \ - int sig, void* userdata, struct vregs* ctx +#defineEXCEPTIONPROTO SIGNAL_ARGS(sig, ctx) /* Get the first exception frame from a signal handler */ #defineEXCEPTIONFRAME(f, c)\ Index: kaffe/config/i386/beos/md.h diff -u kaffe/config/i386/beos/md.h:1.4 kaffe/config/i386/beos/md.h:1.5 --- kaffe/config/i386/beos/md.h:1.4 Tue Feb 9 06:08:19 1999 +++ kaffe/config/i386/beos/md.h Wed Aug 27 07:04:19 2003 @@ -27,6 +27,11 @@ */ #define MAINSTACKSIZE (220*1024) +#defineSIGNAL_ARGS(sig, sc) int sig, void* userdata, struct vregs* sc +#define SIGNAL_CONTEXT_POINTER(scp) struct vregs * scp +#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc) +#define SIGNAL_PC(scp) ((scp)-eip) + #if defined(TRANSLATOR) #include jit-md.h #endif Index: kaffe/config/i386/bsdi/md.h diff -u kaffe/config/i386/bsdi/md.h:1.2 kaffe/config/i386/bsdi/md.h:1.3 --- kaffe/config/i386/bsdi/md.h:1.2 Fri May 21 16:58:35 1999 +++ kaffe/config/i386/bsdi/md.h Wed Aug 27 07:04:19 2003 @@ -21,6 +21,11 @@ #undef SP_OFFSET #defineSP_OFFSET 2 +#define SIGNAL_ARGS(sig, sc) int sig, int code, struct sigcontext* sc +#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext* scp +#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc) +#define SIGNAL_PC(scp) (scp)-sc_pc + #if defined(TRANSLATOR) #include jit-md.h #endif Index: kaffe/config/i386/cygwin32/md.h diff -u kaffe/config/i386/cygwin32/md.h:1.1 kaffe/config/i386/cygwin32/md.h:1.2 --- kaffe/config/i386/cygwin32/md.h:1.1 Fri Aug 28 15:47:20 1998 +++ kaffe/config/i386/cygwin32/md.h Wed Aug 27 07:04:19 2003 @@ -22,6
[kaffe] CVS kaffe (guilhem): SIGNAL_ARGS implementation for sparc arch
PatchSet 3985 Date: 2003/08/27 09:22:33 Author: guilhem Branch: HEAD Tag: (none) Log: SIGNAL_ARGS implementation for sparc arch Members: ChangeLog:1.1582-1.1583 config/sparc/bsdi3/jit-md.h:1.1-1.2 config/sparc/bsdi3/md.h:1.1-1.2 config/sparc/linux/md.h:1.3-1.4 config/sparc/netbsd1/md.h:1.2-1.3 config/sparc/nextstep3/jit-md.h:1.1-1.2 config/sparc/nextstep3/md.h:1.1-1.2 config/sparc/openbsd2/jit-md.h:1.1-1.2 config/sparc/openbsd2/md.h:1.2-1.3 config/sparc/solaris2/jit-md.h:1.1-1.2 config/sparc/solaris2/md.h:1.1-1.2 config/sparc/sunos4/md.h:1.4-1.5 config/sparc/uxpds/jit-md.h:1.1-1.2 config/sparc/uxpds/md.h:1.1-1.2 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.1582 kaffe/ChangeLog:1.1583 --- kaffe/ChangeLog:1.1582 Wed Aug 27 07:04:17 2003 +++ kaffe/ChangeLog Wed Aug 27 09:22:33 2003 @@ -1,5 +1,20 @@ 2003-08-28 Guilhem Lavaux [EMAIL PROTECTED] + * config/sparc/bsdi3/md.h, config/sparc/linux/md.h, + config/sparc/netbsd1/md.h, config/sparc/nextstep3/md.h, + config/sparc/openbsd2/md.h, config/sparc/solaris2/md.h, + config/sparc/sunos4/md.h, config/sparc/uxpds/md.h, + config/sparc/bsdi3/jit-md.h, config/sparc/linux/jit-md.h, + config/sparc/netbsd1/jit-md.h, config/sparc/nextstep3/jit-md.h, + config/sparc/openbsd2/jit-md.h, config/sparc/solaris2/jit-md.h, + config/sparc/sunos4/jit-md.h, config/sparc/uxpds/jit-md.h: + Defined SIGNAL_ARGS using informations from EXCEPTIONPROTO. + Redefined EXCEPTIONPROTO as SIGNAL_ARGS(sig, ctx) + Moved some code from jit-md.h to md.h and defined + SIGNAL_CONTEXT_POINTER, GET_SIGNAL_CONTEXT_POINTER, SIGNAL_PC. + +2003-08-28 Guilhem Lavaux [EMAIL PROTECTED] + * config/i386/beos/md.h, config/i386/bsdi/md.h, config/i386/cygwin32/md.h, config/i386/dgux/md.h, config/i386/freebsd2/md.h, config/i386/gnu/md.h, Index: kaffe/config/sparc/bsdi3/jit-md.h diff -u kaffe/config/sparc/bsdi3/jit-md.h:1.1 kaffe/config/sparc/bsdi3/jit-md.h:1.2 --- kaffe/config/sparc/bsdi3/jit-md.h:1.1 Tue Mar 31 19:10:53 1998 +++ kaffe/config/sparc/bsdi3/jit-md.h Wed Aug 27 09:22:34 2003 @@ -32,8 +32,7 @@ /**/ /* Function prototype for signal handlers */ -#define EXCEPTIONPROTO \ -int sig, int code, struct sigcontext* ctx +#define EXCEPTIONPROTO SIGNAL_ARGS(sig, ctx) /* Get the first exception frame from a signal handler */ #define EXCEPTIONFRAME(f, c)\ Index: kaffe/config/sparc/bsdi3/md.h diff -u kaffe/config/sparc/bsdi3/md.h:1.1 kaffe/config/sparc/bsdi3/md.h:1.2 --- kaffe/config/sparc/bsdi3/md.h:1.1 Tue Mar 31 19:10:53 1998 +++ kaffe/config/sparc/bsdi3/md.h Wed Aug 27 09:22:34 2003 @@ -15,6 +15,11 @@ #include sparc/common.h #include sparc/threads.h +#define SIGNAL_ARGS(sig, sc) int sig, int code, struct sigcontext* sc +#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext* scp +#define GET_SIGNAL_CONTEXT_POINTER(scp) (scp) +#define SIGNAL_PC(scp) ((spc)-sc_pc) + #if defined(TRANSLATOR) #include jit-md.h #endif Index: kaffe/config/sparc/linux/md.h diff -u kaffe/config/sparc/linux/md.h:1.3 kaffe/config/sparc/linux/md.h:1.4 --- kaffe/config/sparc/linux/md.h:1.3 Thu Dec 17 21:23:47 1998 +++ kaffe/config/sparc/linux/md.h Wed Aug 27 09:22:34 2003 @@ -22,6 +22,23 @@ #defineCONTEXT_SWITCH(F,T) sparcLinuxContextSwitch(F, T) +/**/ +/* Extra exception handling information. */ +/**/ +#if defined(HAVE_FEATURES_H) +#include features.h +#endif +#if defined(HAVE_SIGCONTEXT_H) +#include sigcontext.h +#endif +#include asm/ptrace.h + +/* Function prototype for signal handlers */ +#defineSIGNAL_ARGS(sig, sc) int sig, struct sigcontext* sc +#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext* scp +#define GET_SIGNAL_CONTEXT_POINTER(scp) (scp) +#define SIGNAL_PC(scp) ((scp)-si_regs.pc) + #if defined(TRANSLATOR) #include jit-md.h #endif Index: kaffe/config/sparc/netbsd1/md.h diff -u kaffe/config/sparc/netbsd1/md.h:1.2 kaffe/config/sparc/netbsd1/md.h:1.3 --- kaffe/config/sparc/netbsd1/md.h:1.2 Wed Mar 7 10:33:15 2001 +++ kaffe/config/sparc/netbsd1/md.h Wed Aug 27 09:22:35 2003 @@ -15,6 +15,11 @@ #include sparc/common.h #include sparc/threads.h +#define SIGNAL_ARGS(sig, sc) int sig, int code, struct sigcontext* sc +#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext* scp +#define GET_SIGNAL_CONTEXT_POINTER(scp) (scp) +#define SIGNAL_PC(scp) ((scp)-sc_pc) + #if defined(TRANSLATOR) #include jit-md.h #endif Index: kaffe/config/sparc/nextstep3/jit-md.h diff -u kaffe/config/sparc/nextstep3/jit-md.h:1.1 kaffe/config/sparc/nextstep3/jit-md.h:1.2 --- kaffe/config/sparc/nextstep3/jit-md.h:1.1 Fri Apr 2 12:37:34 1999 +++ kaffe/config/sparc/nextstep3/jit-md.h Wed Aug 27 09:22:35 2003 @@ -24,8 +24,7 @@ /**/ /*
[kaffe] Under which license stands Kaffe´s-Classpath?
Hi there! I´ve ported kaffe´s AWT to GCJ so that it is now possible to create standalone native awt-based apps. Maybe even kaffe could profit, because if bugs or improvements are done by GCJ-people, these improvements are still copatible to kaffes awt. The problem is, that I ever thought, that Kaffe´s Classpath stands under LGPL, but in the AWT-Files is a license-notice that points me to GPL2 (maybe the link is wrong). Does that mean its not legal to use proprietary awt-apps with kaffe? GCJ´s classpath stands under a special GPL license which allows commercial companies to link against libgcj withought making their code gpl, but its not allowed to modify the libgcj-code and sell it withought GPLing the result (like this is possible with LPGL). It would be really important for me that my ported version stands under the same license as GCJ´s classpath or LGPL. Who is the owner of this code? lg Clemens ___ kaffe mailing list [EMAIL PROTECTED] http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (guilhem): New Java 1.4 java.text methods + java.util.Currency implementation
PatchSet 3987
Date: 2003/08/27 14:32:09
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
New Java 1.4 java.text methods + java.util.Currency implementation
Members:
libraries/javalib/Makefile.am:1.133-1.134
libraries/javalib/Makefile.in:1.180-1.181
libraries/javalib/essential.files:1.23-1.24
libraries/javalib/java/text/DecimalFormat.java:1.19-1.20
libraries/javalib/java/text/DecimalFormatSymbols.java:1.11-1.12
libraries/javalib/java/text/MessageFormat.java:1.19-1.20
libraries/javalib/java/text/NumberFormat.java:1.17-1.18
libraries/javalib/java/util/Currency.java:INITIAL-1.1
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.133
kaffe/libraries/javalib/Makefile.am:1.134
--- kaffe/libraries/javalib/Makefile.am:1.133 Mon Aug 25 06:14:47 2003
+++ kaffe/libraries/javalib/Makefile.am Wed Aug 27 14:32:09 2003
@@ -1543,6 +1543,7 @@
java/util/Collections.java \
java/util/Comparator.java \
java/util/ConcurrentModificationException.java \
+ java/util/Currency.java \
java/util/Date.java \
java/util/Dictionary.java \
java/util/EmptyStackException.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.180
kaffe/libraries/javalib/Makefile.in:1.181
--- kaffe/libraries/javalib/Makefile.in:1.180 Mon Aug 25 06:14:47 2003
+++ kaffe/libraries/javalib/Makefile.in Wed Aug 27 14:32:09 2003
@@ -1842,6 +1842,7 @@
java/util/Collections.java \
java/util/Comparator.java \
java/util/ConcurrentModificationException.java \
+ java/util/Currency.java \
java/util/Date.java \
java/util/Dictionary.java \
java/util/EmptyStackException.java \
Index: kaffe/libraries/javalib/essential.files
diff -u kaffe/libraries/javalib/essential.files:1.23
kaffe/libraries/javalib/essential.files:1.24
--- kaffe/libraries/javalib/essential.files:1.23Mon Aug 25 06:30:12 2003
+++ kaffe/libraries/javalib/essential.files Wed Aug 27 14:32:09 2003
@@ -248,6 +248,7 @@
java/util/Calendar.java
java/util/Collection.java
java/util/Collections.java
+java/util/Currency.java
java/util/Comparator.java
java/util/ConcurrentModificationException.java
java/util/Date.java
Index: kaffe/libraries/javalib/java/text/DecimalFormat.java
diff -u kaffe/libraries/javalib/java/text/DecimalFormat.java:1.19
kaffe/libraries/javalib/java/text/DecimalFormat.java:1.20
--- kaffe/libraries/javalib/java/text/DecimalFormat.java:1.19 Tue Aug 26 15:03:10
2003
+++ kaffe/libraries/javalib/java/text/DecimalFormat.javaWed Aug 27 14:32:10
2003
@@ -736,6 +736,11 @@
return dest;
}
+ public Currency getCurrency()
+ {
+return symbols.getCurrency();
+ }
+
public DecimalFormatSymbols getDecimalFormatSymbols ()
{
return symbols;
@@ -953,6 +958,11 @@
pos.setIndex(index + suffix.length());
return result;
+ }
+
+ public void setCurrency(Currency currency)
+ {
+symbols.setCurrency(currency);
}
public void setDecimalFormatSymbols (DecimalFormatSymbols newSymbols)
Index: kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java
diff -u kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java:1.11
kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java:1.12
--- kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java:1.11Sat Aug 16
11:03:47 2003
+++ kaffe/libraries/javalib/java/text/DecimalFormatSymbols.java Wed Aug 27 14:32:10
2003
@@ -39,6 +39,7 @@
package java.text;
import java.io.Serializable;
+import java.util.Currency;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -157,6 +158,7 @@
percent = safeGetChar (res, percent, '%');
perMill = safeGetChar (res, perMill, '\u2030');
zeroDigit = safeGetChar (res, zeroDigit, '0');
+locale = loc;
}
/**
@@ -195,6 +197,18 @@
}
/**
+ * Returns the currency corresponding to the currency symbol stored
+ * in the instance of codeDecimalFormatSymbols/code.
+ *
+ * @return A new instance of codeCurrency/code if
+ * the currency code matches a known one.
+ */
+ public Currency getCurrency ()
+ {
+return Currency.getInstance (currencySymbol);
+ }
+
+ /**
* This method returns the currency symbol in local format. For example,
* $ for Canadian dollars.
*
@@ -354,6 +368,16 @@
}
/**
+ * This method sets the currency to the specified value.
+ *
+ * @param currency The new currency
+ */
+ public void setCurrency (Currency currency)
+ {
+setCurrencySymbol (currency.getSymbol());
+ }
+
+ /**
* This method sets the currency symbol to the specified value.
*
* @param currencySymbol The new currency symbol
@@ -556,14 +580,20 @@
private char perMill;
/**
* @serial This value represents the type of object being de-serialized.
- * 0 indicates a pre-Java 1.1.6
[kaffe] Later works...
Hi, I am making a pause about java.text package for now. I expect that the only class already missing is Bidi now. However I would prefer to update the kaffe's IO subsystem kaffe to use classpath's. If I'm guessing correctly the future NIO package will use Classpath's file descriptors infrastructure so it is necessary for us to update that part. By the way, I'll try to make it as soon as possible because I will soon have a great shrinking of my spare time (going back to other studies ;-) ). Cheers, Guilhem. P.S.: I have sent the recent changes of the Java library to classpath bug tracking system. ___ kaffe mailing list [EMAIL PROTECTED] http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (hkraemer): some minor tweaks and compilation fixes
PatchSet 3989
Date: 2003/08/27 20:07:23
Author: hkraemer
Branch: HEAD
Tag: (none)
Log:
some minor tweaks and compilation fixes
Members:
ChangeLog:1.1585-1.1586
config/arm/jit.h:1.8-1.9
kaffe/kaffe/main.c:1.46-1.47
kaffe/kaffevm/jni.c:1.90-1.91
libraries/javalib/java/lang/Class.java:1.46-1.47
test/regression/ProcessClassInst.java:1.9-1.10
test/regression/ProcessClassStop.java:1.8-1.9
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1585 kaffe/ChangeLog:1.1586
--- kaffe/ChangeLog:1.1585 Wed Aug 27 15:44:11 2003
+++ kaffe/ChangeLog Wed Aug 27 20:07:23 2003
@@ -1,3 +1,22 @@
+2003-08-27 Helmer Kraemer [EMAIL PROTECTED]
+
+ * kaffe/kaffe/main.c:
+ (options) fix parsing of -Xsomethingsize style options
+
+ * kaffe/kaffevm/jni.c: include registers.h to fix compilation
+ problems for jit engine
+
+ * libraries/javalib/java/lang/Class.java:
+ (lookupMethod) don't crash if parameterTypes is null
+
+ * test/regression/ProcessClassInst.java,
+ test/regression/ProcessClassStop.java:
+ adjust expected output to java.lang.Class changes
+
+ * config/arm/jit.h:
+ (FRAMEOBJECT) adapted to changes in exception.c to fix
+ compilation problems
+
2003-08-29 Jim Pick [EMAIL PROTECTED]
* libraries/javalib/java/text/DecimalFormat.java:
Index: kaffe/config/arm/jit.h
diff -u kaffe/config/arm/jit.h:1.8 kaffe/config/arm/jit.h:1.9
--- kaffe/config/arm/jit.h:1.8 Wed Dec 20 02:39:52 2000
+++ kaffe/config/arm/jit.h Wed Aug 27 20:07:24 2003
@@ -53,14 +53,14 @@
(f) = *(exceptionFrame*)(v - sizeof(exceptionFrame)); })
/* Extract the object argument from given frame */
-#define FRAMEOBJECT(obj, f, einfo) do {\
+#define FRAMEOBJECT(obj, f, meth) do {\
const char *str;\
int maxLocal, maxStack, maxArgs, maxTemp; \
/* Set up the necessary state for the SLOT2 macros to work \
* in local variables to not get the translator lock. */ \
- maxLocal = einfo.method-localsz; \
- maxStack = einfo.method-stacksz; \
- str = METHOD_SIGD(einfo.method);\
+ maxLocal = meth-localsz; \
+ maxStack = meth-stacksz; \
+ str = METHOD_SIGD(meth);\
maxArgs = sizeofSig(str, false); \
maxTemp = MAXTEMPS - 1; \
/* NB: we assume that the JIT will have \
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.46 kaffe/kaffe/kaffe/main.c:1.47
--- kaffe/kaffe/kaffe/main.c:1.46 Thu Jul 31 22:46:45 2003
+++ kaffe/kaffe/kaffe/main.cWed Aug 27 20:07:25 2003
@@ -331,7 +331,7 @@
int
options(char** argv)
{
- int i;
+ int i,j;
int sz;
userProperty* prop;
@@ -394,9 +394,9 @@
/* set the new classpath */
vmargs.classpath = newcpath;
}
- else if ((strncmp(argv[i], -ss, 3) == 0)
-|| (strncmp(argv[i], -Xss, 4) == 0)) {
- if (argv[i][3] == 0) {
+ else if ((strncmp(argv[i], -ss, (j=3)) == 0)
+|| (strncmp(argv[i], -Xss, (j=4)) == 0)) {
+ if (argv[i][j] == 0) {
i++;
if (argv[i] == 0) {
fprintf(stderr, Error: No stack size found
for -ss option.\n);
@@ -404,7 +404,7 @@
}
sz = parseSize(argv[i]);
} else {
- sz = parseSize(argv[i][3]);
+ sz = parseSize(argv[i][j]);
}
if (sz THREADSTACKSIZE) {
fprintf(stderr, Warning: Attempt to set stack size
smaller than %d - ignored.\n, THREADSTACKSIZE);
@@ -413,9 +413,9 @@
vmargs.nativeStackSize = sz;
}
}
- else if ((strncmp(argv[i], -mx, 3) == 0)
-|| (strncmp(argv[i], -Xmx, 4) == 0)) {
- if (argv[i][3] == 0) {
+ else if ((strncmp(argv[i], -mx, (j=3)) == 0)
+|| (strncmp(argv[i], -Xmx, (j=4)) == 0)) {
+ if (argv[i][j] == 0) {
i++;
if (argv[i] == 0) {
fprintf(stderr, Error: No heap size found
for -mx option.\n);
@@
[kaffe] CVS kaffe (jim): A small JAXP fix (which took me hours to chase down). Fixes XSLT on JSTL.
PatchSet 3990
Date: 2003/08/27 21:12:06
Author: jim
Branch: HEAD
Tag: (none)
Log:
A small JAXP fix (which took me hours to chase down). Fixes XSLT on JSTL.
Here's some code which differed on Kaffe and the JDK, before this patch:
import java.io.*;
import javax.xml.transform.*;
import javax.xml.transform.sax.*;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
public class TraxInput {
public static void main(String[] args)
throws SAXException {
StringReader stringReader = new StringReader(Test);
XMLReader xr = XMLReaderFactory.createXMLReader(
org.apache.xerces.parsers.SAXParser);
InputSource s = new InputSource(stringReader);
System.out.println(s: + s);
Source saxSource = new SAXSource(xr, s);
InputSource isource = SAXSource.sourceToInputSource(saxSource);
System.out.println(isource: + isource);
}
}
Members:
ChangeLog:1.1586-1.1587
libraries/javalib/javax/xml/transform/sax/SAXSource.java:1.1-1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1586 kaffe/ChangeLog:1.1587
--- kaffe/ChangeLog:1.1586 Wed Aug 27 20:07:23 2003
+++ kaffe/ChangeLog Wed Aug 27 21:12:06 2003
@@ -1,3 +1,9 @@
+2003-08-27 Jim Pick [EMAIL PROTECTED]
+
+ * libraries/javalib/javax/xml/transform/sax/SAXSource.java:
+ Handle case where sourceToInputSource() is called with an
+ existing SAXSource.
+
2003-08-27 Helmer Kraemer [EMAIL PROTECTED]
* kaffe/kaffe/main.c:
Index: kaffe/libraries/javalib/javax/xml/transform/sax/SAXSource.java
diff -u kaffe/libraries/javalib/javax/xml/transform/sax/SAXSource.java:1.1
kaffe/libraries/javalib/javax/xml/transform/sax/SAXSource.java:1.2
--- kaffe/libraries/javalib/javax/xml/transform/sax/SAXSource.java:1.1 Mon Dec 2
15:02:25 2002
+++ kaffe/libraries/javalib/javax/xml/transform/sax/SAXSource.java Wed Aug 27
21:12:08 2003
@@ -1,5 +1,5 @@
/*
- * $Id: SAXSource.java,v 1.1 2002/12/02 15:02:25 dalibor Exp $
+ * $Id: SAXSource.java,v 1.2 2003/08/27 21:12:08 jim Exp $
* Copyright (C) 2001 Andrew Selkirk
* Copyright (C) 2001 David Brownell
*
@@ -122,6 +122,10 @@
{
InputSource retval;
boolean ok = false;
+
+ if (in instanceof SAXSource) {
+ return ((SAXSource) in).inputSource;
+ }
if (in.getSystemId () != null) {
retval = new InputSource (in.getSystemId ());
___
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
Fw: [kaffe] CVS kaffe (jim): A small JAXP fix (which took me hours to chase down). Fixes XSLT on JSTL.
Hi GNU-JAXP developers,
Here's a small patch I applied against the GNU-JAXP classes in Kaffe.
Without it, the XSLT support in JSTL doesn't work.
Cheers,
- Jim
Begin forwarded message:
Date: Wed, 27 Aug 2003 14:14:21 -0700
From: Kaffe CVS [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Subject: [kaffe] CVS kaffe (jim): A small JAXP fix (which took me hours to chase
down). Fixes XSLT on JSTL.
PatchSet 3990
Date: 2003/08/27 21:12:06
Author: jim
Branch: HEAD
Tag: (none)
Log:
A small JAXP fix (which took me hours to chase down). Fixes XSLT on JSTL.
Here's some code which differed on Kaffe and the JDK, before this patch:
import java.io.*;
import javax.xml.transform.*;
import javax.xml.transform.sax.*;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
public class TraxInput {
public static void main(String[] args)
throws SAXException {
StringReader stringReader = new StringReader(Test);
XMLReader xr = XMLReaderFactory.createXMLReader(
org.apache.xerces.parsers.SAXParser);
InputSource s = new InputSource(stringReader);
System.out.println(s: + s);
Source saxSource = new SAXSource(xr, s);
InputSource isource = SAXSource.sourceToInputSource(saxSource);
System.out.println(isource: + isource);
}
}
Members:
ChangeLog:1.1586-1.1587
libraries/javalib/javax/xml/transform/sax/SAXSource.java:1.1-1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1586 kaffe/ChangeLog:1.1587
--- kaffe/ChangeLog:1.1586 Wed Aug 27 20:07:23 2003
+++ kaffe/ChangeLog Wed Aug 27 21:12:06 2003
@@ -1,3 +1,9 @@
+2003-08-27 Jim Pick [EMAIL PROTECTED]
+
+ * libraries/javalib/javax/xml/transform/sax/SAXSource.java:
+ Handle case where sourceToInputSource() is called with an
+ existing SAXSource.
+
2003-08-27 Helmer Kraemer [EMAIL PROTECTED]
* kaffe/kaffe/main.c:
Index: kaffe/libraries/javalib/javax/xml/transform/sax/SAXSource.java
diff -u kaffe/libraries/javalib/javax/xml/transform/sax/SAXSource.java:1.1
kaffe/libraries/javalib/javax/xml/transform/sax/SAXSource.java:1.2
--- kaffe/libraries/javalib/javax/xml/transform/sax/SAXSource.java:1.1 Mon Dec 2
15:02:25 2002
+++ kaffe/libraries/javalib/javax/xml/transform/sax/SAXSource.java Wed Aug 27
21:12:08 2003
@@ -1,5 +1,5 @@
/*
- * $Id: SAXSource.java,v 1.1 2002/12/02 15:02:25 dalibor Exp $
+ * $Id: SAXSource.java,v 1.2 2003/08/27 21:12:08 jim Exp $
* Copyright (C) 2001 Andrew Selkirk
* Copyright (C) 2001 David Brownell
*
@@ -122,6 +122,10 @@
{
InputSource retval;
boolean ok = false;
+
+ if (in instanceof SAXSource) {
+ return ((SAXSource) in).inputSource;
+ }
if (in.getSystemId () != null) {
retval = new InputSource (in.getSystemId ());
___
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
___
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
Re: [kaffe] Under which license stands Kaffe´s-Classpath?
I think it's a noble idea to merge as much stuff as possible into Classpath and to encourage future development on Kaffe's class libraries to happen there. The Qt AWT port was done by Murphy Chen and Ken-Hao Liu of Dialogue Technologies. However, I notice that a lot of the source files still say that they are copyrighted by Transvirtual Technologies, Inc. - I assume they derived those files from the AWT that is already there. So I think you can assume that these are going to be under the same license as Kaffe, which is GPL. Transvirtual doesn't really exist anymore, so it might be difficult to find who owns the rights to the intellectual property, and to try to convince them to relicense the code. It's a matter of interpretation as to whether or not it's illegal to use proprietary apps with GPL'd class libraries. I think that's been discussed to death on the list already. I don't think I want to re-open that discussion, since there isn't a whole lot we can do about it, other than rewrite Kaffe from scratch. Cheers, - Jim On Wed, 27 Aug 2003 15:12:48 +0200 Clemens Eisserer [EMAIL PROTECTED] wrote: Hi there! I´ve ported kaffe´s AWT to GCJ so that it is now possible to create standalone native awt-based apps. Maybe even kaffe could profit, because if bugs or improvements are done by GCJ-people, these improvements are still copatible to kaffes awt. The problem is, that I ever thought, that Kaffe´s Classpath stands under LGPL, but in the AWT-Files is a license-notice that points me to GPL2 (maybe the link is wrong). Does that mean its not legal to use proprietary awt-apps with kaffe? GCJ´s classpath stands under a special GPL license which allows commercial companies to link against libgcj withought making their code gpl, but its not allowed to modify the libgcj-code and sell it withought GPLing the result (like this is possible with LPGL). It would be really important for me that my ported version stands under the same license as GCJ´s classpath or LGPL. Who is the owner of this code? lg Clemens ___ kaffe mailing list [EMAIL PROTECTED] http://kaffe.org/cgi-bin/mailman/listinfo/kaffe ___ kaffe mailing list [EMAIL PROTECTED] http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
