Replacing varargs passed to seginit with keyword argument list.

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

18 files changed, 101 insertions, 59 deletions

diff --git a/mps/code/arenacv.c b/mps/code/arenacv.c
index cfd124ec7d1..62f6e788d70 100644
--- a/mps/code/arenacv.c
+++ b/mps/code/arenacv.c
@@ -180,7 +180,7 @@ static Res allocAsSeg(AllocInfoStruct *aiReturn, SegPref pref,
 {
   Res res;
   Seg seg;
-  res = SegAlloc(&seg, SegClassGet(), pref, size, pool, FALSE);
+  res = SegAlloc(&seg, SegClassGet(), pref, size, pool, FALSE, argsNone);
   if (res == ResOK) {
     aiReturn->the.segData.seg = seg;
   }
diff --git a/mps/code/arg.c b/mps/code/arg.c
index 14170c3ed35..5cda234adb2 100644
--- a/mps/code/arg.c
+++ b/mps/code/arg.c
@@ -76,6 +76,17 @@ Bool ArgCheckCount(Arg arg) {
   return TRUE;
 }
 
+Bool ArgCheckPointer(Arg arg) {
+  CHECKL(arg != NULL);
+  return TRUE;
+}
+
+Bool ArgCheckRankSet(Arg arg) {
+  CHECKL(COMPATTYPE(RankSet, unsigned));
+  CHECKL(RankSetCheck(arg->val.u));
+  return TRUE;
+}
+
 
 ARG_DEFINE_KEY(args_end, Shouldnt);
 
@@ -109,7 +120,7 @@ Bool ArgListCheck(ArgList args)
   Index i;
   CHECKL(args != NULL);
   for (i = 0; args[i].key != MPS_KEY_ARGS_END; ++i) {
-    CHECKL(i < ARGS_MAX);
+    CHECKL(i < MPS_ARGS_MAX);
     CHECKL(ArgCheck(&args[i]));
   }
   return TRUE;
diff --git a/mps/code/arg.h b/mps/code/arg.h
index dc1e8a2a991..7bf7f0390bf 100644
--- a/mps/code/arg.h
+++ b/mps/code/arg.h
@@ -49,6 +49,8 @@ extern Bool ArgCheckFun(Arg arg);
 extern Bool ArgCheckAlign(Arg arg);
 extern Bool ArgCheckBool(Arg arg);
 extern Bool ArgCheckCount(Arg arg);
+extern Bool ArgCheckPointer(Arg arg);
+extern Bool ArgCheckRankSet(Arg arg);
 
 
 #endif /* arg_h */
diff --git a/mps/code/config.h b/mps/code/config.h
index e50d86c8cd6..03d265c4dba 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -299,10 +299,6 @@
 #define LDHistoryLENGTH ((Size)4)
 
 
-/* Maximum length of a keyword argument list. */
-#define ARGS_MAX  ((Count)32)
-
-
 /* Stack configuration */
 
 /* Currently StackProbe has a useful implementation only on
diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index 580dd255e9c..52d2478017f 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -640,7 +640,8 @@ extern Bool LocusCheck(Arena arena);
 /* Segment interface */
 
 extern Res SegAlloc(Seg *segReturn, SegClass class, SegPref pref,
-                    Size size, Pool pool, Bool withReservoirPermit, ...);
+                    Size size, Pool pool, Bool withReservoirPermit,
+                    ArgList args);
 extern void SegFree(Seg seg);
 extern Bool SegOfAddr(Seg *segReturn, Arena arena, Addr addr);
 extern Bool SegFirst(Seg *segReturn, Arena arena);
diff --git a/mps/code/mpmtypes.h b/mps/code/mpmtypes.h
index e74dcefae67..d7ced482b17 100644
--- a/mps/code/mpmtypes.h
+++ b/mps/code/mpmtypes.h
@@ -147,7 +147,7 @@ typedef void (*FreeBlockStepMethod)(Addr base, Addr limit, Pool pool, void *p);
 /* Seg*Method -- see <design/seg/> */
 
 typedef Res (*SegInitMethod)(Seg seg, Pool pool, Addr base, Size size,
-                             Bool withReservoirPermit, va_list args);
+                             Bool withReservoirPermit, ArgList args);
 typedef void (*SegFinishMethod)(Seg seg);
 typedef void (*SegSetGreyMethod)(Seg seg, TraceSet grey);
 typedef void (*SegSetWhiteMethod)(Seg seg, TraceSet white);
