Moving arena varags parsing into arena class method, similar to pools. much simpler. all tests pass.

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

6 files changed, 46 insertions, 24 deletions

diff --git a/mps/code/arena.c b/mps/code/arena.c
index b8397c4dfc3..e114b675173 100644
--- a/mps/code/arena.c
+++ b/mps/code/arena.c
@@ -46,6 +46,16 @@ static Res ArenaTrivDescribe(Arena arena, mps_lib_FILE *stream)
 }
 
 
+/* ArenaTrivVarargs -- ignore obsolete varargs for future arena classes */
+
+static void ArenaTrivVarargs(ArgStruct args[], va_list varargs)
+{
+  UNUSED(varargs);
+  args[0].key = MPS_KEY_ARGS_END;
+  AVER(ArgListCheck(args));
+}
+
+
 /* AbstractArenaClass  -- The abstract arena class definition
  *
  * .null: Most abstract class methods are set to NULL.  See
@@ -59,6 +69,7 @@ DEFINE_CLASS(AbstractArenaClass, class)
   class->name = "ABSARENA";
   class->size = 0;
   class->offset = 0;
+  class->varargs = ArenaTrivVarargs;
   class->init = NULL;
   class->finish = NULL;
   class->reserved = NULL;
@@ -85,6 +96,7 @@ Bool ArenaClassCheck(ArenaClass class)
   /* greater than the size of the class-specific portion of the */
   /* instance. */
   CHECKL(class->offset <= (size_t)(class->size - sizeof(ArenaStruct)));
+  CHECKL(FUNCHECK(class->varargs));
   CHECKL(FUNCHECK(class->init));
   CHECKL(FUNCHECK(class->finish));
   CHECKL(FUNCHECK(class->reserved));
diff --git a/mps/code/arenacl.c b/mps/code/arenacl.c
index 96a7e93232d..a8627f22497 100644
--- a/mps/code/arenacl.c
+++ b/mps/code/arenacl.c
@@ -179,6 +179,19 @@ static void ClientChunkFinish(Chunk chunk)
 }
 
 
+/* ClientArenaVarargs -- parse obsolete varargs */
+
+static void ClientArenaVarargs(ArgStruct args[], va_list varargs)
+{
+  args[0].key = MPS_KEY_ARENA_SIZE;
+  args[0].val.size = va_arg(varargs, Size);
+  args[1].key = MPS_KEY_ARENA_CL_ADDR;
+  args[1].val.addr = va_arg(varargs, Addr);
+  args[2].key = MPS_KEY_ARGS_END;
+  AVER(ArgListCheck(args));
+}
+
+
 /* ClientArenaInit -- create and initialize the client arena
  *
  * .init.memory: Creates the arena structure in the chuck given, and
@@ -474,6 +487,7 @@ DEFINE_ARENA_CLASS(ClientArenaClass, this)
   this->name = "CL";
   this->size = sizeof(ClientArenaStruct);
   this->offset = offsetof(ClientArenaStruct, arenaStruct);
+  this->varargs = ClientArenaVarargs;
   this->init = ClientArenaInit;
   this->finish = ClientArenaFinish;
   this->reserved = ClientArenaReserved;
diff --git a/mps/code/arenavm.c b/mps/code/arenavm.c
index 3bd6e16ecc7..0bb83500f25 100644
--- a/mps/code/arenavm.c
+++ b/mps/code/arenavm.c
@@ -444,6 +444,17 @@ static void VMChunkFinish(Chunk chunk)
 }
 
 
+/* VMArenaVarargs -- parse obsolete varargs */
+
+static void VMArenaVarargs(ArgStruct args[], va_list varargs)
+{
+  args[0].key = MPS_KEY_ARENA_SIZE;
+  args[0].val.size = va_arg(varargs, Size);
+  args[1].key = MPS_KEY_ARGS_END;
+  AVER(ArgListCheck(args));
+}
+
+
 /* VMArenaInit -- create and initialize the VM arena
  *
  * .arena.init: Once the arena has been allocated, we call ArenaInit
@@ -1798,6 +1809,7 @@ DEFINE_ARENA_CLASS(VMArenaClass, this)
   this->name = "VM";
   this->size = sizeof(VMArenaStruct);
   this->offset = offsetof(VMArenaStruct, arenaStruct);
+  this->varargs = VMArenaVarargs;
   this->init = VMArenaInit;
   this->finish = VMArenaFinish;
   this->reserved = VMArenaReserved;
diff --git a/mps/code/mpmst.h b/mps/code/mpmst.h
index 93eda47809d..1b66ddd3194 100644
--- a/mps/code/mpmst.h
+++ b/mps/code/mpmst.h
@@ -536,6 +536,7 @@ typedef struct mps_arena_class_s {
   char *name;                   /* class name string */
   size_t size;                  /* size of outer structure */
   size_t offset;                /* offset of generic struct in outer struct */
