ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-17 06:38:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

add VMClass changes

Browse Source
This commit is contained in:
Joshua Warner
2014-06-27 18:32:20 -06:00
committed by Joshua Warner
parent 9b36dca846
commit 194e3b2701
9 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/interpret.cpp
View File

@ -559,7 +559,7 @@ invokeNativeSlow(Thread* t, GcMethod* method, void* function)
RUNTIME_ARRAY_BODY(args)[argOffset++] = reinterpret_cast<uintptr_t>(t);
RUNTIME_ARRAY_BODY(types)[typeOffset++] = POINTER_TYPE;
object jclass = 0;
GcJclass* jclass = 0;
PROTECT(t, jclass);
unsigned sp;
@ -2114,9 +2114,9 @@ interpret3(Thread* t, const int base)
GcClass* class_ = resolveClassInPool
(t, frameMethod(t, frame), index - 1);
pushObject(t, getJClass(t, class_));
pushObject(t, reinterpret_cast<object>(getJClass(t, class_)));
} else if (objectClass(t, v) == type(t, GcClass::Type)) {
pushObject(t, getJClass(t, cast<GcClass>(t, v)));
pushObject(t, reinterpret_cast<object>(getJClass(t, cast<GcClass>(t, v))));
} else {
pushObject(t, v);
}
@ -3010,6 +3010,7 @@ class MyProcessor: public Processor {
uint16_t fixedSize,
uint8_t arrayElementSize,
uint8_t arrayDimensions,
GcClass* arrayElementClass,
object objectMask,
object name,
object sourceFile,
@ -3018,7 +3019,7 @@ class MyProcessor: public Processor {
object virtualTable,
object fieldTable,
object methodTable,
object addendum,
GcClassAddendum* addendum,
object staticTable,
object loader,
unsigned vtableLength UNUSED)
@ -3029,6 +3030,7 @@ class MyProcessor: public Processor {
fixedSize,
arrayElementSize,
arrayDimensions,
arrayElementClass,
0,
cast<GcIntArray>(t, objectMask),
cast<GcByteArray>(t, name),
@ -3038,7 +3040,7 @@ class MyProcessor: public Processor {
virtualTable,
fieldTable,
methodTable,
cast<GcClassAddendum>(t, addendum),
addendum,
staticTable,
cast<GcClassLoader>(t, loader),
0,