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 -X<something><size> 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.c Wed 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");
@@ -423,12 +423,12 @@
}
vmargs.maxHeapSize = parseSize(argv[i]);
} else {
- vmargs.maxHeapSize = parseSize(&argv[i][3]);
+ vmargs.maxHeapSize = parseSize(&argv[i][j]);
}
}
- else if ((strncmp(argv[i], "-ms", 3) == 0)
- || (strncmp(argv[i], "-Xms", 4) == 0)) {
- if (argv[i][3] == 0) {
+ else if ((strncmp(argv[i], "-ms", (j=3)) == 0)
+ || (strncmp(argv[i], "-Xms", (j=4)) == 0)) {
+ if (argv[i][j] == 0) {
i++;
if (argv[i] == 0) {
fprintf(stderr, "Error: No heap size found
for -ms option.\n");
@@ -436,7 +436,7 @@
}
vmargs.minHeapSize = parseSize(argv[i]);
} else {
- vmargs.minHeapSize = parseSize(&argv[i][3]);
+ vmargs.minHeapSize = parseSize(&argv[i][j]);
}
}
else if (strncmp(argv[i], "-as", 3) == 0) {
Index: kaffe/kaffe/kaffevm/jni.c
diff -u kaffe/kaffe/kaffevm/jni.c:1.90 kaffe/kaffe/kaffevm/jni.c:1.91
--- kaffe/kaffe/kaffevm/jni.c:1.90 Fri Aug 15 15:58:11 2003
+++ kaffe/kaffe/kaffevm/jni.c Wed Aug 27 20:07:25 2003
@@ -40,6 +40,7 @@
#if defined(TRANSLATOR)
#include "seq.h"
#include "slots.h"
+#include "registers.h"
#include "labels.h"
#include "codeproto.h"
#include "basecode.h"
Index: kaffe/libraries/javalib/java/lang/Class.java
diff -u kaffe/libraries/javalib/java/lang/Class.java:1.46
kaffe/libraries/javalib/java/lang/Class.java:1.47
--- kaffe/libraries/javalib/java/lang/Class.java:1.46 Thu Aug 21 10:59:31 2003
+++ kaffe/libraries/javalib/java/lang/Class.java Wed Aug 27 20:07:26 2003
@@ -396,10 +396,12 @@
.append(" (");
/* write parameter types */
- for (int i = 0; i < parameterTypes.length; ++i) {
- buf.append(parameterTypes[i].getName());
- if (i < parameterTypes.length - 1) {
- buf.append(", ");
+ if (parameterTypes != null) {
+ for (int i = 0; i < parameterTypes.length; ++i) {
+ buf.append(parameterTypes[i].getName());
+ if (i < parameterTypes.length - 1) {
+ buf.append(", ");
+ }
}
}
Index: kaffe/test/regression/ProcessClassInst.java
diff -u kaffe/test/regression/ProcessClassInst.java:1.9
kaffe/test/regression/ProcessClassInst.java:1.10
--- kaffe/test/regression/ProcessClassInst.java:1.9 Thu Aug 21 10:59:31 2003
+++ kaffe/test/regression/ProcessClassInst.java Wed Aug 27 20:07:26 2003
@@ -104,6 +104,6 @@
java.lang.NoClassDefFoundError: Base
at java.lang.Class.getConstructor0 (Class.java)
at java.lang.Class.getDeclaredConstructor (Class.java:174)
- at java.lang.Class.newInstance (Class.java:420)
+ at java.lang.Class.newInstance (Class.java:422)
at ProcessClassInst.main (ProcessClassInst.java:72)
*/
Index: kaffe/test/regression/ProcessClassStop.java
diff -u kaffe/test/regression/ProcessClassStop.java:1.8
kaffe/test/regression/ProcessClassStop.java:1.9
--- kaffe/test/regression/ProcessClassStop.java:1.8 Thu Aug 21 10:59:31 2003
+++ kaffe/test/regression/ProcessClassStop.java Wed Aug 27 20:07:26 2003
@@ -107,6 +107,6 @@
java.lang.NoClassDefFoundError: Base
at java.lang.Class.getConstructor0 (Class.java)
at java.lang.Class.getDeclaredConstructor (Class.java:174)
- at java.lang.Class.newInstance (Class.java:420)
+ at java.lang.Class.newInstance (Class.java:422)
at ProcessClassStop.main (ProcessClassStop.java:74)
*/
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