+  ArenaVarargsMethod varargs;
   ArenaInitMethod init;
   ArenaFinishMethod finish;
   ArenaReservedMethod reserved;
diff --git a/mps/code/mpmtypes.h b/mps/code/mpmtypes.h
index 587dd3dbb76..e74dcefae67 100644
--- a/mps/code/mpmtypes.h
+++ b/mps/code/mpmtypes.h
@@ -113,8 +113,9 @@ typedef struct StackContextStruct *StackContext;
 
 /* Arena*Method -- see <code/mpmst.h#ArenaClassStruct> */
 
+typedef void (*ArenaVarargsMethod)(ArgStruct args[], va_list varargs);
 typedef Res (*ArenaInitMethod)(Arena *arenaReturn,
-                               ArenaClass class, mps_arg_s args[]);
+                               ArenaClass class, ArgList args);
 typedef void (*ArenaFinishMethod)(Arena arena);
 typedef Size (*ArenaReservedMethod)(Arena arena);
 typedef void (*ArenaSpareCommitExceededMethod)(Arena arena);
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index 2efa608389d..08797c6e46a 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -324,35 +324,16 @@ mps_res_t mps_arena_create(mps_arena_t *mps_arena_o,
 }
 
 
-/* mps_arena_create_v -- create an arena object
- *
- * TODO: Decode deprecated varargs.  This code can be removed when varargs
- * support is dropped.
- */
+/* mps_arena_create_v -- create an arena object */
 
 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[3];
-
-  /* Decode deprecated varargs. */
-  if (arena_class == mps_arena_class_cl()) {
-    args[0].key = MPS_KEY_ARENA_SIZE;
-    args[0].val.size = va_arg(varargs, Size);
-    args[1].key = MPS_KEY_ARENA_CL_ADDR;
-    args[1].val.addr = va_arg(varargs, Addr);
-    args[2].key = MPS_KEY_ARGS_END;
-  } else if (arena_class == mps_arena_class_vm()) {
-    args[0].key = MPS_KEY_ARENA_SIZE;
-    args[0].val.size = va_arg(varargs, Size);
-    args[1].key = MPS_KEY_ARGS_END;
-  } else {
-    /* TODO: Could take args list for forward compatibility. */
-    args[0].key = MPS_KEY_ARGS_END;
-  }
+  mps_arg_s args[16]; /* FIXME: Have a maximum in config.h */
+  AVERT(ArenaClass, arena_class);
+  arena_class->varargs(args, varargs);
   va_end(varargs);
-
   return mps_arena_create_args(mps_arena_o, arena_class, args);
 }
 
@@ -654,6 +635,7 @@ 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[16]; /* FIXME: Have a maximum in config.h */
+  AVERT(PoolClass, class);
   class->varargs(args, varargs);
   va_end(varargs);
   return mps_pool_create_k(mps_pool_o, arena, class, args);