fixes

diff --git a/src/ir.c b/src/ir.c
index 16a0ca3..0e52459 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -22,33 +22,23 @@ int      ir_init(void);
 void     ir_quit(void);\r
 int      ir_linker(void);\r
 int      ir_condenser(void);\r
 void     ir_quit(void);\r
 int      ir_linker(void);\r
 int      ir_condenser(void);\r

-/* Private */\r
+/* Memory allocation structures */\r

 struct pagenode_t;\r
 struct pagenode_t;\r

-extern //apc.c\r
-long sys_pagesize;\r
-static inline\r
-struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*, uint8_t*);\r
-static\r
-void                  ir_free_pages(struct pagenode_t*);\r
-static inline\r
-int                   bytes_identical(uint8_t*,uint8_t*);\r
-static\r
-void*                 stack_alloc(size_t);\r
-/* Memory allocator */\r
-struct pagenode_t {\r
+struct pagenode_header_t {\r

   struct pagenode_t* next;\r
   char*              head;\r
   struct pagenode_t* next;\r
   char*              head;\r

-  char               root[];\r
-}* pagenode_root, * pagenode_head;\r
-#define PN_ALLOCSIZE    (sys_pagesize)\r
-#define PN_HEADERSIZE() (sizeof(struct pagenode_t*) + sizeof(char*))\r
-#define PN_MEMSIZE()    (PN_ALLOCSIZE - PN_HEADERSIZE())\r
-#define PN_HEADSIZE()   (pagenode_head->head - pagenode_head->root)\r
-#define PN_HEADSPACE()  (PN_MEMSIZE() - PN_HEADSIZE())\r
-/* Enumerated types */\r
+};\r
+struct pagenode_t {\r
+  struct pagenode_header_t header;\r
+  char                     root[];\r
+};\r
+struct pagelist_t {\r
+  struct pagenode_t* root, * head;\r
+  size_t             page_size;\r
+};\r
+/* Set link data */\r

 enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };\r
 enum ltype { OLINK, MLINK, VLINK, ALINK };\r
 enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };\r
 enum ltype { OLINK, MLINK, VLINK, ALINK };\r

-/* Set link data */\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


@@ -56,12 +46,12 @@ struct ir_namelist_t
 };\r
 struct ir_classld_t\r
 { struct ir_class_t*    root_class;\r
 };\r
 struct ir_classld_t\r
 { struct ir_class_t*    root_class;\r

-  struct ir_namelist_t* namelist;\r
+  struct ir_namelist_t* namelist, * namelist_head;\r

 };\r
 struct ir_setld_t\r
 { struct classld_t*     classld;\r
   long long             ref;\r
 };\r
 struct ir_setld_t\r
 { struct classld_t*     classld;\r
   long long             ref;\r

-  struct ir_namelist_t* namelist;\r
+  struct ir_namelist_t* namelist, * namelist_head;\r

 };\r
 /* Set data mem */\r
 struct ir_setdata_header_t\r
 };\r
 /* Set data mem */\r
 struct ir_setdata_header_t\r


@@ -80,8 +70,7 @@ struct ir_framebox_t
   struct ir_framedata_t      framesheets[FACING_MAX];\r
   struct ir_framedata_t      mapsheets[FACING_MAX];\r
 };\r
   struct ir_framedata_t      framesheets[FACING_MAX];\r
   struct ir_framedata_t      mapsheets[FACING_MAX];\r
 };\r

-struct ir_simplex_t\r
-{ struct ir_setdata_header_t header; };\r
+struct ir_simplex_t { struct ir_setdata_header_t header; };\r

 struct ir_link_t\r
 { struct ir_setdata_header_t header;\r
   struct ir_classld_t*       classld;\r
 struct ir_link_t\r
 { struct ir_setdata_header_t header;\r
   struct ir_classld_t*       classld;\r


@@ -110,6 +99,19 @@ struct ir_set_t
   struct ir_simplex_t*  audio;\r
   struct ir_link_t*     links;\r
 };\r
   struct ir_simplex_t*  audio;\r
   struct ir_link_t*     links;\r
 };\r

