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

Merge branch 'master' of dice.ecovate.com:/home/dicej/git/vm

Browse Source
This commit is contained in:
Eric Scharff 2007-10-11 16:42:41 -06:00
commit b95a573b7f
4 changed files with 618 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

796
src/compile.cpp
View File

File diff suppressed because it is too large Load Diff

6
src/machine.cpp
View File

@ -2203,7 +2203,11 @@ resolveClass(Thread* t, object spec)
class_ = hashMapFind class_ = hashMapFind
(t, t->m->bootstrapClassMap, spec, byteArrayHash, byteArrayEqual); (t, t->m->bootstrapClassMap, spec, byteArrayHash, byteArrayEqual);
if (class_ == 0) { if (class_) {
set(t, classVirtualTable(t, class_),
classVirtualTable
(t, arrayBody(t, t->m->types, Machine::JobjectType)));
} else {
class_ = makeArrayClass(t, spec); class_ = makeArrayClass(t, spec);
} }
} else { } else {

6
src/type-generator.cpp
View File

@ -1411,8 +1411,12 @@ writeConstructors(Output* out, Object* declarations)
out->write(" if (classVmFlags(t, class__) & BootstrapFlag) {\n"); out->write(" if (classVmFlags(t, class__) & BootstrapFlag) {\n");
out->write(" classVmFlags(t, class__) &= ~BootstrapFlag;\n"); out->write(" classVmFlags(t, class__) &= ~BootstrapFlag;\n");
out->write("#ifndef NDEBUG\n");
out->write(" object e = t->exception;\n");
out->write(" PROTECT(t, e);\n");
out->write("#endif\n");
out->write(" resolveClass(t, className(t, class__));\n"); out->write(" resolveClass(t, className(t, class__));\n");
out->write(" assert(t, t->exception == 0);\n"); out->write(" assert(t, t->exception == e);\n");
out->write(" }\n"); out->write(" }\n");
} }

2
src/types.def
View File

@ -41,9 +41,11 @@
(pod compiled (pod compiled
(uint16_t maxLocals) (uint16_t maxLocals)
(uint16_t maxStack) (uint16_t maxStack)
(uint32_t parameterFootprint)
(uint32_t codeLength) (uint32_t codeLength)
(uint32_t lineNumberTableLength) (uint32_t lineNumberTableLength)
(uint32_t exceptionHandlerTableLength) (uint32_t exceptionHandlerTableLength)
(uint32_t stackMapTableLength)
(uint8_t[0] body)) (uint8_t[0] body))
(type method java/lang/reflect/Method (type method java/lang/reflect/Method