macro removal

[henge/apc.git] / src / ir.c

diff --git a/src/ir.c b/src/ir.c
index ebb2545..cb5fafd 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -14,16 +14,22 @@
 #include <unistd.h>   //u8_* functions\r
 #include <unitypes.h> //uint8_t as a char\r
 #include <unistr.h>   //u32_cpy\r
 #include <unistd.h>   //u8_* functions\r
 #include <unitypes.h> //uint8_t as a char\r
 #include <unistr.h>   //u32_cpy\r

+#include <unistdio.h> //ulc_fprintf\r

 /* Local */\r
 /* Local */\r

+#include "print.h"\r

 #include "apc.h"\r
 #include "ir.h"\r
 #include "apc.h"\r
 #include "ir.h"\r

+#undef  do_error\r
+#define do_error(...) exit(-1)\r
+#define XXH_PRIVATE_API\r
+#include "../xxHash/xxhash.h"\r

 /* Public */\r
 int      ir_init(void);\r
 void     ir_quit(void);\r
 /* Public */\r
 int      ir_init(void);\r
 void     ir_quit(void);\r

+void     ir_test(void);\r

 int      ir_linker(void);\r
 int      ir_condenser(void);\r
 /* Memory allocation structures */\r
 int      ir_linker(void);\r
 int      ir_condenser(void);\r
 /* Memory allocation structures */\r

-enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };\r

 struct pagenode_t;\r
 struct pagenode_header_t {\r
   struct pagenode_t* next;\r
 struct pagenode_t;\r
 struct pagenode_header_t {\r
   struct pagenode_t* next;\r


@@ -37,6 +43,13 @@ struct pagelist_t {
   struct pagenode_t* root, * head;\r
   size_t             pagesize;\r
 };\r
   struct pagenode_t* root, * head;\r
   size_t             pagesize;\r
 };\r

+#define SYS_PAGESIZE     (sys_pagesize)\r
+#define NAME_PAGESIZE    (APC_NAME_MAX * 1024)\r
+#define PL_HEADERSIZE    (sizeof(struct pagenode_header_t))\r
+#define PL_HEADSIZE(_PL) (_PL.head->header.head - _PL.head->root)\r
+#define PL_HEADMEM(_PL)  (_PL.pagesize - PL_HEADERSIZE - PL_HEADSIZE(_PL))\r
+/* Set data mem */\r
+enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };\r

 struct ir_namelist_t;\r
 struct ir_namelist_t\r
 { struct ir_namelist_t* nextsib;\r
 struct ir_namelist_t;\r
 struct ir_namelist_t\r
 { struct ir_namelist_t* nextsib;\r


@@ -51,7 +64,6 @@ struct ir_setld_t
   long long             ref;\r
   struct ir_namelist_t* namelist, * namelist_head;\r
 };\r
   long long             ref;\r
   struct ir_namelist_t* namelist, * namelist_head;\r
 };\r

-/* Set data mem */\r

 struct ir_setdata_header_t\r
 { enum dtype          type;\r
   uint8_t*            src_filename, * data_name;\r
 struct ir_setdata_header_t\r
 { enum dtype          type;\r
   uint8_t*            src_filename, * data_name;\r


@@ -90,8 +102,7 @@ struct ir_class_t
 };\r
 struct ir_set_t\r
 { struct ir_set_t*      nextchild, * nextsib;\r
 };\r
 struct ir_set_t\r
 { struct ir_set_t*      nextchild, * nextsib;\r

-  struct ir_class_t*    class;\r
-  long long             ref;\r
+  uint32_t              ref;\r

   uint8_t*              name;\r
   struct ir_framebox_t* frameboxes;\r
   struct ir_simplex_t*  audio;\r
   uint8_t*              name;\r
   struct ir_framebox_t* frameboxes;\r
   struct ir_simplex_t*  audio;\r


@@ -99,104 +110,86 @@ struct ir_set_t
 };\r
 /* Functions */\r
 static inline\r
 };\r
 /* Functions */\r
 static inline\r

-int                   init_pagelist(struct pagelist_t*,size_t);\r
+struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,uint8_t*);\r

 static inline\r
 static inline\r

-struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,const uint8_t*);\r
-static\r
-void                  ir_free_pagenodes(struct pagenode_t*);\r
+union ir_setdata_t*   ir_framedata (enum dtype,const uint8_t*,apc_facing,int,int);\r

 static inline\r
 static inline\r