+/* Functions */\r
+static inline\r
+struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*, uint8_t*);\r
+static\r
+void                  ir_free_pagenodes(struct pagenode_t*);\r
+static inline\r
+int                   bytes_identical(uint8_t*,uint8_t*);\r
+static\r
+void*                 stack_alloc(size_t);\r
+static\r
+uint8_t*              name_alloc(uint8_t*);\r
+static inline\r
+union ir_setdata_t*   ir_framedata (enum dtype,uint8_t*,apc_facing,int,int);\r

 /* Function-Like Macros */\r
 #define do_warn() do {                         \\r
   } while (0)\r
 /* Function-Like Macros */\r
 #define do_warn() do {                         \\r
   } while (0)\r


@@ -133,30 +135,54 @@ struct ir_set_t
     do_error();                                        \\r
   } while (0)\r
 #define struct_alloc(_T) ((struct _T*) stack_alloc(sizeof(struct _T)))\r
     do_error();                                        \\r
   } while (0)\r
 #define struct_alloc(_T) ((struct _T*) stack_alloc(sizeof(struct _T)))\r

-\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.page_size - PL_HEADERSIZE - PL_HEADSIZE(_PL))\r
+/* Memory */\r
+extern //apc.c\r
+long sys_pagesize;\r
+static\r
+struct pagelist_t datapages, namepages;\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

-{ pagenode_root = (struct pagenode_t*) calloc((size_t)PN_ALLOCSIZE,1);\r
-  if (pagenode_root == NULL)\r
+{ if (init_pagelist(&datapages, (size_t)DATA_PAGESIZE))\r
+    eprintf("Memory allocation error\n");\r
+  if (init_pagelist(&namepages, (size_t)NAME_PAGESIZE))\r
+    eprintf("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->page_size = size;\r
+  pl->root = (struct pagenode_t*) calloc(size,1);\r
+  if (pl->root == NULL)\r

     return -1;\r
     return -1;\r

-  pagenode_root->head = pagenode_root->root;\r
-  pagenode_head = pagenode_root;\r
+  pl->root->header.head = pl->root->root;\r
+  pl->head = pl->root;\r

   return 0;\r
   return 0;\r

-} \r
+}\r

 \r
 /* Quit/Cleanup\r
    Recursively clean pagenode linked list\r
 */\r
 void ir_quit\r
 ( void )\r
 \r
 /* Quit/Cleanup\r
    Recursively clean pagenode linked list\r
 */\r
 void ir_quit\r
 ( void )\r

-{ ir_free_pages(pagenode_root); }\r
+{ ir_free_pagenodes(datapages.root);\r
+  ir_free_pagenodes(namepages.root);\r
+}\r

 \r
 static\r
 \r
 static\r

-void ir_free_pages\r
+void ir_free_pagenodes\r

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


@@ -201,6 +227,7 @@ struct ir_class_t* ir_class_addchild
     }\r
   iter = struct_alloc(ir_class_t);\r
   iter->nextsib = class->nextchild;\r
     }\r
   iter = struct_alloc(ir_class_t);\r
   iter->nextsib = class->nextchild;\r

+  iter->name = name_alloc(name);\r

   return class->nextchild = iter;\r
 }\r
 \r
   return class->nextchild = iter;\r
 }\r
 \r


@@ -225,6 +252,7 @@ struct ir_set_t* ir_class_addset
     }\r
   iter = struct_alloc(ir_set_t);\r
   iter->nextsib = class->root_set;\r
     }\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
 }\r
 \r
   return class->root_set = iter;\r
 }\r
 \r


@@ -249,6 +277,7 @@ struct ir_set_t* ir_set_addchild
     }\r
   iter = struct_alloc(ir_set_t);\r
   iter->nextsib = set->nextchild;\r
     }\r
   iter = struct_alloc(ir_set_t);\r
   iter->nextsib = set->nextchild;\r

+  iter->name = name_alloc(name);\r

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


@@ -274,6 +303,7 @@ struct ir_framebox_t* ir_set_add_framebox
     }\r
   iter = struct_alloc(ir_framebox_t);\r
   iter->header.nextsib = (union ir_setdata_t*) set->frameboxes;\r
     }\r
   iter = struct_alloc(ir_framebox_t);\r
   iter->header.nextsib = (union ir_setdata_t*) set->frameboxes;\r

