fixes

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

diff --git a/src/ir.c b/src/ir.c
index 593bae1..0f98698 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -48,6 +48,21 @@ struct pagenode_t {
 /* Enumerated types */\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
+  uint8_t*              name;\r
+};\r
+struct ir_classld_t\r
+{ struct ir_class_t*    root_class;\r
+  struct ir_namelist_t* namelist;\r
+};\r
+struct ir_setld_t\r
+{ struct classld_t*     classld;\r
+  long long             ref;\r
+  struct ir_namelist_t* namelist;\r
+};\r
 /* Set data mem */\r
 struct ir_setdata_header_t\r
 { enum dtype          type;\r
@@ -69,7 +84,8 @@ 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_set_t*           src, * trg;\r
+  struct ir_classld_t*       classld;\r
+  struct ir_setld_t*         setld;\r
   enum ltype                 type;\r
 };\r
 union ir_setdata_t\r
@@ -183,7 +199,9 @@ struct ir_class_t* ir_class_addchild
     { iter = iter->nextsib;\r
       goto check;\r
     }\r
-  return iter->nextsib = struct_alloc(ir_class_t);\r
+  iter = struct_alloc(ir_class_t);\r
+  iter->nextsib = class->nextchild;\r
+  return class->nextchild = iter;\r
 }\r
 \r
 /* Add a set to a class\r
@@ -205,7 +223,9 @@ struct ir_set_t* ir_class_addset
     { iter = iter->nextsib;\r
       goto check;\r
     }\r
-  return iter->nextsib = struct_alloc(ir_set_t);\r
+  iter = struct_alloc(ir_set_t);\r
+  iter->nextsib = class->root_set;\r
+  return class->root_set = iter;\r
 }\r
 \r
 /* Add a set to a set\r
@@ -227,7 +247,9 @@ struct ir_set_t* ir_set_addchild
     { iter = iter->nextsib;\r
       goto check;\r
     }\r
-  return iter->nextsib = struct_alloc(ir_set_t);\r
+  iter = struct_alloc(ir_set_t);\r
+  iter->nextsib = set->nextchild;\r
+  return set->nextchild = iter;\r
 }\r
 \r
 /* Add a framebox to a set\r
@@ -247,10 +269,12 @@ struct ir_framebox_t* ir_set_add_framebox
   if (bytes_identical(iter->header.data_name, name))\r
     return iter;\r
   if (iter->header.nextsib != NULL)\r
-    { iter = iter->header.nextsib;\r
+    { iter = (struct ir_framebox_t*) iter->header.nextsib;\r
       goto check;\r
     }\r
-  return iter->header.nextsib = struct_alloc(ir_framebox_t);\r
+  iter = struct_alloc(ir_framebox_t);\r
+  iter->header.nextsib = (union ir_setdata_t*) set->frameboxes;\r
+  return set->frameboxes = iter;\r
 }\r
 \r
 /* Match two null-terminated bytestrings\r
@@ -261,10 +285,12 @@ int bytes_identical
 ( uint8_t* stra,\r
   uint8_t* strb\r
 )\r
-{ while (*stra && *strb)\r
-    if (*stra++ != *strb++)\r
-      return 0;\r
-  return *stra == *strb;\r
+{ int ca, cb;\r
+  do {\r
+    ca = *stra++;\r
+    cb = *strb++;\r
+  } while (ca && ca == cb);\r
+  return (ca == cb);\r
 }\r
 \r
 /* Assign Setdata to Set\r
@@ -276,7 +302,6 @@ void ir_set_assign_data
 )\r
 { struct ir_framebox_t* framebox;\r
   struct ir_simplex_t*  simplex;\r
-  struct ir_link_t*     link;\r
   switch (setdata->header.type)\r
     { case FSDAT:\r
        framebox = ir_set_add_framebox(set, setdata->header.data_name);\r
@@ -294,30 +319,24 @@ void ir_set_assign_data
        break;\r
       case ADAT:\r
        if (set->audio == NULL)\r
-         { set->audio = setdata->audio;\r
+         { set->audio = (struct ir_simplex_t*) setdata;\r
            return;\r
          }\r
        simplex = set->audio;\r
        while (simplex->header.nextsib != NULL)\r
          if (bytes_identical(simplex->header.data_name, setdata->header.data_name))\r
            { wprintf("Duplicate audio %s\n", setdata->header.data_name);\r
-             *simplex = *setdata->audio;\r
-             //setdata->audio is now a pointer to redundant, unused memory.\r
+             *simplex = setdata->audio;\r
+             //setdata is now a pointer to redundant, unused memory.\r
              return;\r
            }\r
          else\r
-           simplex = simplex->header.nextsib;\r
-       simplex->header.nextsib = setdata->audio;\r
+           simplex = (struct ir_simplex_t*) simplex->header.nextsib;\r
+       simplex->header.nextsib = setdata;\r
        break;\r
       case LDAT:\r
-       if (set->links == NULL)\r
-         { set->links = setdata->link;\r
-           return;\r
-         }\r
-       link = set->links;\r
-       while (link->header.nextsib != NULL)\r
-         link = link->header.nextsib;\r
-       link->header.nextsib = setdata->link;\r
+       setdata->link.header.nextsib = set->links;\r
+       set->links = (struct ir_link_t*) setdata;\r
        break;\r
       default:\r
        fprintf(stderr, "Unknown setdata type %x\n", setdata->header.type);\r
@@ -326,12 +345,12 @@ void ir_set_assign_data
 }\r
 \r
 void ir_set_assign_ref\r
-( ir_set_t* set,\r
-  long long ref\r
+( struct ir_set_t* set,\r
+  long long        ref\r
 )\r
 { if (set->ref != 0)\r
-    wprintf("Ref override: 0x%x -> 0x%x for set %s\n",\r
-           set->ref, ref, set->name);\r
+    wprintf("Ref override: 0x%lx -> 0x%lx for set %s\n",\r
+           (long unsigned) set->ref, (long unsigned) ref, set->name);\r
   set->ref = ref;\r
   //TODO: reflist_add(set);\r
 }\r
@@ -340,10 +359,7 @@ void ir_data_assign_path
 ( union ir_setdata_t* setdata,\r
   uint8_t*            path\r
 )\r
-{ if (setdata->header.src_filename)\r
-    wprintf("Path override: %s -> %s for set %s\n",\r
-           setdata->header.src_filename, path, setdata->name);\r
-  setdata->header.src_filename = path;\r
+{ setdata->header.src_filename = path;\r
   //TODO: internal strdup, not assign (= path;)\r
 }\r
 \r