mirror of
https://github.com/corda/corda.git
synced 2025-06-16 14:18:20 +00:00
bugfixes
This commit is contained in:
@ -84,7 +84,7 @@ public class Field<T> extends AccessibleObject {
|
|||||||
(Double.longBitsToDouble(getPrimitive(target, code, offset)));
|
(Double.longBitsToDouble(getPrimitive(target, code, offset)));
|
||||||
|
|
||||||
case ObjectField:
|
case ObjectField:
|
||||||
return getObject(instance, offset);
|
return getObject(target, offset);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw new Error();
|
throw new Error();
|
||||||
|
2
makefile
2
makefile
@ -28,7 +28,7 @@ src = src
|
|||||||
classpath = classpath
|
classpath = classpath
|
||||||
test = test
|
test = test
|
||||||
|
|
||||||
input = $(test-build)/References.class
|
input = $(test-build)/Hello.class
|
||||||
|
|
||||||
build-cxx = g++
|
build-cxx = g++
|
||||||
build-cc = gcc
|
build-cc = gcc
|
||||||
|
@ -210,7 +210,7 @@ walk(Thread* t, Heap::Walker* w, object o)
|
|||||||
memcpy(mask, &singletonBody(t, o, length - maskSize),
|
memcpy(mask, &singletonBody(t, o, length - maskSize),
|
||||||
maskSize * BytesPerWord);
|
maskSize * BytesPerWord);
|
||||||
|
|
||||||
walk(t, w, mask, length - maskSize, 0, 0);
|
walk(t, w, mask, (length + 2) * BytesPerWord, 0, 0);
|
||||||
} else {
|
} else {
|
||||||
w->visit(0);
|
w->visit(0);
|
||||||
}
|
}
|
||||||
@ -980,7 +980,7 @@ parseFieldTable(Thread* t, Stream& s, object class_, object pool)
|
|||||||
|
|
||||||
if (staticTypes[i] == ObjectField) {
|
if (staticTypes[i] == ObjectField) {
|
||||||
unsigned index = (offset / BytesPerWord) + 2;
|
unsigned index = (offset / BytesPerWord) + 2;
|
||||||
mask[index / 32] |= 1 << (index % 32);
|
mask[index / 32] |= static_cast<uint32_t>(1) << (index % 32);
|
||||||
}
|
}
|
||||||
|
|
||||||
offset += size;
|
offset += size;
|
||||||
|
@ -27,7 +27,7 @@ namespace vm {
|
|||||||
const bool Verbose = false;
|
const bool Verbose = false;
|
||||||
const bool DebugRun = false;
|
const bool DebugRun = false;
|
||||||
const bool DebugStack = false;
|
const bool DebugStack = false;
|
||||||
const bool DebugMonitors = true;
|
const bool DebugMonitors = false;
|
||||||
const bool DebugReferences = false;
|
const bool DebugReferences = false;
|
||||||
|
|
||||||
const uintptr_t HashTakenMark = 1;
|
const uintptr_t HashTakenMark = 1;
|
||||||
|
Reference in New Issue
Block a user