-int                   bytes_identical(const uint8_t*,const uint8_t*);\r
+int      bytes_identical(const uint8_t*,const uint8_t*);\r
+static inline\r
+int      classnames_identical(const uint8_t*,const uint8_t*);\r
+static\r
+void*    stack_alloc(size_t);\r
+#define  struct_alloc(_T) ((struct _T*) stack_alloc(sizeof(struct _T)))\r
+#define  struct_clear(_S) (memset((_S), 0, sizeof(*(_S))))\r

 static\r
 static\r

-void*                 stack_alloc(size_t);\r
+uint8_t* name_alloc(const uint8_t*);\r

 static\r
 static\r

-uint8_t*              name_alloc(const uint8_t*);\r
+uint8_t* classname_alloc(const uint8_t*);\r

 static inline\r
 static inline\r

-union ir_setdata_t*   ir_framedata (enum dtype,const uint8_t*,apc_facing,int,int);\r
-/* Function-Like Macros */\r
-#define do_warn() do {                         \\r
+void*    pagelist_pop(struct pagelist_t*,size_t);\r
+#define $($)#$\r
+#define  pagelist_alloc(pagelist) do {                                 \\r
+    pagelist.head->header.next = (struct pagenode_t*) malloc(pagelist.pagesize); \\r
+    if (pagelist.head->header.next == NULL)                            \\r
+      eprintf("Memory allocation error\n");                            \\r
+    struct_clear(pagelist.head->header.next);                          \\r
+    pagelist.head = pagelist.head->header.next;                                \\r
+    pagelist.head->header.head = pagelist.head->root;                  \\r

   } while (0)\r
   } while (0)\r

-#define wprint(str) do {                       \\r
-    fprintf(stderr, str);                      \\r
-    do_warn();                                 \\r
+#define  pagelist_init(pagelist,size) do {                     \\r
+    pagelist.pagesize = size;                                  \\r
+    pagelist.root = (struct pagenode_t*) malloc(size);         \\r
+    if (pagelist.root == NULL)                                 \\r
+      eprintf("Memory allocation error\n");                    \\r
+    struct_clear(pagelist.root);                               \\r
+    pagelist.head = pagelist.root;                             \\r
+    pagelist.head->header.head = pagelist.head->root;          \\r

   } while (0)\r
   } while (0)\r

-#define wprintf(fmt,...) do {                  \\r
-    fprintf(stderr, fmt, __VA_ARGS__);         \\r
-    do_warn();                                 \\r
-  } while (0)\r
-#define do_error() do {                                \\r
-    exit(-1);                                  \\r
-  } while (0)\r
-#define eprint(str) do {                       \\r
-    fprintf(stderr, str);                      \\r
-    do_error();                                        \\r
-  } while (0)\r
-#define eprintf(fmt,...) do {                  \\r
-    fprintf(stderr, fmt, __VA_ARGS__);         \\r
-    do_error();                                        \\r
-  } while (0)\r
-#define struct_alloc(_T) ((struct _T*) stack_alloc(sizeof(struct _T)))\r
-#define DATA_PAGESIZE   (sys_pagesize)\r
-#define NAME_PAGESIZE   (APC_NAME_MAX * 1024)\r
-#define PL_HEADERSIZE   (sizeof(struct pagenode_header_t))\r
-#define PL_HEADSIZE(_PL) (_PL.head->header.head - _PL.head->root)\r
-#define PL_HEADMEM(_PL)  (_PL.pagesize - PL_HEADERSIZE - PL_HEADSIZE(_PL))\r
-/* Memory */\r
+static\r
+void     pagenode_free(struct pagenode_t*);\r
+#define  REFHASH(ref) (XXH32(&ref, sizeof(uint32_t), 0xCEED) & 0xCFF)\r
+\r

 extern //apc.c\r
 extern //apc.c\r

-long sys_pagesize;\r
+long     sys_pagesize;\r

 static\r
 static\r

-struct pagelist_t datapages, namepages;\r
+struct pagelist_t datapages, namepages, refhashpages;\r

 static\r
 struct ir_class_t root_class = { .name = (uint8_t*)"." };\r
 \r
 /* Init */\r
 int ir_init\r
 ( void )\r
 static\r
 struct ir_class_t root_class = { .name = (uint8_t*)"." };\r
 \r
 /* Init */\r
 int ir_init\r
 ( void )\r

