Fixing up remaining visible warnings in xcode (all in test programs).

Expanding or removing some '@@@@' marks.

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

12 files changed, 80 insertions, 80 deletions

diff --git a/mps/code/abqtest.c b/mps/code/abqtest.c
index 2249bcf6f4a..27288a40437 100644
--- a/mps/code/abqtest.c
+++ b/mps/code/abqtest.c
@@ -36,9 +36,9 @@ static unsigned long abqRnd(unsigned long n)
 }
 
 
-static int pushee = 1;
-static int popee = 1;
-static int deleted = 0;
+static unsigned pushee = 1;
+static unsigned popee = 1;
+static unsigned deleted = 0;
 
 
 typedef struct TestStruct *Test;
@@ -46,7 +46,7 @@ typedef struct TestStruct *Test;
 typedef struct TestStruct
 {
   Test next;
-  int id;
+  unsigned id;
   CBSBlockStruct cbsBlockStruct;
 } TestStruct;
 
@@ -65,7 +65,7 @@ static Test CBSBlockTest(CBSBlock c)
 static Test testBlocks = NULL;
 
 
-static CBSBlock CreateCBSBlock(int no)
+static CBSBlock CreateCBSBlock(unsigned no)
 {
   Test b = malloc(sizeof(TestStruct));
   cdie(b != NULL, "malloc");
@@ -133,7 +133,7 @@ static void step(void)
       if (!deleted & (pushee > popee)) {
         Test b;
      
-        deleted = abqRnd (pushee - popee) + popee;
+        deleted = (unsigned)abqRnd (pushee - popee) + popee;
         for (b = testBlocks; b != NULL; b = b->next)
           if (b->id == deleted)
             break;
diff --git a/mps/code/amcss.c b/mps/code/amcss.c
index 236713cdf12..1be8d62811f 100644
--- a/mps/code/amcss.c
+++ b/mps/code/amcss.c
@@ -80,44 +80,40 @@ static void report(mps_arena_t arena)
 
     cdie(mps_message_get(&message, arena, type), "message get");
 
-    switch(type) {
-      /* @@@@ is using these macros in a switch supported? */
-      case mps_message_type_gc_start(): {
-        nCollsStart += 1;
-        printf("\n{\n  Collection %d started.  Because:\n", nCollsStart);
-        printf("    %s\n", mps_message_gc_start_why(arena, message));
-        printf("    clock: %"PRIuLONGEST"\n", (ulongest_t)mps_message_clock(arena, message));
-        break;
-      }
-      case mps_message_type_gc(): {
-        size_t live, condemned, not_condemned;
-        
-        nCollsDone += 1;
-        live = mps_message_gc_live_size(arena, message);
-        condemned = mps_message_gc_condemned_size(arena, message);
-        not_condemned = mps_message_gc_not_condemned_size(arena, message);
-
-        printf("\n  Collection %d finished:\n", nCollsDone);
-        printf("    live %"PRIuLONGEST"\n", (ulongest_t)live);
-        printf("    condemned %"PRIuLONGEST"\n", (ulongest_t)condemned);
-        printf("    not_condemned %"PRIuLONGEST"\n", (ulongest_t)not_condemned);
-        printf("    clock: %"PRIuLONGEST"\n", (ulongest_t)mps_message_clock(arena, message));
-        printf("}\n");
-
-        if(condemned > (gen1SIZE + gen2SIZE + (size_t)128) * 1024) {
-          /* When condemned size is larger than could happen in a gen 2
-           * collection (discounting ramps, natch), guess that was a dynamic
-           * collection, and reset the commit limit, so it doesn't run out. */
-          die(mps_arena_commit_limit_set(arena, 2 * testArenaSIZE),
-            "set limit");
-        }
-        break;
-      }
-      default: {
-        cdie(0, "unknown message type");
-        break;
+    if (type == mps_message_type_gc_start()) {
+      nCollsStart += 1;
+      printf("\n{\n  Collection %d started.  Because:\n", nCollsStart);
+      printf("    %s\n", mps_message_gc_start_why(arena, message));
+      printf("    clock: %"PRIuLONGEST"\n", (ulongest_t)mps_message_clock(arena, message));
+
+    } else if (type == mps_message_type_gc()) {
+      size_t live, condemned, not_condemned;
+      
+      nCollsDone += 1;
+      live = mps_message_gc_live_size(arena, message);
+      condemned = mps_message_gc_condemned_size(arena, message);
+      not_condemned = mps_message_gc_not_condemned_size(arena, message);
+
+      printf("\n  Collection %d finished:\n", nCollsDone);
+      printf("    live %"PRIuLONGEST"\n", (ulongest_t)live);
+      printf("    condemned %"PRIuLONGEST"\n", (ulongest_t)condemned);
+      printf("    not_condemned %"PRIuLONGEST"\n", (ulongest_t)not_condemned);
+      printf("    clock: %"PRIuLONGEST"\n", (ulongest_t)mps_message_clock(arena, message));
+      printf("}\n");
+
+      if(condemned > (gen1SIZE + gen2SIZE + (size_t)128) * 1024) {
+        /* When condemned size is larger than could happen in a gen 2
+         * collection (discounting ramps, natch), guess that was a dynamic
+         * collection, and reset the commit limit, so it doesn't run out. */
+        die(mps_arena_commit_limit_set(arena, 2 * testArenaSIZE),
+          "set limit");
       }
+
+    } else {
+      cdie(0, "unknown message type");
+      break;
     }
+
     mps_message_discard(arena, message);
   }
 
@@ -223,7 +219,7 @@ static void *test(void *arg, size_t s)
       /* test mps_arena_has_addr */
       {
         size_t hitRatio;
-        int hitsWanted = 4;  /* aim for 4 hits (on average) */
+        unsigned hitsWanted = 4;  /* aim for 4 hits (on average) */
         /* [Note: The for-loop condition used to be "i < 4 * hitRatio",
          *  with "4" an unexplained naked constant.  I have now labelled
          *  it "hitsWanted", as I think that is the intent.  RHSK]
diff --git a/mps/code/amcsshe.c b/mps/code/amcsshe.c
index 1b8d3696b88..770870cfe8b 100644
--- a/mps/code/amcsshe.c
+++ b/mps/code/amcsshe.c
@@ -23,8 +23,8 @@
 #define headerFACTOR      ((float)(20 + headerSIZE) / 20)
 /* headerFACTOR measures how much larger objects are compared to fmtdy. */
 #define testArenaSIZE     ((size_t)(1000*headerFACTOR)*1024)
-#define gen1SIZE          ((size_t)150*headerFACTOR)
-#define gen2SIZE          ((size_t)170*headerFACTOR)
+#define gen1SIZE          ((size_t)(150*headerFACTOR))
+#define gen2SIZE          ((size_t)(170*headerFACTOR))
 #define avLEN             3
 #define exactRootsCOUNT   200
 #define ambigRootsCOUNT   50
diff --git a/mps/code/amsss.c b/mps/code/amsss.c
index 27d6d69d9a3..7906c8805bf 100644
--- a/mps/code/amsss.c
+++ b/mps/code/amsss.c
@@ -57,30 +57,26 @@ static void report(void)
 
     cdie(mps_message_get(&message, arena, type), "message get");
 
-    switch(type) {
-    /* @@@@ is using these macros in a switch supported? */
-    case mps_message_type_gc_start():
+    if (type == mps_message_type_gc_start()) {
       printf("\nCollection start %d.  Because:\n", ++nStart);
       printf("%s\n", mps_message_gc_start_why(arena, message));
 
-      break;
-    case mps_message_type_gc():
-      {
-        size_t live, condemned, not_condemned;
-
-        live = mps_message_gc_live_size(arena, message);
-        condemned = mps_message_gc_condemned_size(arena, message);
-        not_condemned = mps_message_gc_not_condemned_size(arena, message);
-
-        printf("\nCollection complete %d:\n", ++nComplete);
-        printf("live %"PRIuLONGEST"\n", (ulongest_t)live);
-        printf("condemned %"PRIuLONGEST"\n", (ulongest_t)condemned);
-        printf("not_condemned %"PRIuLONGEST"\n", (ulongest_t)not_condemned);
-      }
-      break;
-    default:
+    } else if (type == mps_message_type_gc()) {
+      size_t live, condemned, not_condemned;
+
+      live = mps_message_gc_live_size(arena, message);
+      condemned = mps_message_gc_condemned_size(arena, message);
+      not_condemned = mps_message_gc_not_condemned_size(arena, message);
+
+      printf("\nCollection complete %d:\n", ++nComplete);
+      printf("live %"PRIuLONGEST"\n", (ulongest_t)live);
+      printf("condemned %"PRIuLONGEST"\n", (ulongest_t)condemned);
+      printf("not_condemned %"PRIuLONGEST"\n", (ulongest_t)not_condemned);
+
+    } else {
       cdie(0, "unknown message type");
     }
+
     mps_message_discard(arena, message);
   }
 
diff --git a/mps/code/arena.c b/mps/code/arena.c
index e17cc3970ef..2e71a67c17c 100644
--- a/mps/code/arena.c
+++ b/mps/code/arena.c
@@ -675,8 +675,16 @@ Size ArenaAvail(Arena arena)
   Size sSwap;
 
   sSwap = ArenaReserved(arena);
-  if (sSwap > arena->commitLimit) sSwap = arena->commitLimit;
-  /* @@@@ sSwap should take actual paging file size into account */
+  if (sSwap > arena->commitLimit)
+    sSwap = arena->commitLimit;
+
+  /* TODO: sSwap should take into account the amount of backing store
+     available to supply the arena with memory.  This would be the amount
+     available in the paging file, which is possibly the amount of free
+     disk space in some circumstances.  We'd have to see whether we can get
+     this information from the operating system.  It also depends on the
+     arena class, of course. */
+
   return sSwap - arena->committed + arena->spareCommitted;
 }
 
diff --git a/mps/code/fmthe.c b/mps/code/fmthe.c
index ab24062d3ee..f5e1528d51e 100644
--- a/mps/code/fmthe.c
+++ b/mps/code/fmthe.c
@@ -33,7 +33,7 @@ static mps_res_t dylan_header_scan(mps_ss_t mps_ss,
   mps_addr_t p = base;
 
   while(p < limit) {
-      int header = *(int*)((char*)p - headerSIZE);
+      mps_word_t header = (mps_word_t)*(int*)((char*)p - headerSIZE);
       switch(headerType(header)) {
       case realTYPE:
           assert(header == realHeader);
@@ -63,8 +63,8 @@ static mps_res_t dylan_header_scan_weak(mps_ss_t mps_ss,
   mps_res_t res;
 
   while(base < limit) {
-      int header;
-      header = *(int*)((char*)base - headerSIZE);
+      mps_word_t header;
+      header = (mps_word_t)*(int*)((char*)base - headerSIZE);
       switch(headerType(header)) {
       case realTYPE:
           assert(header == realHeader);
@@ -90,8 +90,8 @@ static mps_res_t dylan_header_scan_weak(mps_ss_t mps_ss,
 static mps_addr_t dylan_header_skip(mps_addr_t object)
 {
   mps_addr_t *p;        /* cursor in object */
-  int header;
-  header = *(int*)((char*)object - headerSIZE);
+  mps_word_t header;
+  header = (mps_word_t)*(int*)((char*)object - headerSIZE);
   switch(headerType(header)) {
   case realTYPE:
       assert(header == realHeader);
@@ -111,9 +111,9 @@ static mps_addr_t dylan_header_skip(mps_addr_t object)
 
 static mps_addr_t dylan_header_isfwd(mps_addr_t object)
 {
-  int header;
+  mps_word_t header;
 
-  header = *(int*)((char*)object - headerSIZE);
+  header = (mps_word_t)*(int*)((char*)object - headerSIZE);
   if (headerType(header) != realTYPE)
     return NULL;
 
diff --git a/mps/code/meter.c b/mps/code/meter.c
index 48f7abeb425..04f684c07f3 100644
--- a/mps/code/meter.c
+++ b/mps/code/meter.c
@@ -32,7 +32,6 @@ void MeterInit(Meter meter, char *name, void *owner)
   sym = EventInternString(name);
   EventLabelAddr((Addr)meter, sym); /* see .trans.label */
   EVENT2(MeterInit, meter, owner);
-  UNUSED(owner); /* @@@@ hack */
 }
 
 
@@ -100,7 +99,6 @@ void MeterEmit(Meter meter)
 {
   EVENT6(MeterValues, meter, meter->total, meter->meanSquared,
                meter->count, meter->max, meter->min);
-  UNUSED(meter); /* @@@@ hack */
 }
 
 
diff --git a/mps/code/mpmss.c b/mps/code/mpmss.c
index 506c3c8c816..5c98b1da9ac 100644
--- a/mps/code/mpmss.c
+++ b/mps/code/mpmss.c
@@ -59,7 +59,7 @@ static mps_res_t stress(mps_class_t class, size_t (*size)(int i),
   for (k=0; k<testLOOPS; ++k) {
     /* shuffle all the objects */
     for (i=0; i<testSetSIZE; ++i) {
-      int j = rnd()%(testSetSIZE-i);
+      unsigned j = rnd()%(unsigned)(testSetSIZE-i);
       void *tp;
       size_t ts;
      
diff --git a/mps/code/qs.c b/mps/code/qs.c
index 2859523e9bc..8d5c011701c 100644
--- a/mps/code/qs.c
+++ b/mps/code/qs.c
@@ -183,9 +183,9 @@ static void swap(void)
 }
 
 
-static void makerndlist(int l)
+static void makerndlist(unsigned l)
 {
-  int i;
+  unsigned i;
   mps_word_t r;
 
   cdie(l > 0, "list len");
diff --git a/mps/code/sacss.c b/mps/code/sacss.c
index d8a376c4614..7fe5c368b3c 100644
--- a/mps/code/sacss.c
+++ b/mps/code/sacss.c
@@ -80,7 +80,7 @@ static mps_res_t stress(mps_class_t class,
   for (k = 0; k < testLOOPS; ++k) {
     /* shuffle all the objects */
     for (i=0; i<testSetSIZE; ++i) {
-      int j = rnd()%(testSetSIZE-i);
+      int j = (int)(rnd()%(unsigned)(testSetSIZE-i));
       void *tp;
       size_t ts;
      
diff --git a/mps/code/test.c b/mps/code/test.c
new file mode 100644
index 00000000000..b4eff710269
--- /dev/null
+++ b/mps/code/test.c
@@ -0,0 +1,2 @@
+extern void hello(void);
+int main(void) { hello(); return 0; }
diff --git a/mps/code/zmess.c b/mps/code/zmess.c
index 13d2aea8fe7..6d2840f86a9 100644
--- a/mps/code/zmess.c
+++ b/mps/code/zmess.c
@@ -279,7 +279,7 @@ static void testscriptC(mps_arena_t arena, const char *script)
         return;
       }
     }
-    Insist(pmNext - am < NELEMS(am));
+    Insist(am <= pmNext && pmNext < am + NELEMS(am));
     script++;
   }
 }