The abq module manages objects internal to the mps (not client objects) so it should use the type void * in its interface, not addr.

Copied from Perforce
 Change: 182051
 ServerID: perforce.ravenbrook.com

4 files changed, 23 insertions, 23 deletions

diff --git a/mps/code/abq.c b/mps/code/abq.c
index 7393706d5e5..1ba82074c91 100644
--- a/mps/code/abq.c
+++ b/mps/code/abq.c
@@ -19,7 +19,7 @@ SRCID(abq, "$Id$");
 
 static Size ABQQueueSize(Count elements, Size elementSize);
 static Index ABQNextIndex(ABQ abq, Index index);
-static Addr ABQElement(ABQ abq, Index index);
+static void *ABQElement(ABQ abq, Index index);
 
 
 /* Methods */
@@ -97,7 +97,7 @@ void ABQFinish(Arena arena, ABQ abq)
 
 
 /* ABQPush -- push an element onto the tail of the ABQ */
-Res ABQPush(ABQ abq, Addr element)
+Res ABQPush(ABQ abq, void *element)
 {
   AVERT(ABQ, abq);
 
@@ -115,7 +115,7 @@ Res ABQPush(ABQ abq, Addr element)
 
 
 /* ABQPop -- pop an element from the head of the ABQ */
-Res ABQPop(ABQ abq, Addr elementReturn)
+Res ABQPop(ABQ abq, void *elementReturn)
 {
   AVER(elementReturn != NULL);
   AVERT(ABQ, abq);
@@ -135,7 +135,7 @@ Res ABQPop(ABQ abq, Addr elementReturn)
 
 
 /* ABQPeek -- peek at the head of the ABQ */
-Res ABQPeek(ABQ abq, Addr elementReturn)
+Res ABQPeek(ABQ abq, void *elementReturn)
 {
   AVER(elementReturn != NULL);
   AVERT(ABQ, abq);
@@ -265,7 +265,7 @@ void ABQIterate(ABQ abq, ABQIterateMethod iterate, void *closureP)
   in = abq->in;
  
   while (index != in) {
-    Addr element = ABQElement(abq, index);
+    void *element = ABQElement(abq, index);
     ABQDisposition disposition = ABQDispositionNONE;
     res = (*iterate)(&disposition, element, closureP);
     AVERT(ABQDisposition, disposition);
@@ -314,8 +314,8 @@ static Index ABQNextIndex(ABQ abq, Index index)
 
 /* ABQElement -- return pointer to the index'th element in the queue
    vector. */
-static Addr ABQElement(ABQ abq, Index index) {
-  return AddrAdd(abq->queue, index * abq->elementSize);
+static void *ABQElement(ABQ abq, Index index) {
+  return PointerAdd(abq->queue, index * abq->elementSize);
 }
 
 
diff --git a/mps/code/abq.h b/mps/code/abq.h
index 1e124f87013..b2eb7696923 100644
--- a/mps/code/abq.h
+++ b/mps/code/abq.h
@@ -23,16 +23,16 @@
 /* Prototypes  */
 
 typedef struct ABQStruct *ABQ;
-typedef Res (*ABQDescribeElement)(Addr element, mps_lib_FILE *stream);
+typedef Res (*ABQDescribeElement)(void *element, mps_lib_FILE *stream);
 typedef unsigned ABQDisposition;
-typedef Res (*ABQIterateMethod)(ABQDisposition *dispositionReturn, Addr element, void *closureP);
+typedef Res (*ABQIterateMethod)(ABQDisposition *dispositionReturn, void *element, void *closureP);
 
 extern Res ABQInit(Arena arena, ABQ abq, void *owner, Count elements, Size elementSize);
 extern Bool ABQCheck(ABQ abq);
 extern void ABQFinish(Arena arena, ABQ abq);
-extern Res ABQPush(ABQ abq, Addr element);
-extern Res ABQPop(ABQ abq, Addr elementReturn);
-extern Res ABQPeek(ABQ abq, Addr elementReturn);
+extern Res ABQPush(ABQ abq, void *element);
+extern Res ABQPop(ABQ abq, void *elementReturn);
+extern Res ABQPeek(ABQ abq, void *elementReturn);
 extern Res ABQDescribe(ABQ abq, ABQDescribeElement describeElement, mps_lib_FILE *stream);
 extern Bool ABQIsEmpty(ABQ abq);
 extern Bool ABQIsFull(ABQ abq);
@@ -48,7 +48,7 @@ typedef struct ABQStruct
   Size elementSize;
   Index in;
   Index out;
-  Addr queue;
+  void *queue;
 
   /* Meter queue depth at each operation */
   METER_DECL(push);
diff --git a/mps/code/abqtest.c b/mps/code/abqtest.c
index 3da3bc2f36c..8d35d99c691 100644
--- a/mps/code/abqtest.c
+++ b/mps/code/abqtest.c
@@ -95,7 +95,7 @@ typedef struct TestClosureStruct {
   Res res;
 } TestClosureStruct;
 
-static Res TestDeleteCallback(ABQDisposition *dispositionReturn, Addr element,
+static Res TestDeleteCallback(ABQDisposition *dispositionReturn, void *element,
                               void *closureP)
 {
   TestBlock *a = (TestBlock *)element;
@@ -120,7 +120,7 @@ static void step(void)
     case 0: case 1: case 2: case 3:
   push:
       a = CreateTestBlock(pushee);
-      res = ABQPush(&abq, (Addr)&a);
+      res = ABQPush(&abq, &a);
       if (res != ResOK) {
         goto pop;
       }
@@ -128,7 +128,7 @@ static void step(void)
       break;
     case 5: case 6: case 7: case 8:
   pop:
-      res = ABQPop(&abq, (Addr)&a);
+      res = ABQPop(&abq, &a);
       if (res != ResOK){
         goto push;
       }
diff --git a/mps/code/poolmv2.c b/mps/code/poolmv2.c
index dd96b9c3c5f..7333c83f010 100644
--- a/mps/code/poolmv2.c
+++ b/mps/code/poolmv2.c
@@ -494,7 +494,7 @@ static Res MVTBufferFill(Addr *baseReturn, Addr *limitReturn,
  
   /* Attempt to retrieve a free block from the ABQ */
   ABQRefillIfNecessary(mvt, minSize);
-  res = ABQPeek(MVTABQ(mvt), (Addr)&range);
+  res = ABQPeek(MVTABQ(mvt), &range);
   if (res != ResOK) {
     METER_ACC(mvt->underflows, minSize);
     /* <design/poolmvt/#arch.contingency.fragmentation-limit> */
@@ -591,7 +591,7 @@ done:
  * with it, and the KEEP disposition for ranges that do not.
  */
 static Res MVTDeleteOverlapping(ABQDisposition *dispositionReturn,
-                                Addr element, void *closureP)
+                                void *element, void *closureP)
 {
   Range oldRange, newRange;
 
@@ -599,8 +599,8 @@ static Res MVTDeleteOverlapping(ABQDisposition *dispositionReturn,
   AVER(element != NULL);
   AVER(closureP != NULL);
 
-  oldRange = (Range)element;
-  newRange = (Range)closureP;
+  oldRange = element;
+  newRange = closureP;
 
   if (RangeOverlap(oldRange, newRange)) {
     *dispositionReturn = ABQDispositionDELETE;
@@ -622,19 +622,19 @@ static Res MVTReserve(MVT mvt, Range range)
   AVERT(Range, range);
   AVER(RangeSize(range) >= mvt->reuseSize);
 
-  res = ABQPush(MVTABQ(mvt), (Addr)range);
+  res = ABQPush(MVTABQ(mvt), range);
 
   /* See <design/poolmvt/#impl.c.free.merge> */
   if (res != ResOK) {
     Arena arena = PoolArena(MVT2Pool(mvt));
     RangeStruct oldRange;
-    res = ABQPeek(MVTABQ(mvt), (Addr)&oldRange);
+    res = ABQPeek(MVTABQ(mvt), &oldRange);
     AVER(res == ResOK);
     AVERT(Range, &oldRange);
     if (!MVTReturnRangeSegs(mvt, &oldRange, arena))
       goto failOverflow;
     METER_ACC(mvt->returns, RangeSize(&oldRange));
-    res = ABQPush(MVTABQ(mvt), (Addr)range);
+    res = ABQPush(MVTABQ(mvt), range);
     if (res != ResOK)
       goto failOverflow;
   }