From 3bfd9a66225cd413bdbcb35116a6a681efa7bf3c Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Thu, 14 Jul 2011 10:32:01 +0000
Subject: [PATCH] changes

---
 Robust/src/Runtime/bamboo/multicoregccompact.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Robust/src/Runtime/bamboo/multicoregccompact.c b/Robust/src/Runtime/bamboo/multicoregccompact.c
index df5c7c94..b3969011 100644
--- a/Robust/src/Runtime/bamboo/multicoregccompact.c
+++ b/Robust/src/Runtime/bamboo/multicoregccompact.c
@@ -414,7 +414,7 @@ unsigned int compactblocks(struct moveHelper * orig, struct moveHelper * to) {
   void *origbound=orig->pagebound;
   void *tobound=to->pagebound;
   //set to the first line so we don't need conditions
-  void *lastflush=(&gcmappingtbl[OBJMAPPINGINDEX(origptr)])&~(BAMBOO_CACHE_LINE_MASK);
+  void *lastflush=(void *)(((unsigned INTPTR)&gcmappingtbl[OBJMAPPINGINDEX(origptr)])&~(BAMBOO_CACHE_LINE_MASK));
 #else
   void *origbound=orig->bound;
   void *tobound=to->bound;
@@ -483,7 +483,7 @@ unsigned int compactblocks(struct moveHelper * orig, struct moveHelper * to) {
       *mapptr=toptr;
 
 #ifdef GC_CACHE_ADAPT
-      void *maskmapptr=mapptr&~(BAMBOO_CACHE_LINE_MASK);
+      void *maskmapptr=(void *)(((unsigned INTPTR)mapptr)&~(BAMBOO_CACHE_LINE_MASK));
 
       if (lastflush!=maskmapptr) {
 	BAMBOO_CACHE_FLUSH_LINE(lastflush);
-- 
2.34.1