+  iter->name = name_alloc(name);\r

   return set->frameboxes = iter;\r
 }\r
 \r
   return set->frameboxes = iter;\r
 }\r
 \r


@@ -332,7 +362,8 @@ void ir_set_assign_data
            }\r
          else\r
            simplex = (struct ir_simplex_t*) simplex->header.nextsib;\r
            }\r
          else\r
            simplex = (struct ir_simplex_t*) simplex->header.nextsib;\r

-       simplex->header.nextsib = setdata;\r
+       setdata->audio.header.nextsib = (union ir_setdata_t*) set->audio;\r
+        set->audio = (struct ir_simplex_t*) setdata;\r

        break;\r
       case LDAT:\r
        setdata->link.header.nextsib = (union ir_setdata_t*) set->links;\r
        break;\r
       case LDAT:\r
        setdata->link.header.nextsib = (union ir_setdata_t*) set->links;\r


@@ -359,26 +390,19 @@ void ir_data_assign_path
 ( union ir_setdata_t* setdata,\r
   uint8_t*            path\r
 )\r
 ( union ir_setdata_t* setdata,\r
   uint8_t*            path\r
 )\r

-{ setdata->header.src_filename = path;\r
-  //TODO: internal strdup, not assign (= path;)\r
+{ if (setdata->header.src_filename != NULL)\r
+    wprintf("Path override: %s -> %s for setdata %s\n"\r
+           setdata->header.src_filename, path, setdata->header.data_name);\r
+  setdata->header.src_filename = name_alloc(path);\r

 }\r
 \r
 }\r
 \r

-\r
-//TODO: Macro ir_framsheet and mapsheet?\r

 union ir_setdata_t* ir_framesheet\r
 ( uint8_t* name,\r
   apc_facing d,\r
   int width,\r
   int height\r
 )\r
 union ir_setdata_t* ir_framesheet\r
 ( uint8_t* name,\r
   apc_facing d,\r
   int width,\r
   int height\r
 )\r

-{ struct ir_framedata_t* framesheet = struct_alloc(ir_framedata_t);\r
-  framesheet->header.type = FSDAT;\r
-  framesheet->header.data_name = name;\r
-  framesheet->frameinfo.facing = d;\r
-  framesheet->frameinfo.w = width;\r
-  framesheet->frameinfo.h = height;\r
-  return (union ir_setdata_t*) framesheet; \r
-}\r
+{ return ir_framedata(FSDAT, name, d, width, height); }\r

 \r
 union ir_setdata_t* ir_mapsheet\r
 ( uint8_t* name,\r
 \r
 union ir_setdata_t* ir_mapsheet\r
 ( uint8_t* name,\r


@@ -386,35 +410,125 @@ union ir_setdata_t* ir_mapsheet
   int width,\r
   int height\r
 )\r
   int width,\r
   int height\r
 )\r

-{ struct ir_framedata_t* mapsheet = struct_alloc(ir_framedata_t);\r
-  mapsheet->header.type = MSDAT;\r
-  mapsheet->header.data_name = name;\r
-  mapsheet->frameinfo.facing = d;\r
-  mapsheet->frameinfo.w = width;\r
-  mapsheet->frameinfo.h = height;\r
-  return (union ir_setdata_t*) mapsheet;\r
+{ return ir_framedata(MSDAT, name, d, width, height); }\r
+\r
+static inline\r
+union ir_setdata_t* ir_framedata\r
+( enum dtype type,\r
+  uint8_t* name,\r
+  apc_facing d,\r
+  int width,\r
+  int height\r
+)\r
+{ struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t);\r
+  framedata->header.type = type;\r
+  framedata->header.data_name = name_alloc(name);\r
+  framedata->frameinfo.facing = d;\r
+  framedata->frameinfo.w = width;\r
+  framedata->frameinfo.h = height;\r
+  return (union ir_setdata_t*) framedata;\r

 }\r
 \r
 union ir_setdata_t* ir_audio\r
 ( uint8_t* name )\r
 { struct ir_simplex_t* audio = struct_alloc(ir_simplex_t);\r
   audio->header.type = ADAT;\r
 }\r
 \r
 union ir_setdata_t* ir_audio\r
 ( uint8_t* name )\r
 { struct ir_simplex_t* audio = struct_alloc(ir_simplex_t);\r
   audio->header.type = ADAT;\r

-  audio->header.data_name = name;\r
+  audio->header.data_name = name_alloc(name);\r

   return (union ir_setdata_t*) audio;\r
 }\r
 \r
   return (union ir_setdata_t*) audio;\r
 }\r
 \r

