From 64d58bdb290ecc4fdf55d46029903f6c11b5e1fb Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Wed, 13 Feb 2013 08:48:32 -0700
Subject: [PATCH] update bootimage.cpp and heapwalk.cpp to reflect function
 renames

---
 src/bootimage.cpp | 6 +++---
 src/heapwalk.cpp  | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/bootimage.cpp b/src/bootimage.cpp
index 5a57a40e1c..111d850f97 100644
--- a/src/bootimage.cpp
+++ b/src/bootimage.cpp
@@ -14,7 +14,7 @@
 #include "machine.h"
 #include "util.h"
 #include "stream.h"
-#include "assembler.h"
+#include "codegen/assembler.h"
 #include "target.h"
 #include "binaryToObject/tools.h"
 #include "lzma.h"
@@ -31,7 +31,7 @@ namespace {
 const unsigned HeapCapacity = 512 * 1024 * 1024;
 
 const unsigned TargetFixieSizeInBytes = 8 + (TargetBytesPerWord * 2);
-const unsigned TargetFixieSizeInWords = ceiling
+const unsigned TargetFixieSizeInWords = ceilingDivide
   (TargetFixieSizeInBytes, TargetBytesPerWord);
 const unsigned TargetFixieAge = 0;
 const unsigned TargetFixieFlags = 2;
@@ -787,7 +787,7 @@ targetSize(Thread* t, object typeMaps, object referer, unsigned refererOffset,
   {
     return (TargetBytesPerWord * 2)
       + pad
-      (ceiling
+      (ceilingDivide
        (objectMaskCount
         (classTypeMap(t, typeMaps, referer)), 32) * 4, TargetBytesPerWord);
   } else {
diff --git a/src/heapwalk.cpp b/src/heapwalk.cpp
index 69840abf16..8732d28497 100644
--- a/src/heapwalk.cpp
+++ b/src/heapwalk.cpp
@@ -228,7 +228,8 @@ inline object
 get(object o, unsigned offsetInWords)
 {
   return static_cast<object>
-    (mask(fieldAtOffset<void*>(o, offsetInWords * BytesPerWord)));
+    (maskAlignedPointer
+     (fieldAtOffset<void*>(o, offsetInWords * BytesPerWord)));
 }
 
 unsigned
@@ -297,7 +298,8 @@ class MyHeapWalker: public HeapWalker {
       Visitor(Context* c, HeapVisitor* v): c(c), v(v) { }
 
       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;