ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-09 14:33:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

add builtin.cpp changes

Browse Source
This commit is contained in:
Joshua Warner 2014-06-28 23:34:40 -06:00 committed by Joshua Warner
parent 924f242e66
commit 86d9249f29
1 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/builtin.cpp
View File

@ -48,12 +48,12 @@ resolveSystemClassThrow(Thread* t, GcClassLoader* loader, GcByteArray* spec)
(t, loader, spec, true, GcClassNotFoundException::Type); (t, loader, spec, true, GcClassNotFoundException::Type);
} }
object GcField*
fieldForOffsetInClass(Thread* t, GcClass* c, unsigned offset) fieldForOffsetInClass(Thread* t, GcClass* c, unsigned offset)
{ {
GcClass* super = c->super(); GcClass* super = c->super();
if (super) { if (super) {
object field = fieldForOffsetInClass(t, super, offset); GcField* field = fieldForOffsetInClass(t, super, offset);
if (field) { if (field) {
return field; return field;
} }
@ -62,9 +62,9 @@ fieldForOffsetInClass(Thread* t, GcClass* c, unsigned offset)
object table = c->fieldTable(); object table = c->fieldTable();
if (table) { if (table) {
for (unsigned i = 0; i < objectArrayLength(t, table); ++i) { for (unsigned i = 0; i < objectArrayLength(t, table); ++i) {
object field = objectArrayBody(t, table, i); GcField* field = cast<GcField>(t, objectArrayBody(t, table, i));
if ((fieldFlags(t, field) & ACC_STATIC) == 0 if ((field->flags() & ACC_STATIC) == 0
and fieldOffset(t, field) == offset) and field->offset() == offset)
{ {
return field; return field;
} }
@ -74,7 +74,7 @@ fieldForOffsetInClass(Thread* t, GcClass* c, unsigned offset)
return 0; return 0;
} }
object GcField*
fieldForOffset(Thread* t, GcSingleton* o, unsigned offset) fieldForOffset(Thread* t, GcSingleton* o, unsigned offset)
{ {
GcClass* c = objectClass(t, o); GcClass* c = objectClass(t, o);
@ -83,9 +83,9 @@ fieldForOffset(Thread* t, GcSingleton* o, unsigned offset)
object table = c->fieldTable(); object table = c->fieldTable();
if (table) { if (table) {
for (unsigned i = 0; i < objectArrayLength(t, table); ++i) { for (unsigned i = 0; i < objectArrayLength(t, table); ++i) {
object field = objectArrayBody(t, table, i); GcField* field = cast<GcField>(t, objectArrayBody(t, table, i));
if ((fieldFlags(t, field) & ACC_STATIC) if ((field->flags() & ACC_STATIC)
and fieldOffset(t, field) == offset) and field->offset() == offset)
{ {
return field; return field;
} }
@ -93,7 +93,7 @@ fieldForOffset(Thread* t, GcSingleton* o, unsigned offset)
} }
abort(t); abort(t);
} else { } else {
object field = fieldForOffsetInClass(t, c, offset); GcField* field = fieldForOffsetInClass(t, c, offset);
if (field) { if (field) {
return field; return field;
} else { } else {
@ -132,10 +132,10 @@ Avian_avian_Classes_resolveVMClass
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[0])); GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[0]));
object spec = reinterpret_cast<object>(arguments[1]); GcByteArray* spec = cast<GcByteArray>(t, reinterpret_cast<object>(arguments[1]));
return reinterpret_cast<int64_t> return reinterpret_cast<int64_t>
(resolveClass(t, loader, cast<GcByteArray>(t, spec), true, GcClassNotFoundException::Type)); (resolveClass(t, loader, spec, true, GcClassNotFoundException::Type));
} }
extern "C" AVIAN_EXPORT int64_t JNICALL extern "C" AVIAN_EXPORT int64_t JNICALL
@ -143,7 +143,7 @@ Avian_avian_Classes_defineVMClass
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[0])); GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[0]));
object b = reinterpret_cast<object>(arguments[1]); GcByteArray* b = cast<GcByteArray>(t, reinterpret_cast<object>(arguments[1]));
int offset = arguments[2]; int offset = arguments[2];
int length = arguments[3]; int length = arguments[3];
@ -153,7 +153,7 @@ Avian_avian_Classes_defineVMClass
THREAD_RESOURCE2(t, uint8_t*, buffer, int, length, THREAD_RESOURCE2(t, uint8_t*, buffer, int, length,
t->m->heap->free(buffer, length)); t->m->heap->free(buffer, length));
memcpy(buffer, &byteArrayBody(t, b, offset), length); memcpy(buffer, &b->body()[offset], length);
return reinterpret_cast<int64_t>(defineClass(t, loader, buffer, length)); return reinterpret_cast<int64_t>(defineClass(t, loader, buffer, length));
} }
@ -163,9 +163,9 @@ Avian_avian_SystemClassLoader_findLoadedVMClass
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[0])); GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[0]));
object name = reinterpret_cast<object>(arguments[1]); GcString* name = cast<GcString>(t, reinterpret_cast<object>(arguments[1]));
return search(t, loader, cast<GcString>(t, name), findLoadedClass, true); return search(t, loader, name, findLoadedClass, true);
} }
extern "C" AVIAN_EXPORT int64_t JNICALL extern "C" AVIAN_EXPORT int64_t JNICALL
@ -173,7 +173,7 @@ Avian_avian_SystemClassLoader_vmClass
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
return reinterpret_cast<int64_t> return reinterpret_cast<int64_t>
(jclassVmClass(t, reinterpret_cast<object>(arguments[0]))); (cast<GcJclass>(t, reinterpret_cast<object>(arguments[0]))->vmClass());
} }
extern "C" AVIAN_EXPORT int64_t JNICALL extern "C" AVIAN_EXPORT int64_t JNICALL
@ -181,9 +181,9 @@ Avian_avian_SystemClassLoader_findVMClass
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[0])); GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[0]));
object name = reinterpret_cast<object>(arguments[1]); GcString* name = cast<GcString>(t, reinterpret_cast<object>(arguments[1]));
return search(t, loader, cast<GcString>(t, name), resolveSystemClassThrow, true); return search(t, loader, name, resolveSystemClassThrow, true);
} }
extern "C" AVIAN_EXPORT int64_t JNICALL extern "C" AVIAN_EXPORT int64_t JNICALL
@ -191,11 +191,11 @@ Avian_avian_SystemClassLoader_resourceURLPrefix
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[0])); GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[0]));
object name = reinterpret_cast<object>(arguments[1]); GcString* name = cast<GcString>(t, reinterpret_cast<object>(arguments[1]));
if (LIKELY(name)) { if (LIKELY(name)) {
THREAD_RUNTIME_ARRAY(t, char, n, cast<GcString>(t, name)->length(t) + 1); THREAD_RUNTIME_ARRAY(t, char, n, name->length(t) + 1);
stringChars(t, cast<GcString>(t, name), RUNTIME_ARRAY_BODY(n)); stringChars(t, name, RUNTIME_ARRAY_BODY(n));
const char* name = static_cast<Finder*> const char* name = static_cast<Finder*>
(loader->as<GcSystemClassLoader>(t)->finder())->urlPrefix(RUNTIME_ARRAY_BODY(n)); (loader->as<GcSystemClassLoader>(t)->finder())->urlPrefix(RUNTIME_ARRAY_BODY(n));
@ -211,15 +211,14 @@ Avian_avian_SystemClassLoader_00024ResourceEnumeration_nextResourceURLPrefix
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[1])); GcClassLoader* loader = cast<GcClassLoader>(t, reinterpret_cast<object>(arguments[1]));
object name = reinterpret_cast<object>(arguments[2]); GcString* name = cast<GcString>(t, reinterpret_cast<object>(arguments[2]));
object finderElementPtrPtr = reinterpret_cast<object>(arguments[3]); GcLongArray* finderElementPtrPtr = cast<GcLongArray>(t, reinterpret_cast<object>(arguments[3]));
if (LIKELY(name) && LIKELY(finderElementPtrPtr)) { if (LIKELY(name) && LIKELY(finderElementPtrPtr)) {
THREAD_RUNTIME_ARRAY(t, char, n, cast<GcString>(t, name)->length(t) + 1); THREAD_RUNTIME_ARRAY(t, char, n, name->length(t) + 1);
stringChars(t, cast<GcString>(t, name), RUNTIME_ARRAY_BODY(n)); stringChars(t, name, RUNTIME_ARRAY_BODY(n));
void *&finderElementPtr = reinterpret_cast<void *&>(longArrayBody(t, void *&finderElementPtr = reinterpret_cast<void *&>(finderElementPtrPtr->body()[0]);
finderElementPtrPtr, 0));
const char* name = static_cast<Finder*> const char* name = static_cast<Finder*>
(loader->as<GcSystemClassLoader>(t)->finder())->nextUrlPrefix(RUNTIME_ARRAY_BODY(n), (loader->as<GcSystemClassLoader>(t)->finder())->nextUrlPrefix(RUNTIME_ARRAY_BODY(n),
finderElementPtr); finderElementPtr);
@ -242,27 +241,27 @@ extern "C" AVIAN_EXPORT int64_t JNICALL
Avian_avian_SystemClassLoader_getPackageSource Avian_avian_SystemClassLoader_getPackageSource
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
object name = reinterpret_cast<object>(arguments[0]); GcString* name = cast<GcString>(t, reinterpret_cast<object>(arguments[0]));
PROTECT(t, name); PROTECT(t, name);
ACQUIRE(t, t->m->classLock); ACQUIRE(t, t->m->classLock);
THREAD_RUNTIME_ARRAY(t, char, chars, cast<GcString>(t, name)->length(t) + 2); THREAD_RUNTIME_ARRAY(t, char, chars, name->length(t) + 2);
stringChars(t, cast<GcString>(t, name), RUNTIME_ARRAY_BODY(chars)); stringChars(t, name, RUNTIME_ARRAY_BODY(chars));
replace('.', '/', RUNTIME_ARRAY_BODY(chars)); replace('.', '/', RUNTIME_ARRAY_BODY(chars));
RUNTIME_ARRAY_BODY(chars)[cast<GcString>(t, name)->length(t)] = '/'; RUNTIME_ARRAY_BODY(chars)[name->length(t)] = '/';
RUNTIME_ARRAY_BODY(chars)[cast<GcString>(t, name)->length(t) + 1] = 0; RUNTIME_ARRAY_BODY(chars)[name->length(t) + 1] = 0;
object key = reinterpret_cast<object>(makeByteArray(t, RUNTIME_ARRAY_BODY(chars))); GcByteArray* key = makeByteArray(t, RUNTIME_ARRAY_BODY(chars));
object array = hashMapFind GcByteArray* array = cast<GcByteArray>(t, hashMapFind
(t, cast<GcHashMap>(t, root(t, Machine::PackageMap)), key, byteArrayHash, byteArrayEqual); (t, cast<GcHashMap>(t, root(t, Machine::PackageMap)), reinterpret_cast<object>(key), byteArrayHash, byteArrayEqual));
if (array) { if (array) {
return reinterpret_cast<uintptr_t> return reinterpret_cast<uintptr_t>(makeLocalReference(
(makeLocalReference t,
(t, reinterpret_cast<object>(t->m->classpath->makeString reinterpret_cast<object>(t->m->classpath->makeString(
(t, array, 0, byteArrayLength(t, array))))); t, reinterpret_cast<object>(array), 0, array->length()))));
} else { } else {
return 0; return 0;
} }
@ -320,11 +319,11 @@ extern "C" AVIAN_EXPORT int64_t JNICALL
Avian_avian_avianvmresource_Handler_00024ResourceInputStream_getContentLength Avian_avian_avianvmresource_Handler_00024ResourceInputStream_getContentLength
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
object path = reinterpret_cast<object>(*arguments); GcString* path = cast<GcString>(t, reinterpret_cast<object>(*arguments));
if (LIKELY(path)) { if (LIKELY(path)) {
THREAD_RUNTIME_ARRAY(t, char, p, cast<GcString>(t, path)->length(t) + 1); THREAD_RUNTIME_ARRAY(t, char, p, path->length(t) + 1);
stringChars(t, cast<GcString>(t, path), RUNTIME_ARRAY_BODY(p)); stringChars(t, path, RUNTIME_ARRAY_BODY(p));
System::Region* r = t->m->bootFinder->find(RUNTIME_ARRAY_BODY(p)); System::Region* r = t->m->bootFinder->find(RUNTIME_ARRAY_BODY(p));
if (r == 0) { if (r == 0) {
@ -344,11 +343,11 @@ extern "C" AVIAN_EXPORT int64_t JNICALL
Avian_avian_avianvmresource_Handler_00024ResourceInputStream_open Avian_avian_avianvmresource_Handler_00024ResourceInputStream_open
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
object path = reinterpret_cast<object>(*arguments); GcString* path = cast<GcString>(t, reinterpret_cast<object>(*arguments));
if (LIKELY(path)) { if (LIKELY(path)) {
THREAD_RUNTIME_ARRAY(t, char, p, cast<GcString>(t, path)->length(t) + 1); THREAD_RUNTIME_ARRAY(t, char, p, path->length(t) + 1);
stringChars(t, cast<GcString>(t, path), RUNTIME_ARRAY_BODY(p)); stringChars(t, path, RUNTIME_ARRAY_BODY(p));
System::Region* r = t->m->bootFinder->find(RUNTIME_ARRAY_BODY(p)); System::Region* r = t->m->bootFinder->find(RUNTIME_ARRAY_BODY(p));
if (r == 0) { if (r == 0) {
@ -393,7 +392,7 @@ Avian_avian_avianvmresource_Handler_00024ResourceInputStream_read__JI_3BII
{ {
int64_t peer; memcpy(&peer, arguments, 8); int64_t peer; memcpy(&peer, arguments, 8);
int32_t position = arguments[2]; int32_t position = arguments[2];
object buffer = reinterpret_cast<object>(arguments[3]); GcByteArray* buffer = cast<GcByteArray>(t, reinterpret_cast<object>(arguments[3]));
int32_t offset = arguments[4]; int32_t offset = arguments[4];
int32_t length = arguments[5]; int32_t length = arguments[5];
@ -406,7 +405,7 @@ Avian_avian_avianvmresource_Handler_00024ResourceInputStream_read__JI_3BII
if (length <= 0) { if (length <= 0) {
return -1; return -1;
} else { } else {
memcpy(&byteArrayBody(t, buffer, offset), region->start() + position, memcpy(&buffer->body()[offset], region->start() + position,
length); length);
return length; return length;
} }
@ -734,16 +733,16 @@ Avian_java_nio_FixedArrayByteBuffer_allocateFixed
(Thread* t, object, uintptr_t* arguments) (Thread* t, object, uintptr_t* arguments)
{ {
int capacity = arguments[0]; int capacity = arguments[0];
object address = reinterpret_cast<object>(arguments[1]); GcLongArray* address = cast<GcLongArray>(t, reinterpret_cast<object>(arguments[1]));
PROTECT(t, address); PROTECT(t, address);
object array = allocate3 GcArray* array = reinterpret_cast<GcArray*>(allocate3
(t, t->m->heap, Machine::FixedAllocation, ArrayBody + capacity, false); (t, t->m->heap, Machine::FixedAllocation, ArrayBody + capacity, false));
setObjectClass(t, array, type(t, GcByteArray::Type)); setObjectClass(t, reinterpret_cast<object>(array), type(t, GcByteArray::Type));
byteArrayLength(t, array) = capacity; array->length() = capacity;
longArrayBody(t, address, 0) = reinterpret_cast<intptr_t>(array) + ArrayBody; address->body()[0] = reinterpret_cast<intptr_t>(array) + ArrayBody;
return reinterpret_cast<intptr_t>(array); return reinterpret_cast<intptr_t>(array);
} }
@ -869,7 +868,7 @@ Avian_sun_misc_Unsafe_getLongVolatile
if (objectClass(t, o)->arrayDimensions()) { if (objectClass(t, o)->arrayDimensions()) {
lock = reinterpret_cast<object>(objectClass(t, o)); lock = reinterpret_cast<object>(objectClass(t, o));
} else { } else {
lock = fieldForOffset(t, cast<GcSingleton>(t, o), offset); lock = reinterpret_cast<object>(fieldForOffset(t, cast<GcSingleton>(t, o), offset));
} }
PROTECT(t, o); PROTECT(t, o);
@ -901,7 +900,7 @@ Avian_sun_misc_Unsafe_putLongVolatile
if (objectClass(t, o)->arrayDimensions()) { if (objectClass(t, o)->arrayDimensions()) {
lock = reinterpret_cast<object>(objectClass(t, o)); lock = reinterpret_cast<object>(objectClass(t, o));
} else { } else {
lock = fieldForOffset(t, cast<GcSingleton>(t, o), offset); lock = reinterpret_cast<object>(fieldForOffset(t, cast<GcSingleton>(t, o), offset));
} }
PROTECT(t, o); PROTECT(t, o);