diff --git a/mps/code/mps.h b/mps/code/mps.h
index 6b1f4b9a50d..588caced9cb 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -112,6 +112,7 @@ typedef struct mps_arg_s {
     mps_addr_t (*addr_method)(mps_addr_t);
     mps_align_t align;
     mps_word_t count;
+    void *p;
   } val;
 } mps_arg_s;
 
@@ -140,15 +141,18 @@ extern const struct mps_key_s _mps_key_align;
 extern const struct mps_key_s _mps_key_vmw3_top_down;
 #define MPS_KEY_VMW3_TOP_DOWN   (&_mps_key_vmw3_top_down)
 
+/* Maximum length of a keyword argument list. */
+#define MPS_ARGS_MAX          32
+
 #define MPS_ARGS_BEGIN(_var) \
   BEGIN \
-      mps_arg_s _var[ARGS_MAX]; \
+      mps_arg_s _var[MPS_ARGS_MAX]; \
       unsigned _var##_i = 0; \
       BEGIN
 
 #define MPS_ARGS_ADD(_var, _key, _field, _val) \
   BEGIN \
-    /* TODO: AVER(_var_i < ARGS_MAX); */ \
+    /* TODO: AVER(_var_i < MPS_ARGS_MAX); */ \
     _var[_var##_i].key = (_key); \
     _var[_var##_i].val._field = (_val); \
     ++_var##_i; \
@@ -156,9 +160,9 @@ extern const struct mps_key_s _mps_key_vmw3_top_down;
 
 #define MPS_ARGS_DONE(_var) \
   BEGIN \
-    /* TODO: AVER(_var##_i < ARGS_MAX); */ \
+    /* TODO: AVER(_var##_i < MPS_ARGS_MAX); */ \
     _var[_var##_i].key = MPS_KEY_ARGS_END; \
-    /* TODO: _var##_i = ARGS_MAX; */ \
+    /* TODO: _var##_i = MPS_ARGS_MAX; */ \
   END
 
 #define MPS_ARGS_END(_var) \
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index edfea20b211..cde869c935a 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -330,7 +330,7 @@ mps_res_t mps_arena_create_v(mps_arena_t *mps_arena_o,
                              mps_arena_class_t arena_class,
                              va_list varargs)
 {
-  mps_arg_s args[ARGS_MAX];
+  mps_arg_s args[MPS_ARGS_MAX];
   AVERT(ArenaClass, arena_class);
   arena_class->varargs(args, varargs);
   va_end(varargs);
@@ -629,7 +629,7 @@ mps_res_t mps_pool_create(mps_pool_t *mps_pool_o, mps_arena_t arena,
 mps_res_t mps_pool_create_v(mps_pool_t *mps_pool_o, mps_arena_t arena,
                             mps_class_t class, va_list varargs)
 {
-  mps_arg_s args[ARGS_MAX];
+  mps_arg_s args[MPS_ARGS_MAX];
   AVERT(PoolClass, class);
   class->varargs(args, varargs);
   va_end(varargs);
diff --git a/mps/code/poolamc.c b/mps/code/poolamc.c
index b6b4e5c0289..6ec1c63137b 100644
--- a/mps/code/poolamc.c
+++ b/mps/code/poolamc.c
@@ -142,13 +142,20 @@ static Bool amcSegCheck(amcSeg amcseg)
 
 /* AMCSegInit -- initialise an AMC segment */
 
+ARG_DEFINE_KEY(amc_seg_type, Pointer);
+#define amcKeySegType (&_mps_key_amc_seg_type)
+
 static Res AMCSegInit(Seg seg, Pool pool, Addr base, Size size,
-                      Bool reservoirPermit, va_list args)
+                      Bool reservoirPermit, ArgList args)
 {
-  int *segtype = va_arg(args, int*);  /* .segtype */
+  int *segtype;
   SegClass super;
   amcSeg amcseg;
   Res res;
+  ArgStruct arg;
+  
+  ArgRequire(&arg, args, amcKeySegType); /* .segtype */
+  segtype = arg.val.p;
 
   AVERT(Seg, seg);
   amcseg = Seg2amcSeg(seg);
@@ -1163,9 +1170,12 @@ static Res AMCBufferFill(Addr *baseReturn, Addr *limitReturn,
   SegPrefExpress(&segPrefStruct, SegPrefCollected, NULL);
   genNr = PoolGenNr(&gen->pgen);
   SegPrefExpress(&segPrefStruct, SegPrefGen, &genNr);
-  res = SegAlloc(&seg, amcSegClassGet(), &segPrefStruct,
-                 alignedSize, pool, withReservoirPermit,
-                 &gen->type); /* .segtype */
+  MPS_ARGS_BEGIN(args) {
+    MPS_ARGS_ADD(args, amcKeySegType, p, &gen->type); /* .segtype */
+    MPS_ARGS_DONE(args);
+    res = SegAlloc(&seg, amcSegClassGet(), &segPrefStruct,
+                   alignedSize, pool, withReservoirPermit, args);
+  } MPS_ARGS_END(args);
   if(res != ResOK)
     return res;
   AVER(alignedSize == SegSize(seg));
diff --git a/mps/code/poolams.c b/mps/code/poolams.c
index e5e4b249bcb..da5f917ea73 100644
--- a/mps/code/poolams.c
+++ b/mps/code/poolams.c
@@ -203,7 +203,7 @@ static void amsDestroyTables(AMS ams, BT allocTable,
 /* AMSSegInit -- Init method for AMS segments */
 
 static Res AMSSegInit(Seg seg, Pool pool, Addr base, Size size,
-                      Bool reservoirPermit, va_list args)
+                      Bool reservoirPermit, ArgList args)
 {
   SegClass super;
   AMSSeg amsseg;
@@ -679,14 +679,14 @@ static Res AMSSegCreate(Seg *segReturn, Pool pool, Size size,
     goto failSize;
 
   res = SegAlloc(&seg, (*ams->segClass)(), segPref, prefSize,
-                 pool, withReservoirPermit);
+                 pool, withReservoirPermit, argsNone);
   if (res != ResOK) { /* try to allocate one that's just large enough */
     Size minSize = SizeAlignUp(size, ArenaAlign(arena));
 
     if (minSize == prefSize)
       goto failSeg;
     res = SegAlloc(&seg, (*ams->segClass)(), segPref, minSize,
-                   pool, withReservoirPermit);
+                   pool, withReservoirPermit, argsNone);
     if (res != ResOK)
       goto failSeg;
   }
diff --git a/mps/code/poolawl.c b/mps/code/poolawl.c
index 96f0d2bef03..3014376a8eb 100644
--- a/mps/code/poolawl.c
+++ b/mps/code/poolawl.c
@@ -169,8 +169,11 @@ static void awlStatTotalInit(AWL awl)
 
 /* AWLSegInit -- Init method for AWL segments */
 
+ARG_DEFINE_KEY(awl_seg_rank_set, RankSet);
+#define awlKeySegRankSet (&_mps_key_awl_seg_rank_set)
+
 static Res AWLSegInit(Seg seg, Pool pool, Addr base, Size size,
-                      Bool reservoirPermit, va_list args)
+                      Bool reservoirPermit, ArgList args)
 {
   SegClass super;
   AWLSeg awlseg;
@@ -181,6 +184,7 @@ static Res AWLSegInit(Seg seg, Pool pool, Addr base, Size size,
   Res res;
   Size tableSize;
   void *v;
+  ArgStruct arg;
 
   AVERT(Seg, seg);
   awlseg = Seg2AWLSeg(seg);
@@ -188,7 +192,9 @@ static Res AWLSegInit(Seg seg, Pool pool, Addr base, Size size,
   arena = PoolArena(pool);
   /* no useful checks for base and size */
   AVER(BoolCheck(reservoirPermit));
-  rankSet = va_arg(args, RankSet);
+  ArgRequire(&arg, args, awlKeySegRankSet);
+  rankSet = arg.val.u;
+  AVERT(RankSet, rankSet);
   /* .assume.samerank */
   /* AWL only accepts two ranks */
   AVER(RankSetSingle(RankEXACT) == rankSet
@@ -467,8 +473,12 @@ static Res AWLSegCreate(AWLSeg *awlsegReturn,
   segPrefStruct = *SegPrefDefault();
   SegPrefExpress(&segPrefStruct, SegPrefCollected, NULL);
   SegPrefExpress(&segPrefStruct, SegPrefGen, &awl->gen);
-  res = SegAlloc(&seg, AWLSegClassGet(), &segPrefStruct, size, pool,
-                 reservoirPermit, rankSet);
+  MPS_ARGS_BEGIN(args) {
+    MPS_ARGS_ADD(args, awlKeySegRankSet, u, rankSet);
+    MPS_ARGS_DONE(args);
+    res = SegAlloc(&seg, AWLSegClassGet(), &segPrefStruct, size, pool,
+                   reservoirPermit, args);
+  } MPS_ARGS_END(args);
   if (res != ResOK)
     return res;
 
diff --git a/mps/code/poollo.c b/mps/code/poollo.c
index 8943f37c8ba..d59bc1995b8 100644
--- a/mps/code/poollo.c
+++ b/mps/code/poollo.c
@@ -63,7 +63,7 @@ typedef struct LOSegStruct {
 
 /* forward decls */
 static Res loSegInit(Seg seg, Pool pool, Addr base, Size size,
-                     Bool reservoirPermit, va_list args);
+                     Bool reservoirPermit, ArgList args);
 static void loSegFinish(Seg seg);
 
 
@@ -99,7 +99,7 @@ static Bool LOSegCheck(LOSeg loseg)
 /* loSegInit -- Init method for LO segments */
 
 static Res loSegInit(Seg seg, Pool pool, Addr base, Size size,
-                     Bool reservoirPermit, va_list args)
+                     Bool reservoirPermit, ArgList args)
 {
   SegClass super;
   LOSeg loseg;
@@ -305,7 +305,7 @@ static Res loSegCreate(LOSeg *loSegReturn, Pool pool, Size size,
   SegPrefExpress(&segPrefStruct, SegPrefCollected, NULL);
   SegPrefExpress(&segPrefStruct, SegPrefGen, &gen);
   res = SegAlloc(&seg, EnsureLOSegClass(), &segPrefStruct,
-                 asize, pool, withReservoirPermit);
+                 asize, pool, withReservoirPermit, argsNone);
   if (res != ResOK)
     return res;
   PoolGenUpdateZones(&lo->pgen, seg);
diff --git a/mps/code/poolmrg.c b/mps/code/poolmrg.c
index 5e25c039b42..fc93cc47d0b 100644
--- a/mps/code/poolmrg.c
+++ b/mps/code/poolmrg.c
@@ -211,7 +211,7 @@ static Bool MRGRefSegCheck(MRGRefSeg refseg)
 /* MRGLinkSegInit -- initialise a link segment */
 
 static Res MRGLinkSegInit(Seg seg, Pool pool, Addr base, Size size,
-                          Bool reservoirPermit, va_list args)
+                          Bool reservoirPermit, ArgList args)
 {
   SegClass super;
   MRGLinkSeg linkseg;
@@ -239,21 +239,27 @@ static Res MRGLinkSegInit(Seg seg, Pool pool, Addr base, Size size,
 }
 
 
-/* MRGRefSegInit -- initialise a ref segment 
- *
- * .ref.initarg: The paired link segment is passed as an additional
- * (vararg) parameter when creating the ref segment. Initially the
- * refSeg field of the link segment is NULL (see .link.nullref).
- * It's initialized here to the newly initialized ref segment.
- */
+/* MRGRefSegInit -- initialise a ref segment */
+
+ARG_DEFINE_KEY(mrg_seg_link_seg, Pointer);
+#define mrgKeyLinkSeg (&_mps_key_mrg_seg_link_seg)
+
 static Res MRGRefSegInit(Seg seg, Pool pool, Addr base, Size size,
-                         Bool reservoirPermit, va_list args)
+                         Bool reservoirPermit, ArgList args)
 {
-  MRGLinkSeg linkseg = va_arg(args, MRGLinkSeg);  /* .ref.initarg */
+  MRGLinkSeg linkseg;
   MRGRefSeg refseg;
   MRG mrg;
   SegClass super;
   Res res;
+  ArgStruct arg;
+  
+  /* .ref.initarg: The paired link segment is passed as a keyword
+     argument when creating the ref segment. Initially the
+     refSeg field of the link segment is NULL (see .link.nullref).
+     It's initialized here to the newly initialized ref segment. */
+  ArgRequire(&arg, args, mrgKeyLinkSeg);
+  linkseg = arg.val.p;
 
   AVERT(Seg, seg);
   refseg = Seg2RefSeg(seg);
@@ -513,15 +519,18 @@ static Res MRGSegPairCreate(MRGRefSeg *refSegReturn, MRG mrg,
 
   res = SegAlloc(&segLink, EnsureMRGLinkSegClass(),
                  SegPrefDefault(), linkSegSize, pool,
-                 withReservoirPermit);
+                 withReservoirPermit, argsNone);
   if (res != ResOK)
     goto failLinkSegAlloc;
   linkseg = Seg2LinkSeg(segLink);
-
-  res = SegAlloc(&segRefPart, EnsureMRGRefSegClass(),
-                 SegPrefDefault(), mrg->extendBy, pool,
-                 withReservoirPermit,
-                 linkseg); /* .ref.initarg */
+  
+  MPS_ARGS_BEGIN(args) {
+    MPS_ARGS_ADD(args, mrgKeyLinkSeg, p, linkseg); /* .ref.initarg */
+    MPS_ARGS_DONE(args);
+    res = SegAlloc(&segRefPart, EnsureMRGRefSegClass(),
+                   SegPrefDefault(), mrg->extendBy, pool,
+                   withReservoirPermit, args);
+  } MPS_ARGS_END(args);
   if (res != ResOK)
     goto failRefPartSegAlloc;
   refseg = Seg2RefSeg(segRefPart);
diff --git a/mps/code/poolmv2.c b/mps/code/poolmv2.c
index 076d39563b4..92b6708dec2 100644
--- a/mps/code/poolmv2.c
+++ b/mps/code/poolmv2.c
@@ -890,7 +890,8 @@ static Res MVTSegAlloc(Seg *segReturn, MVT mvt, Size size,
                        Pool pool, Bool withReservoirPermit)
 {
   Res res = SegAlloc(segReturn, GCSegClassGet(),
-                     MVTSegPref(mvt), size, pool, withReservoirPermit);
+                     MVTSegPref(mvt), size, pool, withReservoirPermit,
+                     argsNone);
 
   if (res == ResOK) {
     Size segSize = SegSize(*segReturn);
diff --git a/mps/code/poolmvff.c b/mps/code/poolmvff.c
index ce6bf9cc9ae..4d3044aae86 100644
--- a/mps/code/poolmvff.c
+++ b/mps/code/poolmvff.c
@@ -198,13 +198,13 @@ static Res MVFFAddSeg(Seg *segReturn,
   segSize = SizeAlignUp(segSize, align);
 
   res = SegAlloc(&seg, SegClassGet(), mvff->segPref, segSize, pool,
-                 withReservoirPermit);
+                 withReservoirPermit, argsNone);
   if (res != ResOK) {
     /* try again for a seg just large enough for object */
     /* see <design/poolmvff/#design.seg-fail> */
     segSize = SizeAlignUp(size, align);
     res = SegAlloc(&seg, SegClassGet(), mvff->segPref, segSize, pool,
-                   withReservoirPermit);
+                   withReservoirPermit, argsNone);
     if (res != ResOK) {
       return res;
     }
diff --git a/mps/code/poolsnc.c b/mps/code/poolsnc.c
index 70c618bf385..9f999abf9fc 100644
--- a/mps/code/poolsnc.c
+++ b/mps/code/poolsnc.c
@@ -228,7 +228,7 @@ static Bool SNCSegCheck(SNCSeg sncseg)
 /* sncSegInit -- Init method for SNC segments */
 
 static Res sncSegInit(Seg seg, Pool pool, Addr base, Size size,
-                      Bool reservoirPermit, va_list args)
+                      Bool reservoirPermit, ArgList args)
 {
   SegClass super;
   SNCSeg sncseg;
@@ -439,7 +439,7 @@ static Res SNCBufferFill(Addr *baseReturn, Addr *limitReturn,
   arena = PoolArena(pool);
   asize = SizeAlignUp(size, ArenaAlign(arena));
   res = SegAlloc(&seg, SNCSegClassGet(), &snc->segPrefStruct,
-                 asize, pool, withReservoirPermit);
+                 asize, pool, withReservoirPermit, argsNone);
   if (res != ResOK)
     return res;
 
diff --git a/mps/code/seg.c b/mps/code/seg.c
index c544a8063e0..f6deeb5ba4f 100644
--- a/mps/code/seg.c
+++ b/mps/code/seg.c
@@ -46,7 +46,7 @@ SRCID(seg, "$Id$");
 static void SegFinish(Seg seg);
 
 static Res SegInit(Seg seg, Pool pool, Addr base, Size size,
-                   Bool withReservoirPermit, va_list args);
+                   Bool withReservoirPermit, ArgList args);
 
 
 /* Generic interface support */
@@ -55,13 +55,12 @@ static Res SegInit(Seg seg, Pool pool, Addr base, Size size,
 /* SegAlloc -- allocate a segment from the arena */
 
 Res SegAlloc(Seg *segReturn, SegClass class, SegPref pref,
-             Size size, Pool pool, Bool withReservoirPermit, ...)
+             Size size, Pool pool, Bool withReservoirPermit, ArgList args)
 {
   Res res;
   Arena arena;
   Seg seg;
   Addr base;
-  va_list args;
   void *p;
 
   AVER(segReturn != NULL);
@@ -86,10 +85,8 @@ Res SegAlloc(Seg *segReturn, SegClass class, SegPref pref,
     goto failControl;
   seg = p;
 
-  va_start(args, withReservoirPermit);
   seg->class = class;
   res = SegInit(seg, pool, base, size, withReservoirPermit, args);
-  va_end(args);
   if (res != ResOK)
     goto failInit;
 
@@ -138,7 +135,7 @@ void SegFree(Seg seg)
 /* SegInit -- initialize a segment */
 
 static Res SegInit(Seg seg, Pool pool, Addr base, Size size,
-                   Bool withReservoirPermit, va_list args)
+                   Bool withReservoirPermit, ArgList args)
 {
   Tract tract;
   Addr addr, limit;
@@ -691,7 +688,7 @@ Bool SegCheck(Seg seg)
 /* segTrivInit -- method to initialize the base fields of a segment */
 
 static Res segTrivInit(Seg seg, Pool pool, Addr base, Size size,
-                       Bool reservoirPermit, va_list args)
+                       Bool reservoirPermit, ArgList args)
 {
   /* all the initialization happens in SegInit so checks are safe */
   Size align;
@@ -707,6 +704,7 @@ static Res segTrivInit(Seg seg, Pool pool, Addr base, Size size,
   AVER(SegSize(seg) == size);
   AVER(SegPool(seg) == pool);
   AVER(BoolCheck(reservoirPermit));
+  AVER(ArgListCheck(args));
   UNUSED(args);
   return ResOK;
 }
@@ -1064,7 +1062,7 @@ Bool GCSegCheck(GCSeg gcseg)
 /* gcSegInit -- method to initialize a GC segment */
 
 static Res gcSegInit(Seg seg, Pool pool, Addr base, Size size,
-                     Bool withReservoirPermit, va_list args)
+                     Bool withReservoirPermit, ArgList args)
 {
   SegClass super;
   GCSeg gcseg;
diff --git a/mps/code/segsmss.c b/mps/code/segsmss.c
index 02b29504d34..8708db2348d 100644
--- a/mps/code/segsmss.c
+++ b/mps/code/segsmss.c
@@ -115,7 +115,7 @@ static Bool AMSTSegCheck(AMSTSeg amstseg)
 /* amstSegInit -- initialise an amst segment */
 
 static Res amstSegInit(Seg seg, Pool pool, Addr base, Size size,
-                       Bool reservoirPermit, va_list args)
+                       Bool reservoirPermit, ArgList args)
 {
   SegClass super;
   AMSTSeg amstseg;