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

visit constants in visitRoots so they are included in the final heap image

Browse Source
This commit is contained in:
Joel Dice 2008-11-28 11:33:11 -07:00
parent 02afbd1fa1
commit d22a9ab270
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/bootimage.cpp
View File

@ -55,7 +55,7 @@ makeCodeImage(Thread* t, Zone* zone, BootImage* image, uint8_t* code,
const char* name = it.next(&nameSize); const char* name = it.next(&nameSize);
if (endsWith(".class", name, nameSize)) { if (endsWith(".class", name, nameSize)) {
fprintf(stderr, "%.*s\n", nameSize - 6, name); //fprintf(stderr, "%.*s\n", nameSize - 6, name);
object c = resolveClass object c = resolveClass
(t, makeByteArray(t, "%.*s", nameSize - 6, name)); (t, makeByteArray(t, "%.*s", nameSize - 6, name));
PROTECT(t, c); PROTECT(t, c);
@ -96,18 +96,24 @@ objectSize(Thread* t, object o)
} }
void void
visitRoots(Machine* m, BootImage* image, HeapWalker* w) visitRoots(Thread* t, BootImage* image, HeapWalker* w, object constants)
{ {
Machine* m = t->m;
image->loader = w->visitRoot(m->loader); image->loader = w->visitRoot(m->loader);
image->stringMap = w->visitRoot(m->stringMap); image->stringMap = w->visitRoot(m->stringMap);
image->types = w->visitRoot(m->types); image->types = w->visitRoot(m->types);
m->processor->visitRoots(image, w); m->processor->visitRoots(image, w);
for (; constants; constants = tripleThird(t, constants)) {
w->visitRoot(tripleFirst(t, constants));
}
} }
HeapWalker* HeapWalker*
makeHeapImage(Thread* t, BootImage* image, uintptr_t* heap, uintptr_t* map, makeHeapImage(Thread* t, BootImage* image, uintptr_t* heap, uintptr_t* map,
unsigned capacity) unsigned capacity, object constants)
{ {
class Visitor: public HeapVisitor { class Visitor: public HeapVisitor {
public: public:
@ -170,7 +176,7 @@ makeHeapImage(Thread* t, BootImage* image, uintptr_t* heap, uintptr_t* map,
} visitor(t, heap, map, capacity / BytesPerWord); } visitor(t, heap, map, capacity / BytesPerWord);
HeapWalker* w = makeHeapWalker(t, &visitor); HeapWalker* w = makeHeapWalker(t, &visitor);
visitRoots(t->m, image, w); visitRoots(t, image, w, constants);
image->heapSize = visitor.position * BytesPerWord; image->heapSize = visitor.position * BytesPerWord;
@ -203,7 +209,7 @@ offset(object a, uintptr_t* b)
} }
void void
writeBootImage(Thread* t, FILE*) writeBootImage(Thread* t, FILE* out)
{ {
Zone zone(t->m->system, t->m->heap, 64 * 1024); Zone zone(t->m->system, t->m->heap, 64 * 1024);
BootImage image; BootImage image;
@ -224,7 +230,7 @@ writeBootImage(Thread* t, FILE*)
memset(heapMap, 0, heapMapSize(HeapCapacity)); memset(heapMap, 0, heapMapSize(HeapCapacity));
HeapWalker* heapWalker = makeHeapImage HeapWalker* heapWalker = makeHeapImage
(t, &image, heap, heapMap, HeapCapacity); (t, &image, heap, heapMap, HeapCapacity, constants);
updateConstants(t, constants, code, codeMap, heapWalker->map()); updateConstants(t, constants, code, codeMap, heapWalker->map());
@ -232,15 +238,15 @@ writeBootImage(Thread* t, FILE*)
image.magic = BootImage::Magic; image.magic = BootImage::Magic;
fprintf(stderr, "heap size %d code size %d\n", // fprintf(stderr, "heap size %d code size %d\n",
image.heapSize, image.codeSize); // image.heapSize, image.codeSize);
// fwrite(&image, sizeof(BootImage), 1, out); fwrite(&image, sizeof(BootImage), 1, out);
// fwrite(heapMap, pad(heapMapSize(image.heapSize)), 1, out); fwrite(heapMap, pad(heapMapSize(image.heapSize)), 1, out);
// fwrite(heap, pad(image.heapSize), 1, out); fwrite(heap, pad(image.heapSize), 1, out);
// fwrite(codeMap, pad(codeMapSize(image.codeSize)), 1, out); fwrite(codeMap, pad(codeMapSize(image.codeSize)), 1, out);
// fwrite(code, pad(image.codeSize), 1, out); fwrite(code, pad(image.codeSize), 1, out);
} }
} // namespace } // namespace