From 4ade402f1ba2736456471ca4d9f256db70706dbc Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Fri, 14 Sep 2007 14:35:37 -0600 Subject: [PATCH] bugfixes; SWT ControlExample works on x86_32 --- classpath/java/util/ResourceBundle.java | 10 +- makefile | 4 +- src/run.cpp | 126 ++++++++++++++++++++---- 3 files changed, 117 insertions(+), 23 deletions(-) diff --git a/classpath/java/util/ResourceBundle.java b/classpath/java/util/ResourceBundle.java index 3c3bb694a4..55a7a979d1 100644 --- a/classpath/java/util/ResourceBundle.java +++ b/classpath/java/util/ResourceBundle.java @@ -5,6 +5,7 @@ import java.io.InputStream; import java.io.IOException; public abstract class ResourceBundle { + protected String name; protected ResourceBundle parent; private static String replace(char a, char b, String s) { @@ -24,7 +25,7 @@ public abstract class ResourceBundle { (replace('.', '/', name) + ".properties"); if (in != null) { try { - return new MapResourceBundle(new Parser().parse(in), parent); + return new MapResourceBundle(name, parent, new Parser().parse(in)); } finally { in.close(); } @@ -96,7 +97,7 @@ public abstract class ResourceBundle { return value; } } - return null; + throw new MissingResourceException(key, name, key); } public String getString(String key) { @@ -108,7 +109,10 @@ public abstract class ResourceBundle { private static class MapResourceBundle extends ResourceBundle { private final Map map; - public MapResourceBundle(Map map, ResourceBundle parent) { + public MapResourceBundle(String name, ResourceBundle parent, + Map map) + { + this.name = name; this.parent = parent; this.map = map; } diff --git a/makefile b/makefile index a92670ca57..173b972dae 100644 --- a/makefile +++ b/makefile @@ -52,8 +52,8 @@ cflags += -O0 -g3 -DVM_STRESS -DVM_STRESS_MAJOR endif ifeq ($(mode),fast) cflags += -O3 -DNDEBUG -#strip = strip -#show-size = ls -l +strip = strip +show-size = ls -l endif cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(bld)/%.o,$(x))) diff --git a/src/run.cpp b/src/run.cpp index e63d566664..25b2ba87ab 100644 --- a/src/run.cpp +++ b/src/run.cpp @@ -517,6 +517,37 @@ store(Thread* t, unsigned index) BytesPerWord * 2); } +void +populateMultiArray(Thread* t, object array, int32_t* counts, + unsigned index, unsigned dimensions) +{ + if (index + 1 == dimensions or counts[index] == 0) { + return; + } + + PROTECT(t, array); + + object spec = className(t, objectClass(t, array)); + PROTECT(t, spec); + + object elementSpec = makeByteArray + (t, byteArrayLength(t, spec) - 1, false); + memcpy(&byteArrayBody(t, elementSpec, 0), + &byteArrayBody(t, spec, 1), + byteArrayLength(t, spec) - 1); + + object class_ = resolveClass(t, elementSpec); + PROTECT(t, class_); + + for (int32_t i = 0; i < counts[index]; ++i) { + object a = makeArray(t, counts[index + 1], true); + setObjectClass(t, a, class_); + set(t, objectArrayBody(t, array, i), a); + + populateMultiArray(t, a, counts, index + 1, dimensions); + } +} + object run(Thread* t) { @@ -701,15 +732,32 @@ run(Thread* t) object array = popObject(t); if (LIKELY(array)) { - if (LIKELY(index >= 0 and - static_cast(index) < byteArrayLength(t, array))) + if (objectClass(t, array) + == arrayBody(t, t->vm->types, Machine::BooleanArrayType)) { - pushInt(t, byteArrayBody(t, array, index)); + if (LIKELY(index >= 0 and + static_cast(index) + < booleanArrayLength(t, array))) + { + pushInt(t, booleanArrayBody(t, array, index)); + } else { + object message = makeString(t, "%d not in [0,%d)", index, + booleanArrayLength(t, array)); + exception = makeArrayIndexOutOfBoundsException(t, message); + goto throw_; + } } else { - object message = makeString(t, "%d not in [0,%d)", index, - byteArrayLength(t, array)); - exception = makeArrayIndexOutOfBoundsException(t, message); - goto throw_; + if (LIKELY(index >= 0 and + static_cast(index) + < byteArrayLength(t, array))) + { + pushInt(t, byteArrayBody(t, array, index)); + } else { + object message = makeString(t, "%d not in [0,%d)", index, + byteArrayLength(t, array)); + exception = makeArrayIndexOutOfBoundsException(t, message); + goto throw_; + } } } else { exception = makeNullPointerException(t); @@ -723,15 +771,31 @@ run(Thread* t) object array = popObject(t); if (LIKELY(array)) { - if (LIKELY(index >= 0 and - static_cast(index) < byteArrayLength(t, array))) + if (objectClass(t, array) + == arrayBody(t, t->vm->types, Machine::BooleanArrayType)) { - byteArrayBody(t, array, index) = value; + if (LIKELY(index >= 0 and + static_cast(index) + < booleanArrayLength(t, array))) + { + booleanArrayBody(t, array, index) = value; + } else { + object message = makeString(t, "%d not in [0,%d)", index, + booleanArrayLength(t, array)); + exception = makeArrayIndexOutOfBoundsException(t, message); + goto throw_; + } } else { - object message = makeString(t, "%d not in [0,%d)", index, - byteArrayLength(t, array)); - exception = makeArrayIndexOutOfBoundsException(t, message); - goto throw_; + if (LIKELY(index >= 0 and + static_cast(index) < byteArrayLength(t, array))) + { + byteArrayBody(t, array, index) = value; + } else { + object message = makeString(t, "%d not in [0,%d)", index, + byteArrayLength(t, array)); + exception = makeArrayIndexOutOfBoundsException(t, message); + goto throw_; + } } } else { exception = makeNullPointerException(t); @@ -962,7 +1026,7 @@ run(Thread* t) fprintf(stderr, "dup2\n"); } - memcpy(stack + ((sp + 1) * 2), stack + ((sp - 2) * 2), BytesPerWord * 4); + memcpy(stack + ((sp ) * 2), stack + ((sp - 2) * 2), BytesPerWord * 4); sp += 2; } goto loop; @@ -1719,9 +1783,9 @@ run(Thread* t) case iushr: { int32_t b = popInt(t); - int32_t a = popInt(t); + uint32_t a = popInt(t); - pushInt(t, static_cast(a >> b)); + pushInt(t, a >> b); } goto loop; case ixor: { @@ -2023,7 +2087,7 @@ run(Thread* t) } goto loop; case lushr: { - uint64_t b = popLong(t); + int64_t b = popLong(t); uint64_t a = popLong(t); pushLong(t, a >> b); @@ -2056,6 +2120,32 @@ run(Thread* t) } } goto loop; + case multianewarray: { + uint16_t index = codeReadInt16(t, ip); + uint8_t dimensions = codeBody(t, code, ip++); + + object class_ = resolveClass(t, codePool(t, code), index - 1); + if (UNLIKELY(exception)) goto throw_; + + int32_t counts[dimensions]; + for (int i = dimensions - 1; i >= 0; --i) { + counts[i] = popInt(t); + if (UNLIKELY(counts[i] < 0)) { + object message = makeString(t, "%d", counts[i]); + exception = makeNegativeArraySizeException(t, message); + goto throw_; + } + } + + object array = makeArray(t, counts[0], true); + setObjectClass(t, array, class_); + PROTECT(t, array); + + populateMultiArray(t, array, counts, 0, dimensions); + + pushObject(t, array); + } goto loop; + case new_: { uint16_t index = codeReadInt16(t, ip);