This commit is contained in:
Joel Dice 2007-11-02 15:42:19 -06:00
parent e820b6a8a4
commit 7dfbd87a40
4 changed files with 5 additions and 5 deletions

View File

@ -84,7 +84,7 @@ public class Field<T> extends AccessibleObject {
(Double.longBitsToDouble(getPrimitive(target, code, offset)));
case ObjectField:
return getObject(instance, offset);
return getObject(target, offset);
default:
throw new Error();

View File

@ -28,7 +28,7 @@ src = src
classpath = classpath
test = test
input = $(test-build)/References.class
input = $(test-build)/Hello.class
build-cxx = g++
build-cc = gcc

View File

@ -210,7 +210,7 @@ walk(Thread* t, Heap::Walker* w, object o)
memcpy(mask, &singletonBody(t, o, length - maskSize),
maskSize * BytesPerWord);
walk(t, w, mask, length - maskSize, 0, 0);
walk(t, w, mask, (length + 2) * BytesPerWord, 0, 0);
} else {
w->visit(0);
}
@ -980,7 +980,7 @@ parseFieldTable(Thread* t, Stream& s, object class_, object pool)
if (staticTypes[i] == ObjectField) {
unsigned index = (offset / BytesPerWord) + 2;
mask[index / 32] |= 1 << (index % 32);
mask[index / 32] |= static_cast<uint32_t>(1) << (index % 32);
}
offset += size;

View File

@ -27,7 +27,7 @@ namespace vm {
const bool Verbose = false;
const bool DebugRun = false;
const bool DebugStack = false;
const bool DebugMonitors = true;
const bool DebugMonitors = false;
const bool DebugReferences = false;
const uintptr_t HashTakenMark = 1;