-{ if (init_pagelist(&datapages, (size_t)DATA_PAGESIZE))\r
-    eprint("Memory allocation error\n");\r
-  if (init_pagelist(&namepages, (size_t)NAME_PAGESIZE))\r
-    eprint("Memory allocation error\n");\r
-  return 0;\r
-}\r
-\r
-static inline\r
-int init_pagelist\r
-( struct pagelist_t* pl,\r
-  size_t size\r
-)\r
-{ pl->pagesize = size;\r
-  pl->root = (struct pagenode_t*) calloc(size,1);\r
-  if (pl->root == NULL)\r
-    return -1;\r
-  pl->root->header.head = pl->root->root;\r
-  pl->head = pl->root;\r
+{ pagelist_init(datapages, (size_t)SYS_PAGESIZE);\r
+  pagelist_init(namepages, (size_t)NAME_PAGESIZE);\r
+  pagelist_init(refhashpages, (size_t)SYS_PAGESIZE);\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r

-/* Quit/Cleanup\r
-   Recursively clean pagenode linked list\r
-*/\r
+/* Quit/Cleanup */\r

 void ir_quit\r
 ( void )\r
 void ir_quit\r
 ( void )\r

-{ ir_free_pagenodes(datapages.root);\r
-  ir_free_pagenodes(namepages.root);\r
+{ pagenode_free(datapages.root);\r
+  pagenode_free(namepages.root);\r
+  pagenode_free(refhashpages.root);\r

 }\r
 \r
 }\r
 \r

+/* Recursively clean pagenode linked list, freeing last first */\r

 static\r
 static\r

-void ir_free_pagenodes\r
+void pagenode_free\r

 ( struct pagenode_t* pagenode )\r
 { if (pagenode->header.next != NULL)\r
 ( struct pagenode_t* pagenode )\r
 { if (pagenode->header.next != NULL)\r

-    ir_free_pagenodes(pagenode->header.next);\r
+    pagenode_free(pagenode->header.next);\r

   free(pagenode);\r
 }\r
 \r
   free(pagenode);\r
 }\r
 \r

-/* Link\r
-*/\r
+/* Link */\r

 int ir_linker\r
 ( void )\r
 int ir_linker\r
 ( void )\r

-{ return 0; }\r
+{ \r
+  return 0;\r
+}\r

 \r
 \r

-/* Condense\r
-*/\r
+/* Condense */\r

 int ir_condenser\r
 ( void )\r
 { return 0; }\r
 int ir_condenser\r
 ( void )\r
 { return 0; }\r


@@ -220,26 +213,28 @@ struct ir_class_t* ir_class_addchild
   const uint8_t*     name\r
 )\r
 { struct ir_class_t* iter;\r
   const uint8_t*     name\r
 )\r
 { struct ir_class_t* iter;\r

-  printf("Class %s, addchild %s\n", class->name, name);\r

   if (class->nextchild == NULL)\r
   if (class->nextchild == NULL)\r

-    goto alloc;\r
+    { class->nextchild = struct_alloc(ir_class_t);\r
+      struct_clear(class->nextchild);\r
+      class->nextchild->name = classname_alloc(name);\r
+      return class->nextchild;\r
+    }\r

   iter = class->nextchild;\r
   if (iter->name == NULL)\r
     eprintf("Null name pointer in class %p\n", iter);\r
   if (name == NULL)\r
     eprintf("Null child added to class %s\n", iter->name);\r
  check:\r
   iter = class->nextchild;\r
   if (iter->name == NULL)\r
     eprintf("Null name pointer in class %p\n", iter);\r
   if (name == NULL)\r
     eprintf("Null child added to class %s\n", iter->name);\r
  check:\r

-  if (bytes_identical(iter->name, name))\r
+  if (classnames_identical(iter->name, name))\r

     return iter;\r
   if (iter->nextsib != NULL)\r
     { iter = iter->nextsib;\r
       goto check;\r
     }\r
     return iter;\r
   if (iter->nextsib != NULL)\r
     { iter = iter->nextsib;\r
       goto check;\r
     }\r

- alloc:\r
-  iter = struct_alloc(ir_class_t);\r
-  iter->nextsib = class->nextchild;\r
-  iter->name = name_alloc(name);\r
-  return class->nextchild = iter;\r
+  iter->nextsib = struct_alloc(ir_class_t);\r
+  struct_clear(iter->nextsib);\r
+  iter->nextsib->name = classname_alloc(name);\r
+  return iter->nextsib;\r

 }\r
 \r
 /* Add a set to a class\r
 }\r
 \r
 /* Add a set to a class\r


@@ -251,14 +246,17 @@ struct ir_set_t* ir_class_addset
   const uint8_t*     name\r
 )\r
 { struct ir_set_t* iter;\r
   const uint8_t*     name\r
 )\r
 { struct ir_set_t* iter;\r

-  printf("Class %s, addset %s\n", class->name, name);\r

   if (class->root_set == NULL)\r
   if (class->root_set == NULL)\r

-    goto alloc;\r
+    { class->root_set = struct_alloc(ir_set_t);\r
+      struct_clear(class->root_set);\r
+      class->root_set->name = name_alloc(name);\r
+      return class->root_set;\r
+    }\r

   iter = class->root_set;\r
   if (iter->name == NULL)\r
     eprintf("Null name pointer in class %p\n", iter);\r
   if (name == NULL)\r
   iter = class->root_set;\r
   if (iter->name == NULL)\r
     eprintf("Null name pointer in class %p\n", iter);\r
   if (name == NULL)\r

-    eprintf("Null set added to class %s\n", iter->name);\r
+    eprintf("Null set added to class %U\n", iter->name);\r

  check:\r
   if (bytes_identical(iter->name, name))\r
     return iter;\r
  check:\r
   if (bytes_identical(iter->name, name))\r
     return iter;\r


@@ -266,13 +264,26 @@ struct ir_set_t* ir_class_addset
     { iter = iter->nextsib;\r
       goto check;\r
     }\r
     { iter = iter->nextsib;\r
       goto check;\r
     }\r

- alloc:\r
-  iter = struct_alloc(ir_set_t);\r
-  iter->nextsib = class->root_set;\r
-  iter->name = name_alloc(name);\r
-  return class->root_set = iter;\r
+  iter->nextsib = struct_alloc(ir_set_t);\r
+  struct_clear(iter->nextsib);\r
+  iter->nextsib->name = name_alloc(name);\r
+  return iter->nextsib;\r

 }\r
 \r
 }\r
 \r

+struct ir_set_t* ir_set_from_ref\r
+( uint32_t ref )\r
+{ uint16_t hash;\r
+  struct ir_set_t** iters;\r
+  struct pagenode_t* iterp;\r
+  iterp = refhashpages.root;\r
+  hash = REFHASH(ref);\r
+  do\r
+    iters = ((struct ir_set_t**) iterp->root) + hash;\r
+  while (*iters != NULL && (*iters)->ref != ref && (iterp = iterp->header.next) != NULL);\r
+  return *iters;\r
+}\r
+\r
+\r

 /* Add a set to a set\r
    Attempts to create a new subset of the specified set, returning the\r
    child if it already exists\r
 /* Add a set to a set\r
    Attempts to create a new subset of the specified set, returning the\r
    child if it already exists\r


@@ -282,14 +293,17 @@ struct ir_set_t* ir_set_addchild
   const uint8_t*   name\r
 )\r
 { struct ir_set_t* iter;\r
   const uint8_t*   name\r
 )\r
 { struct ir_set_t* iter;\r

-  printf("Set %s, addchild %s\n", set->name, name);\r

   if (set->nextchild == NULL)\r
   if (set->nextchild == NULL)\r

-    goto alloc;\r
+    { set->nextchild = struct_alloc(ir_set_t);\r
+      struct_clear(set->nextchild);\r
+      set->nextchild->name = name_alloc(name);\r
+      return set->nextchild;\r
+    }\r

   iter = set->nextchild;\r
   iter = set->nextchild;\r

-  if (iter->name == NULL)\r
-    eprintf("Null name pointer in set %p\n", iter);\r

   if (name == NULL)\r
     eprintf("Null child added to set %s\n", iter->name);\r
   if (name == NULL)\r
     eprintf("Null child added to set %s\n", iter->name);\r

+  if (iter->name == NULL)\r
+    eprintf("Null name pointer in set %p\n", iter);\r

  check:\r
   if (bytes_identical(iter->name, name))\r
     return iter;\r
  check:\r
   if (bytes_identical(iter->name, name))\r
     return iter;\r


@@ -297,25 +311,30 @@ struct ir_set_t* ir_set_addchild
     { iter = iter->nextsib;\r
       goto check;\r
     }\r
     { iter = iter->nextsib;\r
       goto check;\r
     }\r

- alloc:\r
-  iter = struct_alloc(ir_set_t);\r
-  iter->nextsib = set->nextchild;\r
-  iter->name = name_alloc(name);\r
-  return set->nextchild = iter;\r
+  iter->nextsib = struct_alloc(ir_set_t);\r
+  struct_clear(iter->nextsib);\r
+  iter->nextsib->name = name_alloc(name);\r
+  return iter->nextsib;\r

 }\r
 \r
 /* Add a framebox to a set\r
    Attempts to create a new framebox of the specified set, returning\r
    the framebox if it already exists\r
 }\r
 \r
 /* Add a framebox to a set\r
    Attempts to create a new framebox of the specified set, returning\r
    the framebox if it already exists\r

+   Name is not allocated, but assigned, unlike other "XXX_add" functions where\r
+   name is duplicated into IR's internal array.\r

 */\r
 static inline\r
 struct ir_framebox_t* ir_set_add_framebox\r
 ( struct ir_set_t* set,\r
 */\r
 static inline\r
 struct ir_framebox_t* ir_set_add_framebox\r
 ( struct ir_set_t* set,\r

-  const uint8_t*   name\r
+  uint8_t*         name\r

 )\r
 { struct ir_framebox_t* iter;\r
   if (set->frameboxes == NULL)\r
 )\r
 { struct ir_framebox_t* iter;\r
   if (set->frameboxes == NULL)\r

-    goto alloc;\r
+    { set->frameboxes = struct_alloc(ir_framebox_t);\r
+      struct_clear(set->frameboxes);\r
+      set->frameboxes->header.data_name = name;\r
+      return set->frameboxes;\r
+    }\r

   iter = set->frameboxes;\r
  check:\r
   if (bytes_identical(iter->header.data_name, name))\r
   iter = set->frameboxes;\r
  check:\r
   if (bytes_identical(iter->header.data_name, name))\r


@@ -324,11 +343,10 @@ struct ir_framebox_t* ir_set_add_framebox
     { iter = (struct ir_framebox_t*) iter->header.nextsib;\r
       goto check;\r
     }\r
     { iter = (struct ir_framebox_t*) iter->header.nextsib;\r
       goto check;\r
     }\r

- alloc:\r
-  iter = struct_alloc(ir_framebox_t);\r
-  iter->header.nextsib = (union ir_setdata_t*) set->frameboxes;\r
-  iter->header.data_name = name_alloc(name);\r
-  return set->frameboxes = iter;\r
+  iter->header.nextsib = (union ir_setdata_t*) struct_alloc(ir_framebox_t);\r
+  struct_clear(iter->header.nextsib);\r
+  iter->header.nextsib->header.data_name = name;\r
+  return (struct ir_framebox_t*) (iter->header.nextsib);\r

 }\r
 \r
 /* Match two null-terminated bytestrings\r
 }\r
 \r
 /* Match two null-terminated bytestrings\r


@@ -347,9 +365,20 @@ int bytes_identical
   return (ca == cb);\r
 }\r
 \r
   return (ca == cb);\r
 }\r
 \r

-/* Assign Setdata to Set\r
+static inline\r
+int classnames_identical\r
+( const uint8_t* stra,\r
+  const uint8_t* strb\r
+)\r
+{ int ca, cb;\r
+  do {\r
+    ca = *stra++;\r
+    cb = *strb++;\r
+  } while (ca && ca == cb);\r
+  return (ca == cb);\r
+}\r

 \r
 \r

- */\r
+/* Assign Setdata to Set  */\r

 void ir_set_assign_data\r
 ( struct ir_set_t*      set,\r
   union  ir_setdata_t*  setdata\r
 void ir_set_assign_data\r
 ( struct ir_set_t*      set,\r
   union  ir_setdata_t*  setdata\r


@@ -401,13 +430,37 @@ void ir_set_assign_data
 \r
 void ir_set_assign_ref\r
 ( struct ir_set_t* set,\r
 \r
 void ir_set_assign_ref\r
 ( struct ir_set_t* set,\r

-  long long        ref\r
+  uint32_t         ref\r

 )\r
 )\r

-{ if (set->ref != 0)\r
-    wprintf("Ref override: 0x%lx -> 0x%lx for set %s\n",\r
-           (long unsigned) set->ref, (long unsigned) ref, set->name);\r
+{ uint16_t hash, oldhash;\r
+  struct ir_set_t** iters;\r
+  struct pagenode_t* iterp;\r
+  uint32_t           oldref;\r
+  oldref = set->ref;\r
+  oldhash = 0;\r
+  hash = REFHASH(ref);\r
+  iterp = refhashpages.root;\r
+ check_depth:\r
+  iters = ((struct ir_set_t**) iterp->root) + hash;\r
+  if (*iters == NULL || *iters == set)\r
+    *iters = set;\r
+  else\r
+    { if (iterp->header.next == NULL)\r
+       pagelist_alloc(refhashpages);\r
+      iterp = iterp->header.next;\r
+      goto check_depth;\r
+    }\r
+  if (oldref != 0)\r
+    { wprintf("Ref override: 0x%x -> 0x%x for set %s\n", oldref, ref, set->name);\r
+      if (oldhash != 0)\r
+       *iters = NULL;\r
+      else\r
+       { oldhash = hash;\r
+         hash = REFHASH(oldref);\r
+         goto check_depth;\r
+       }\r
+    }\r

   set->ref = ref;\r
   set->ref = ref;\r

-  //TODO: reflist_add(set);\r

 }\r
 \r
 void ir_data_assign_path\r
 }\r
 \r
 void ir_data_assign_path\r


@@ -447,8 +500,9 @@ union ir_setdata_t* ir_framedata
   int            height\r
 )\r
 { struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t);\r
   int            height\r
 )\r
 { struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t);\r

+  struct_clear(framedata);\r

   if (name == NULL)\r
   if (name == NULL)\r

-    eprint("Null name in set allocation\n");\r
+    eprintf("Null name in set allocation\n");\r

   framedata->header.type = type;\r
   framedata->header.data_name = name_alloc(name);\r
   framedata->frameinfo.facing = d;\r
   framedata->header.type = type;\r
   framedata->header.data_name = name_alloc(name);\r
   framedata->frameinfo.facing = d;\r


@@ -460,8 +514,9 @@ union ir_setdata_t* ir_framedata
 union ir_setdata_t* ir_audio\r
 ( const uint8_t* name )\r
 { struct ir_simplex_t* audio = struct_alloc(ir_simplex_t);\r
 union ir_setdata_t* ir_audio\r
 ( const uint8_t* name )\r
 { struct ir_simplex_t* audio = struct_alloc(ir_simplex_t);\r

+  struct_clear(audio);\r

   if (name == NULL)\r
   if (name == NULL)\r

-    eprint("Null audio\n");\r
+    eprintf("Null audio\n");\r

   audio->header.type = ADAT;\r
   audio->header.data_name = name_alloc(name);\r
   return (union ir_setdata_t*) audio;\r
   audio->header.type = ADAT;\r
   audio->header.data_name = name_alloc(name);\r
   return (union ir_setdata_t*) audio;\r


@@ -473,16 +528,18 @@ struct ir_classld_t* ir_classld_from_class
 ( struct ir_class_t* class )\r
 { struct ir_classld_t* classld;\r
   if (class == NULL)\r
 ( struct ir_class_t* class )\r
 { struct ir_classld_t* classld;\r
   if (class == NULL)\r

-    eprint("Null class in classld\n");\r
+    eprintf("Null class in classld\n");\r

   classld = struct_alloc(ir_classld_t);\r
   classld = struct_alloc(ir_classld_t);\r

+  struct_clear(classld);\r

   classld->root_class = class;\r
   return classld;\r
 }\r
 \r
 struct ir_setld_t* ir_setld_from_ref\r
   classld->root_class = class;\r
   return classld;\r
 }\r
 \r
 struct ir_setld_t* ir_setld_from_ref\r

-( long long ref )\r
+( uint32_t ref )\r

 { struct ir_setld_t* setld;\r
   setld = struct_alloc(ir_setld_t);\r
 { struct ir_setld_t* setld;\r
   setld = struct_alloc(ir_setld_t);\r

+  struct_clear(setld);\r

   setld->ref = ref;\r
   return setld;\r
 }\r
   setld->ref = ref;\r
   return setld;\r
 }\r


@@ -493,7 +550,9 @@ struct ir_setld_t* ir_setld_from_classld
 )\r
 { struct ir_setld_t* setld;\r
   setld = struct_alloc(ir_setld_t);\r
 )\r
 { struct ir_setld_t* setld;\r
   setld = struct_alloc(ir_setld_t);\r

+  struct_clear(setld);\r

   setld->namelist = struct_alloc(ir_namelist_t);\r
   setld->namelist = struct_alloc(ir_namelist_t);\r

+  struct_clear(setld->namelist);\r

   setld->namelist_head = setld->namelist;\r
   setld->namelist_head->name = name_alloc(name);\r
   setld->classld = classld;\r
   setld->namelist_head = setld->namelist;\r
   setld->namelist_head->name = name_alloc(name);\r
   setld->classld = classld;\r


@@ -506,10 +565,12 @@ struct ir_setld_t* ir_setld_addchild
 )\r
 { if (setld->namelist == NULL)\r
     { setld->namelist = struct_alloc(ir_namelist_t);\r
 )\r
 { if (setld->namelist == NULL)\r
     { setld->namelist = struct_alloc(ir_namelist_t);\r

+      struct_clear(setld->namelist);\r

       setld->namelist_head = setld->namelist;\r
     }\r
   else\r
     { setld->namelist_head->nextsib = struct_alloc(ir_namelist_t);\r
       setld->namelist_head = setld->namelist;\r
     }\r
   else\r
     { setld->namelist_head->nextsib = struct_alloc(ir_namelist_t);\r

+      struct_clear(setld->namelist_head->nextsib);\r

       setld->namelist_head = setld->namelist_head->nextsib;\r
     }\r
   setld->namelist_head->name = name_alloc(name);\r
       setld->namelist_head = setld->namelist_head->nextsib;\r
     }\r
   setld->namelist_head->name = name_alloc(name);\r


@@ -523,6 +584,7 @@ union ir_setdata_t* ir_link
 )\r
 { struct ir_link_t* link;\r
   link = struct_alloc(ir_link_t);\r
 )\r
 { struct ir_link_t* link;\r
   link = struct_alloc(ir_link_t);\r

+  struct_clear(link);\r

   link->header.type = LDAT;\r
   link->type = link_type; \r
   link->classld = setld->classld;\r
   link->header.type = LDAT;\r
   link->type = link_type; \r
   link->classld = setld->classld;\r


@@ -532,21 +594,33 @@ union ir_setdata_t* ir_link
   return (union ir_setdata_t*) link;\r
 }\r
 \r
   return (union ir_setdata_t*) link;\r
 }\r
 \r

+static inline\r
+void* pagelist_pop\r
+( struct pagelist_t* pagelist,\r
+  size_t             size\r
+)\r
+{ size_t headsize = PL_HEADSIZE((*pagelist));\r
+  if (!headsize)\r
+    { free(pagelist->head);\r
+      pagelist->head = pagelist->root;\r
+      while (pagelist->head->header.next != NULL)\r
+       pagelist->head = pagelist->head->header.next;\r
+    }\r
+  if (headsize < size)\r
+    eprintf("Attempted to pop unaligned value from pagelist\n");\r
+  pagelist->head->header.head -= size;\r
+  return pagelist->head->header.head;\r
+}\r

 \r
 static\r
 void* stack_alloc\r
 ( size_t bytes )\r
 \r
 static\r
 void* stack_alloc\r
 ( size_t bytes )\r

-{ if (!bytes) //valid behavior to attain current head\r
-    return datapages.head->header.head;\r
+{ void* p;\r

   if (PL_HEADMEM(datapages) < bytes) \r
   if (PL_HEADMEM(datapages) < bytes) \r

-    { datapages.head->header.next = (struct pagenode_t*) calloc(datapages.pagesize,1);\r
-      if (datapages.head->header.next == NULL)\r
-       eprint("Memory allocation error \n");\r
-      datapages.head = datapages.head->header.next; \r
-      datapages.head->header.head = datapages.head->root;\r
-    }\r
+    pagelist_alloc(datapages);\r
+  p = datapages.head->header.head;\r

   datapages.head->header.head += bytes;\r
   datapages.head->header.head += bytes;\r

-  return (void*) datapages.head->header.head - bytes;\r
+  return p;\r

 }\r
 \r
 static\r
 }\r
 \r
 static\r


@@ -558,16 +632,80 @@ uint8_t* name_alloc
  copy:\r
   name = (uint8_t*)namepages.head->header.head;\r
   iter = name_src;\r
  copy:\r
   name = (uint8_t*)namepages.head->header.head;\r
   iter = name_src;\r

-  for (head_mem = PL_HEADMEM(namepages); *iter && *iter != '_' && head_mem; head_mem--)\r
+  for (head_mem = PL_HEADMEM(namepages); *iter && *iter != '_' && *iter != '.' && head_mem; head_mem--)\r

     *(namepages.head->header.head)++ = *iter++;\r
     *(namepages.head->header.head)++ = *iter++;\r

-  if (head_mem == 0) //not enough room\r
-    { namepages.head->header.next = (struct pagenode_t*) calloc(namepages.pagesize,1);\r
-      if (namepages.head->header.next == NULL)\r
-       eprint("Memory allocation error\n");\r
-      namepages.head = namepages.head->header.next;\r
-      namepages.head->header.head = namepages.head->root;\r
+  if (head_mem < 1) //not enough room\r
+    { pagelist_alloc(namepages);\r

       goto copy;\r
     }\r
   *(namepages.head->header.head)++ = '\0';\r
   return name;\r
 }\r
       goto copy;\r
     }\r
   *(namepages.head->header.head)++ = '\0';\r
   return name;\r
 }\r

