X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=blobdiff_plain;f=src%2Fapc%2Firmem.c;h=415399cb5a62f077f5bdc0be2058d05666940f5c;hp=c241a29aa3fa78849164a8f979bd14b30963d7a9;hb=301cac5f6e2edcecf2e1bd89aee5182130a213fc;hpb=0f505368fa8abbc2e9ab0296b9a5e6bd4869345f

diff --git a/src/apc/irmem.c b/src/apc/irmem.c
index c241a29..415399c 100644
--- a/src/apc/irmem.c
+++ b/src/apc/irmem.c
@@ -23,8 +23,8 @@ struct odat*
 curr_odat(void);
 struct vdat*
 curr_vdat(void);
-struct variant*
-curr_variant(void);
+struct map*
+curr_map(void);
 struct set*
 curr_set(void);
 struct ref*
@@ -43,7 +43,7 @@ struct chunk_stack
   void* dsp[MAX_CHUNKS]; //dat stack pointer (per chunk)
   int   chunk_size;      //size of a chunk (including its forfeited page)
   int   max_dats;        //number of dats per chunk for this stack
-} ocs, vcs, ccs, rcs, lcs, pcs, varcs; //odat, vdat, cdat,variant, ref, link, post stacks
+} ocs, vcs, ccs, rcs, lcs, pcs, mcs; //odat, vdat, cdat,map, ref, link, post stacks
 
 //type safety handled by macro expansion (do not call these directly from code, make dependent macros for access to these)
 #define CHUNKS_LEN(STACK)         ((STACK).csp - (STACK).chunks)
@@ -82,11 +82,11 @@ struct chunk_stack
 #define CDAT_FULL()     (DATA_FULL(ccs, struct cdat))
 #define CDAT_ALLOC()    (ALLOC_DAT(ccs, struct cdat))
 #define CCS_FULL()      (CHUNKS_FULL(ccs))
-#define INIT_VARIANT()     (INIT_STACK(varcs, struct variant))
-#define CURRENT_VARIANT()  (CURRENT_DATP(varcs, struct variant))
-#define VARIANT_FULL()     (DATA_FULL(varcs, struct variant))
-#define VARIANT_ALLOC()     (ALLOC_DAT(varcs, struct variant))
-#define VARCS_FULL()      (CHUNKS_FULL(varcs))
+#define INIT_MAP()     (INIT_STACK(mcs, struct map))
+#define CURRENT_MAP()  (CURRENT_DATP(mcs, struct map))
+#define MAP_FULL()     (DATA_FULL(mcs, struct map))
+#define MAP_ALLOC()     (ALLOC_DAT(mcs, struct map))
+#define MCS_FULL()      (CHUNKS_FULL(mcs))
 #define INIT_LINK()     (INIT_STACK(lcs, struct link))
 #define CURRENT_LINK()  (CURRENT_DATP(lcs,struct link))
 #define LDAT_FULL()     (DATA_FULL(lcs, struct link))
@@ -105,7 +105,7 @@ struct chunk_stack
 #define RCS_FULL()      (CHUNKS_FULL(rcs))
 //Metadata
 #define CURRENT_SET()   (CURRENT_CDAT()->set_list[CURRENT_CDAT()->num_sets])
-//#define CURRENT_QUAD()  (CURRENT_VARIANT()->quad_list[CURRENT_VARIANT()->num_quads])
+//#define CURRENT_QUAD()  (CURRENT_MAP()->quad_list[CURRENT_MAP()->num_quads])
 //#define CURRENT_MODEL() (CURRENT_VDAT()->model_list[CURRENT_VDAT()->num_models])
 
 
@@ -121,7 +121,7 @@ int num_odats = 0;
 
 int num_vdats = 0;
 
-int num_variants = 0;
+int num_maps = 0;
 
 int num_refs = 0;
 int ss_ref_id = 0x0FFFFFFF; /* system space for ref_ids */
@@ -147,7 +147,7 @@ ir_init()
 
   INIT_ODAT();
   INIT_VDAT();
-  INIT_VARIANT();
+  INIT_MAP();
   INIT_LINK();
   INIT_REF();
   INIT_POST();
@@ -212,7 +212,7 @@ struct odat*
 alloc_odat
 ()
 {
-  num_odats++;
+   num_odats++;
   if(ODAT_FULL())
     { if(!OCS_FULL())
         { fprintf(stderr, "You have allocated to many (%d) odats ", num_odats);
@@ -245,22 +245,22 @@ alloc_vdat
   return CURRENT_VDAT();
 }
 
-struct variant* 
-alloc_variant
+struct map* 
+alloc_map
 ()
-{ num_variants++;
-  if(VARIANT_FULL())
-    { if(!VARCS_FULL())
-        { fprintf(stderr, "You have allocated to many (%d) variants ", num_variants);
+{ num_maps++;
+  if(MAP_FULL())
+    { if(!MCS_FULL())
+        { fprintf(stderr, "You have allocated to many (%d) maps ", num_maps);
           exit(EXIT_FAILURE);
         }
       else
-        CSP_PUSH(varcs);
+        CSP_PUSH(mcs);
     }
   else
-    VARIANT_ALLOC();
+    MAP_ALLOC();
 
-  return CURRENT_VARIANT();
+  return CURRENT_MAP();
 }
 
 
@@ -354,11 +354,11 @@ curr_ref
 {
   return CURRENT_REF();
 }
-struct variant*
-curr_variant
+struct map*
+curr_map
 ()
 {
-  return CURRENT_VARIANT();
+  return CURRENT_MAP();
 }
 /* struct quad* */
 /* curr_quad */