+\r
+/* Create classld that points to a class */\r
+struct ir_classld_t* ir_classld_from_class\r
+( struct ir_class_t* class )\r
+{ struct ir_classld_t* classld;\r
+  classld = struct_alloc(ir_classld_t);\r
+  classld->root_class = class;\r
+  return classld;\r
+}\r
+\r
+struct ir_setld_t* ir_setld_from_ref\r
+( long long ref )\r
+{ struct ir_setld_t* setld;\r
+  setld = struct_alloc(ir_setld_t);\r
+  setld->ref = ref;\r
+  return setld;\r
+}\r
+\r
+struct ir_setld_t* ir_setld_from_classld\r
+( struct ir_classld_t* classld,\r
+  uint8_t* name\r
+)\r
+{ struct ir_setld_t* setld;\r
+  setld = struct_alloc(ir_setld_t);\r
+  setld->namelist.name = name_alloc(name);\r
+  setld->namelist_head = setld->namelist;\r
+  setld->classld = classld; \r
+  return setld; \r
+}\r
+\r
+struct ir_setld_t* ir_setld_addchild\r
+( ir_setld_t* setld,\r
+  uint8_t* name\r
+)\r
+{ setld->namelist_head->nextsib = struct_alloc(ir_namelist_t);\r
+  setld->namelist_head->nextsib.name = name_alloc(name);\r
+  setld->namelist_head = setld->namelist_head->nextsib;\r
+  return setld;\r
+}\r
+\r
+union ir_setdata_t* ir_link\r
+( enum ltype link_type,\r
+  ir_setld_t* setld,\r
+  uint8_t* name\r
+)\r
+{ struct ir_link_t* link;\r
+  int name_len;\r
+  link = struct_alloc(ir_link_t);\r
+  link->header.type = LDAT;\r
+  link->type = link_type; \r
+  link->classld = setld->classld;\r
+  link->setld = setld;\r
+  if (link_type != ODAT && name != NULL)\r
+    link->header.data_name = name_alloc(name);\r
+  return (union ir_setdata_t*) link;\r
+}\r
+\r
+\r

 static\r
 static\r

-void* stack_alloc(size_t bytes)\r
-{ if (!bytes)\r
-    { wprint("Attempting to allocate 0 bytes in stack_alloc");\r
-      return pagenode_head->head;\r
-    }\r
-  if (PN_HEADSPACE() < bytes) \r
-    { pagenode_head->next = (struct pagenode_t*) calloc(PN_ALLOCSIZE,1);\r
-      pagenode_head = pagenode_head->next;\r
-      pagenode_head->head = pagenode_head->root;\r
+void* stack_alloc\r
+( size_t bytes )\r
+{ if (!bytes) //valid behavior to attain current head\r
+    return datapages.head->header.head;\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
+       eprintf("Memory allocation error \n");\r
+      datapages.head = datapages.head->header.next; \r
+      datapages.head->header.head = datapages.head->root;\r

     }\r
     }\r

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

 }\r
 \r
 }\r
 \r

+static\r
+uint8_t* name_alloc\r
+( uint8_t* name_src )\r
+{ uint8_t* iter, * name;\r
+  int      head_mem;\r
+ copy:\r
+  name = 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 == 0) //not enough room\r
+    { namepages.head->next = (struct pagenode_t*) calloc(namepages.page_size,1);\r
+      if (namepages.head->next == NULL)\r
+       eprintf("Memory allocation error\n");\r
+      namepages.head = namepages.head->next;\r
+      namepages.head->header.head = namepages.head->root;\r
+      goto copy;\r
+    }\r
+  *(namepages.head->header.head)++ = '\0';\r
+  return name;\r
+}\r