+\r
+static\r
+uint8_t* classname_alloc\r
+( const uint8_t* name_src )\r
+{ const uint8_t* iter;\r
+  uint8_t*       name;\r
+  int            head_mem;\r
+ copy:\r
+  name = (uint8_t*)namepages.head->header.head;\r
+  iter = name_src;\r
+  for (head_mem = PL_HEADMEM(namepages); *iter && head_mem; head_mem--)\r
+    *(namepages.head->header.head)++ = *iter++;\r
+  if (head_mem < 1) //not enough room\r
+    { pagelist_alloc(namepages);\r
+      goto copy;\r
+    }\r
+  *(namepages.head->header.head)++ = '\0';\r
+  return name;\r
+}\r
+\r
+static void crawl_class(struct ir_class_t*);\r
+static void crawl_set(struct ir_set_t*,int);\r
+void     ir_test(void)\r
+{ uprintf("IR From Directory: %s\n",getcwd(NULL,255));\r
+  crawl_class(&root_class);\r
+  if (root_class.root_set != NULL)\r
+    crawl_set(root_class.root_set, 0);\r
+}\r
+\r
+static\r
+void crawl_class\r
+( struct ir_class_t* class )\r
+{ struct ir_class_t* iter;\r
+  for (iter = class->nextchild; iter != NULL; iter = iter->nextsib)\r
+    { wprintf("%U/\n", iter->name);\r
+      if(chdir((char*)iter->name))\r
+       eprintf("CHDIR %U from %s\n",iter->name,getcwd(NULL,255));\r
+      crawl_class(iter);\r
+      if (iter->root_set != NULL)\r
+        crawl_set(iter->root_set, 0);\r
+      uprintf("%U\\\n",iter->name);\r
+      if (chdir(".."))\r
+       eprintf("CHDIR ..\n");\r
+    }\r
+}\r
+\r
+static\r
+void crawl_set\r
+( struct ir_set_t* set,\r
+  int depth\r
+)\r
+{ struct ir_set_t* setlist[64], ** slp, * iter;\r
+  int i = depth * 12;\r
+  while (i--)\r
+    putchar('.');\r
+  i = depth;\r
+  slp = setlist;\r
+  for(iter = set; iter != NULL; iter = iter->nextchild)\r
+    { uprintf("[%10U]", iter->name);\r
+      *slp++ = iter;\r
+      i++;\r
+    }\r
+  --i;\r
+  putchar('\n');\r
+  for(iter = *--slp; slp >= setlist; iter = *--slp, --i)\r
+    if (iter->nextsib != NULL)\r
+      crawl_set(iter->nextsib,i);\r
+}\r