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

update bootimage.cpp and heapwalk.cpp to reflect function renames

Browse Source
This commit is contained in:
Joel Dice 2013-02-13 08:48:32 -07:00 committed by Joshua Warner
parent 94ddb62b5f
commit 64d58bdb29
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bootimage.cpp
View File

@ -14,7 +14,7 @@
#include "machine.h" #include "machine.h"
#include "util.h" #include "util.h"
#include "stream.h" #include "stream.h"
#include "assembler.h" #include "codegen/assembler.h"
#include "target.h" #include "target.h"
#include "binaryToObject/tools.h" #include "binaryToObject/tools.h"
#include "lzma.h" #include "lzma.h"
@ -31,7 +31,7 @@ namespace {
const unsigned HeapCapacity = 512 * 1024 * 1024; const unsigned HeapCapacity = 512 * 1024 * 1024;
const unsigned TargetFixieSizeInBytes = 8 + (TargetBytesPerWord * 2); const unsigned TargetFixieSizeInBytes = 8 + (TargetBytesPerWord * 2);
const unsigned TargetFixieSizeInWords = ceiling const unsigned TargetFixieSizeInWords = ceilingDivide
(TargetFixieSizeInBytes, TargetBytesPerWord); (TargetFixieSizeInBytes, TargetBytesPerWord);
const unsigned TargetFixieAge = 0; const unsigned TargetFixieAge = 0;
const unsigned TargetFixieFlags = 2; const unsigned TargetFixieFlags = 2;
@ -787,7 +787,7 @@ targetSize(Thread* t, object typeMaps, object referer, unsigned refererOffset,
{ {
return (TargetBytesPerWord * 2) return (TargetBytesPerWord * 2)
+ pad + pad
(ceiling (ceilingDivide
(objectMaskCount (objectMaskCount
(classTypeMap(t, typeMaps, referer)), 32) * 4, TargetBytesPerWord); (classTypeMap(t, typeMaps, referer)), 32) * 4, TargetBytesPerWord);
} else { } else {

6
src/heapwalk.cpp
View File

@ -228,7 +228,8 @@ inline object
get(object o, unsigned offsetInWords) get(object o, unsigned offsetInWords)
{ {
return static_cast<object> return static_cast<object>
(mask(fieldAtOffset<void*>(o, offsetInWords * BytesPerWord))); (maskAlignedPointer
(fieldAtOffset<void*>(o, offsetInWords * BytesPerWord)));
} }
unsigned unsigned
@ -297,7 +298,8 @@ class MyHeapWalker: public HeapWalker {
Visitor(Context* c, HeapVisitor* v): c(c), v(v) { } Visitor(Context* c, HeapVisitor* v): c(c), v(v) { }
virtual void visit(void* p) { virtual void visit(void* p) {
walk(c, v, static_cast<object>(mask(*static_cast<void**>(p)))); walk(c, v, static_cast<object>
(maskAlignedPointer(*static_cast<void**>(p))));
} }
Context* c; Context* c;