X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2Fparallel%2FPack.c;h=e8653f63031547f3d10b447459d3905c5c0efa73;hb=61ccfec175e1f51b2c89559faf91d9bee0b3b601;hp=80a2fae17a6dee1c726a62e1b5d7fa03e2bbbf41;hpb=63ae274a49e72dcf45fb95aabe55703c0021d320;p=ghc-hetmet.git

diff --git a/ghc/rts/parallel/Pack.c b/ghc/rts/parallel/Pack.c
index 80a2fae..e8653f6 100644
--- a/ghc/rts/parallel/Pack.c
+++ b/ghc/rts/parallel/Pack.c
@@ -1,6 +1,5 @@
 /* 
    Time-stamp: <Wed Mar 21 2001 16:32:47 Stardate: [-30]6363.44 hwloidl>
-   $Id: Pack.c,v 1.7 2001/05/28 07:13:54 sof Exp $
 
    Graph packing and unpacking code for sending it to another processor
    and retrieving the original graph structure from the packet.
@@ -1339,7 +1338,7 @@ PackPAP(StgPAP *pap) {
   nat n, i, j, pack_start;
   StgPtr p, q;
   const StgInfoTable* info;
-  StgWord32 bitmap;
+  StgWord bitmap;
   /* debugging only */
   StgPtr end;
   nat size, ptrs, nonptrs, vhs;
@@ -1615,7 +1614,7 @@ PackPAP(StgPAP *pap) {
 
 	for (j=0; j<large_bitmap->size; j++) {
 	  bitmap = large_bitmap->bitmap[j];
-	  q = p + sizeof(W_) * 8;
+	  q = p + BITS_IN(W_);
 	  while (bitmap != 0) {
 	    if ((bitmap & 1) == 0) {
 	      Pack((StgWord)(ARGTAG_MAX+1));
@@ -2873,7 +2872,7 @@ UnpackPAP(StgWord ***bufptrP, StgClosure *graph)
   nat n, i, j, packed_size = 0;
   StgPtr p, q, end, payload_start, p_FMs;
   const StgInfoTable* info;
-  StgWord32 bitmap;
+  StgWord bitmap;
   StgWord **bufptr = *bufptrP;
 #if defined(DEBUG)
   nat FMs_in_PAP=0;
@@ -3092,7 +3091,7 @@ UnpackPAP(StgWord ***bufptrP, StgClosure *graph)
 
 	for (j=0; j<large_bitmap->size; j++) {
 	  bitmap = large_bitmap->bitmap[j];
-	  q = p + sizeof(W_) * 8;
+	  q = p + BITS_IN(W_);
 	  while (bitmap != 0) {
 	    if ((bitmap & 1) == 0) {
 	      *p++ = (StgWord)UnpackFetchMe(&bufptr, (StgClosure**)&p_FMs);