ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-03 19:54:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

snapshot

Browse Source
This commit is contained in:
Joel Dice 2007-06-21 13:43:33 -06:00
parent 29f9bb84ca
commit 1992482236
3 changed files with 62 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/heap.cpp
View File

@ -20,9 +20,9 @@ void NO_RETURN abort(Context*);
void assert(Context*, bool); void assert(Context*, bool);
void void
indent(unsigned i) indent(unsigned /*i*/)
{ {
for (; i > 0; --i) fprintf(stderr, " "); //for (; i > 0; --i) fprintf(stderr, " ");
} }
class Segment { class Segment {
@ -785,7 +785,7 @@ collect(Context* c, void** p)
cast<object>(copy, offset * BytesPerWord) = childCopy; cast<object>(copy, offset * BytesPerWord) = childCopy;
} }
if (total >= 3 and (second or needsVisit)) { if (visits > 1 and total > 2 and (second or needsVisit)) {
bitsetClear(bitset, last, offset); bitsetClear(bitset, last, offset);
last = offset; last = offset;

17
src/type-generator.cpp
View File

@ -1218,6 +1218,10 @@ writeConstructorParameters(Output* out, Object* t)
out->write(obfuscate(memberName(m))); out->write(obfuscate(memberName(m)));
} break; } break;
case Object::Array: {
out->write(", bool clear");
} break;
default: break; default: break;
} }
} }
@ -1237,6 +1241,17 @@ writeConstructorInitializations(Output* out, Object* t)
out->write(";\n"); out->write(";\n");
} break; } break;
case Object::Array: {
out->write(" if (clear and length) memset(");
if (memberTypeObject(m) == 0) {
out->write("&");
}
writeAccessorName(out, m, true);
out->write("(t, o, 0), 0, length * ");
out->write(arrayElementSize(m));
out->write(");\n");
} break;
default: break; default: break;
} }
} }
@ -1456,7 +1471,7 @@ writeInitialization(Output* out, Object* type)
out->write("{\n"); out->write("{\n");
if (typeObjectMask(type) != 1) { if (typeObjectMask(type) != 1) {
out->write(" object mask = makeIntArray(t, 1);\n"); out->write(" object mask = makeIntArray(t, 1, false);\n");
out->write(" intArrayBody(t, mask, 0) = "); out->write(" intArrayBody(t, mask, 0) = ");
out->write(typeObjectMask(type)); out->write(typeObjectMask(type));

92
src/vm.cpp
View File

@ -238,8 +238,8 @@ visitRoots(Thread* t, Heap::Visitor* v)
v->visit(p->p); v->visit(p->p);
} }
for (Thread* t = t->child; t; t = t->next) { for (Thread* c = t->child; c; c = c->next) {
visitRoots(t, v); visitRoots(c, v);
} }
} }
@ -536,7 +536,7 @@ makeByteArray(Thread* t, const char* format, va_list a)
vsnprintf(buffer, Size - 1, format, a); vsnprintf(buffer, Size - 1, format, a);
object s = makeByteArray(t, strlen(buffer) + 1); object s = makeByteArray(t, strlen(buffer) + 1, false);
memcpy(&byteArrayBody(t, s, 0), buffer, byteArrayLength(t, s)); memcpy(&byteArrayBody(t, s, 0), buffer, byteArrayLength(t, s));
return s; return s;
@ -926,8 +926,7 @@ hashMapGrow(Thread* t, object map, uint32_t (*hash)(Thread*, object))
PROTECT(t, oldArray); PROTECT(t, oldArray);
unsigned newLength = (oldLength ? oldLength * 2 : 32); unsigned newLength = (oldLength ? oldLength * 2 : 32);
object newArray = makeArray(t, newLength); object newArray = makeArray(t, newLength, true);
memset(&arrayBody(t, newArray, 0), 0, newLength * sizeof(object));
if (oldArray) { if (oldArray) {
for (unsigned i = 0; i < oldLength; ++i) { for (unsigned i = 0; i < oldLength; ++i) {
@ -1028,7 +1027,8 @@ object
parsePool(Thread* t, Stream& s) parsePool(Thread* t, Stream& s)
{ {
unsigned poolCount = s.read2() - 1; unsigned poolCount = s.read2() - 1;
object pool = makeArray(t, poolCount); object pool = makeArray(t, poolCount, true);
PROTECT(t, pool); PROTECT(t, pool);
for (unsigned i = 0; i < poolCount; ++i) { for (unsigned i = 0; i < poolCount; ++i) {
@ -1057,28 +1057,28 @@ parsePool(Thread* t, Stream& s)
case CONSTANT_Utf8: { case CONSTANT_Utf8: {
unsigned length = s.read2(); unsigned length = s.read2();
object value = makeByteArray(t, length + 1); object value = makeByteArray(t, length + 1, false);
s.read(reinterpret_cast<uint8_t*>(&byteArrayBody(t, value, 0)), length); s.read(reinterpret_cast<uint8_t*>(&byteArrayBody(t, value, 0)), length);
byteArrayBody(t, value, length) = 0; byteArrayBody(t, value, length) = 0;
set(t, arrayBody(t, pool, i), value); set(t, arrayBody(t, pool, i), value);
} break; } break;
case CONSTANT_Class: { case CONSTANT_Class: {
object value = makeIntArray(t, 2); object value = makeIntArray(t, 2, false);
intArrayBody(t, value, 0) = c; intArrayBody(t, value, 0) = c;
intArrayBody(t, value, 1) = s.read2(); intArrayBody(t, value, 1) = s.read2();
set(t, arrayBody(t, pool, i), value); set(t, arrayBody(t, pool, i), value);
} break; } break;
case CONSTANT_String: { case CONSTANT_String: {
object value = makeIntArray(t, 2); object value = makeIntArray(t, 2, false);
intArrayBody(t, value, 0) = c; intArrayBody(t, value, 0) = c;
intArrayBody(t, value, 1) = s.read2(); intArrayBody(t, value, 1) = s.read2();
set(t, arrayBody(t, pool, i), value); set(t, arrayBody(t, pool, i), value);
} break; } break;
case CONSTANT_NameAndType: { case CONSTANT_NameAndType: {
object value = makeIntArray(t, 3); object value = makeIntArray(t, 3, false);
intArrayBody(t, value, 0) = c; intArrayBody(t, value, 0) = c;
intArrayBody(t, value, 1) = s.read2(); intArrayBody(t, value, 1) = s.read2();
intArrayBody(t, value, 2) = s.read2(); intArrayBody(t, value, 2) = s.read2();
@ -1088,7 +1088,7 @@ parsePool(Thread* t, Stream& s)
case CONSTANT_Fieldref: case CONSTANT_Fieldref:
case CONSTANT_Methodref: case CONSTANT_Methodref:
case CONSTANT_InterfaceMethodref: { case CONSTANT_InterfaceMethodref: {
object value = makeIntArray(t, 3); object value = makeIntArray(t, 3, false);
intArrayBody(t, value, 0) = c; intArrayBody(t, value, 0) = c;
intArrayBody(t, value, 1) = s.read2(); intArrayBody(t, value, 1) = s.read2();
intArrayBody(t, value, 2) = s.read2(); intArrayBody(t, value, 2) = s.read2();
@ -1173,7 +1173,7 @@ parseInterfaceTable(Thread* t, Stream& s, object class_, object pool)
object interfaceTable = 0; object interfaceTable = 0;
if (hashMapSize(t, map)) { if (hashMapSize(t, map)) {
interfaceTable = makeArray(t, hashMapSize(t, map)); interfaceTable = makeArray(t, hashMapSize(t, map), true);
PROTECT(t, interfaceTable); PROTECT(t, interfaceTable);
unsigned i = 0; unsigned i = 0;
@ -1189,7 +1189,8 @@ parseInterfaceTable(Thread* t, Stream& s, object class_, object pool)
// we'll fill in this table in parseMethodTable(): // we'll fill in this table in parseMethodTable():
object vtable = makeArray object vtable = makeArray
(t, arrayLength(t, interfaceMethodTable(t, interface))); (t, arrayLength(t, interfaceMethodTable(t, interface)), true);
set(t, arrayBody(t, interfaceTable, i++), vtable); set(t, arrayBody(t, interfaceTable, i++), vtable);
} }
} }
@ -1249,7 +1250,7 @@ parseFieldTable(Thread* t, Stream& s, object class_, object pool)
if (count) { if (count) {
unsigned staticOffset = 0; unsigned staticOffset = 0;
object fieldTable = makeArray(t, count); object fieldTable = makeArray(t, count, true);
PROTECT(t, fieldTable); PROTECT(t, fieldTable);
for (unsigned i = 0; i < count; ++i) { for (unsigned i = 0; i < count; ++i) {
@ -1288,8 +1289,7 @@ parseFieldTable(Thread* t, Stream& s, object class_, object pool)
set(t, classFieldTable(t, class_), fieldTable); set(t, classFieldTable(t, class_), fieldTable);
if (staticOffset) { if (staticOffset) {
object staticTable = makeArray(t, staticOffset); object staticTable = makeArray(t, staticOffset, true);
memset(&arrayBody(t, staticTable, 0), 0, staticOffset * BytesPerWord);
set(t, classStaticTable(t, class_), staticTable); set(t, classStaticTable(t, class_), staticTable);
} }
@ -1298,9 +1298,7 @@ parseFieldTable(Thread* t, Stream& s, object class_, object pool)
classFixedSize(t, class_) = divide(memberOffset, BytesPerWord); classFixedSize(t, class_) = divide(memberOffset, BytesPerWord);
object mask = makeIntArray object mask = makeIntArray
(t, divide(classFixedSize(t, class_), BitsPerWord)); (t, divide(classFixedSize(t, class_), BitsPerWord), true);
memset(&intArrayBody(t, mask, 0), 0, intArrayLength(t, mask) * 4);
bool sawReferenceField = false; bool sawReferenceField = false;
for (object c = class_; c; c = classSuper(t, c)) { for (object c = class_; c; c = classSuper(t, c)) {
@ -1329,14 +1327,14 @@ parseCode(Thread* t, Stream& s, object pool)
unsigned maxLocals = s.read2(); unsigned maxLocals = s.read2();
unsigned length = s.read4(); unsigned length = s.read4();
object code = makeCode(t, pool, 0, maxStack, maxLocals, length); object code = makeCode(t, pool, 0, maxStack, maxLocals, length, false);
s.read(&codeBody(t, code, 0), length); s.read(&codeBody(t, code, 0), length);
unsigned ehtLength = s.read2(); unsigned ehtLength = s.read2();
if (ehtLength) { if (ehtLength) {
PROTECT(t, code); PROTECT(t, code);
object eht = makeExceptionHandlerTable(t, ehtLength); object eht = makeExceptionHandlerTable(t, ehtLength, false);
for (unsigned i = 0; i < ehtLength; ++i) { for (unsigned i = 0; i < ehtLength; ++i) {
ExceptionHandler* eh = exceptionHandlerTableBody(t, eht, i); ExceptionHandler* eh = exceptionHandlerTableBody(t, eht, i);
exceptionHandlerStart(eh) = s.read2(); exceptionHandlerStart(eh) = s.read2();
@ -1416,7 +1414,7 @@ parseMethodTable(Thread* t, Stream& s, object class_, object pool)
unsigned count = s.read2(); unsigned count = s.read2();
if (count) { if (count) {
object methodTable = makeArray(t, count); object methodTable = makeArray(t, count, true);
PROTECT(t, methodTable); PROTECT(t, methodTable);
for (unsigned i = 0; i < count; ++i) { for (unsigned i = 0; i < count; ++i) {
@ -1479,7 +1477,7 @@ parseMethodTable(Thread* t, Stream& s, object class_, object pool)
if (virtualCount) { if (virtualCount) {
// generate class vtable // generate class vtable
object vtable = makeArray(t, virtualCount); object vtable = makeArray(t, virtualCount, false);
unsigned i = 0; unsigned i = 0;
if (superVirtualTable) { if (superVirtualTable) {
@ -1783,8 +1781,7 @@ run(Thread* t)
object class_ = resolveClass(t, codePool(t, code), index - 1); object class_ = resolveClass(t, codePool(t, code), index - 1);
if (UNLIKELY(exception)) goto throw_; if (UNLIKELY(exception)) goto throw_;
object array = makeObjectArray(t, class_, c); object array = makeObjectArray(t, class_, c, true);
memset(&objectArrayBody(t, array, 0), 0, c * 4);
push(t, array); push(t, array);
} else { } else {
@ -2814,55 +2811,43 @@ run(Thread* t)
uint8_t type = codeBody(t, code, ip++); uint8_t type = codeBody(t, code, ip++);
object array; object array;
unsigned factor;
switch (type) { switch (type) {
case T_BOOLEAN: case T_BOOLEAN:
array = makeBooleanArray(t, c); array = makeBooleanArray(t, c, true);
factor = 1;
break; break;
case T_CHAR: case T_CHAR:
array = makeCharArray(t, c); array = makeCharArray(t, c, true);
factor = 2;
break; break;
case T_FLOAT: case T_FLOAT:
array = makeFloatArray(t, c); array = makeFloatArray(t, c, true);
factor = 4;
break; break;
case T_DOUBLE: case T_DOUBLE:
array = makeDoubleArray(t, c); array = makeDoubleArray(t, c, true);
factor = 8;
break; break;
case T_BYTE: case T_BYTE:
array = makeByteArray(t, c); array = makeByteArray(t, c, true);
factor = 1;
break; break;
case T_SHORT: case T_SHORT:
array = makeShortArray(t, c); array = makeShortArray(t, c, true);
factor = 2;
break; break;
case T_INT: case T_INT:
array = makeIntArray(t, c); array = makeIntArray(t, c, true);
factor = 4;
break; break;
case T_LONG: case T_LONG:
array = makeLongArray(t, c); array = makeLongArray(t, c, true);
factor = 8;
break; break;
default: abort(t); default: abort(t);
} }
memset(static_cast<uint8_t*>(array) + sizeof(object) + 4, 0,
c * factor);
push(t, array); push(t, array);
} else { } else {
object message = makeString(t, "%d", c); object message = makeString(t, "%d", c);
@ -3060,8 +3045,13 @@ run(Thread* t)
sp -= parameterCount; sp -= parameterCount;
frame = makeFrame(t, code, frame, 0, sp, frame = makeFrame(t, code, frame, 0, sp,
codeMaxLocals(t, methodCode(t, code))); codeMaxLocals(t, methodCode(t, code)), false);
memcpy(&frameLocals(t, frame, 0), stack + sp, parameterCount);
memcpy(&frameLocals(t, frame, 0), stack + sp, parameterCount * BytesPerWord);
memset(&frameLocals(t, frame, 0) + parameterCount, 0,
(frameLength(t, frame) - parameterCount) * BytesPerWord);
ip = 0; ip = 0;
goto loop; goto loop;
@ -3093,7 +3083,7 @@ run(Thread* t)
if (t->thread) { if (t->thread) {
object method = threadExceptionHandler(t, t->thread); object method = threadExceptionHandler(t, t->thread);
code = methodCode(t, method); code = methodCode(t, method);
frame = makeFrame(t, method, 0, 0, 0, codeMaxLocals(t, code)); frame = makeFrame(t, method, 0, 0, 0, codeMaxLocals(t, code), true);
sp = 0; sp = 0;
ip = 0; ip = 0;
push(t, exception); push(t, exception);
@ -3138,10 +3128,12 @@ run(Thread* t, const char* className, int argc, const char** argv)
object method = findMethodInClass(t, class_, reference); object method = findMethodInClass(t, class_, reference);
if (LIKELY(t->exception == 0)) { if (LIKELY(t->exception == 0)) {
t->code = methodCode(t, method); t->code = methodCode(t, method);
t->frame = makeFrame(t, method, 0, 0, 0, codeMaxLocals(t, t->code)); t->frame = makeFrame
(t, method, 0, 0, 0, codeMaxLocals(t, t->code), true);
object args = makeObjectArray object args = makeObjectArray
(t, arrayBody(t, t->vm->types, Machine::StringType), argc); (t, arrayBody(t, t->vm->types, Machine::StringType), argc, true);
PROTECT(t, args); PROTECT(t, args);
for (int i = 0; i < argc; ++i) { for (int i = 0; i < argc; ++i) {