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

Merge remote branch 'origin/master' into r0.5

Browse Source
This commit is contained in:
Joel Dice
2011-01-25 17:30:21 -07:00
parent c1a0d8b6fc 220f7760b7
commit e16d5f83af
20 changed files with 191 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/bootimage.cpp
View File

@ -405,6 +405,41 @@ writeBootImage2(Thread* t, FILE* out, BootImage* image, uint8_t* code,
set(t, type(t, Machine::JdoubleType), ClassName, name);
}
// resolve primitive array classes in case they are needed at
// runtime:
{ resolveSystemClass
(t, root(t, Machine::BootLoader), makeByteArray(t, "[B"), true);
if (t->exception) return;
resolveSystemClass
(t, root(t, Machine::BootLoader), makeByteArray(t, "[Z"), true);
if (t->exception) return;
resolveSystemClass
(t, root(t, Machine::BootLoader), makeByteArray(t, "[S"), true);
if (t->exception) return;
resolveSystemClass
(t, root(t, Machine::BootLoader), makeByteArray(t, "[C"), true);
if (t->exception) return;
resolveSystemClass
(t, root(t, Machine::BootLoader), makeByteArray(t, "[I"), true);
if (t->exception) return;
resolveSystemClass
(t, root(t, Machine::BootLoader), makeByteArray(t, "[J"), true);
if (t->exception) return;
resolveSystemClass
(t, root(t, Machine::BootLoader), makeByteArray(t, "[F"), true);
if (t->exception) return;
resolveSystemClass
(t, root(t, Machine::BootLoader), makeByteArray(t, "[D"), true);
if (t->exception) return;
}
collect(t, Heap::MajorCollection);
uintptr_t* heap = static_cast<uintptr_t*>