fixes

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

diff --git a/src/ir.c b/src/ir.c
index 76c221d..4255f22 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -25,15 +25,26 @@ int      ir_condenser(void);
 /* Private */\r
 extern //apc.c\r
 long sys_pagesize;\r
-static\r
-\r
 static inline\r
 struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*, uint8_t*);\r
-static inline\r
-void                  ir_quit_r(struct pagenode_t*);\r
+static\r
+void                  ir_free_pages(struct pagenode_t*);\r
 static inline\r
 int                   bytes_identical(uint8_t*,uint8_t*);\r
-\r
+static\r
+void*                 stack_alloc(size_t);\r
+/* Memory allocator */\r
+struct pagenode_t;\r
+struct pagenode_t {\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
 enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };\r
 enum ltype { OLINK, MLINK, VLINK, ALINK };\r
@@ -48,20 +59,19 @@ struct ir_frameinfo_t
 struct ir_framedata_t\r
 { struct ir_setdata_header_t header;\r
   struct ir_frameinfo_t     frameinfo;\r
-}** framedatas;\r
+};\r
 struct ir_framebox_t\r
 { struct ir_setdata_header_t header;\r
   struct ir_framedata_t      framesheets[FACING_MAX];\r
   struct ir_framedata_t      mapsheets[FACING_MAX];\r
-}** frameboxes;\r
+};\r
 struct ir_simplex_t\r
-{ struct ir_setdat_header_t header;\r
-}** simplexes;\r
+{ struct ir_setdata_header_t header; };\r
 struct ir_link_t\r
-{ struct ir_setdat_header_t header;\r
-  struct ir_set_t*          src, * trg;\r
-  enum ltype                type;\r
-}** links;\r
+{ struct ir_setdata_header_t header;\r
+  struct ir_set_t*           src, * trg;\r
+  enum ltype                 type;\r
+};\r
 union ir_setdata_t\r
 { struct ir_setdata_header_t  header;\r
   struct ir_framebox_t        framebox;\r
@@ -74,7 +84,7 @@ struct ir_class_t
 { struct ir_class_t* nextchild, * nextsib;\r
   struct ir_set_t*   root_set;\r
   uint8_t*           name;\r
-}** classes;\r
+};\r
 struct ir_set_t\r
 { struct ir_set_t*    nextchild, * nextsib;\r
   struct ir_class_t*  class;\r
@@ -83,7 +93,7 @@ struct ir_set_t
   struct framebox_t*  frameboxes;\r
   struct simplex_t*   audio;\r
   struct link_t*      links;\r
-}** sets;\r
+};\r
 /* Function-Like Macros */\r
 #define do_warn() do {                         \\r
   } while (0)\r
@@ -108,14 +118,13 @@ struct ir_set_t
   } while (0)\r
 #define struct_alloc(_T) ((struct _T*) stack_alloc(sizeof(struct _T)))\r
 \r
-\r
 static\r
-struct ir_class_t root_class = { .name = "." };\r
+struct ir_class_t root_class = { .name = (uint8_t*)"." };\r
 \r
 /* Init */\r
 int ir_init\r
 ( void )\r
-{ pagenode_root = calloc(struct pagenode_t*) calloc(PN_ALLOCSIZE);\r
+{ pagenode_root = (struct pagenode_t*) calloc(PN_ALLOCSIZE);\r
   if (pagenode_root == NULL)\r
     return -1;\r
   pagenode_root->head = pagenode_root->root;\r
@@ -128,13 +137,13 @@ int ir_init
 */\r
 void ir_quit\r
 ( void )\r
-{ ir_quit_r(pagenode_root); }\r
+{ ir_free_pages(pagenode_root); }\r
 \r
-static inline\r
-void ir_quit_r\r
+static\r
+void ir_free_pages\r
 ( struct pagenode_t* pagenode )\r
 { if (pagenode->next != NULL)\r
-    ir_quit_r(pagenode->next);\r
+    ir_free_pages(pagenode->next);\r
   free(pagenode);\r
 }\r
 \r
@@ -377,19 +386,6 @@ union ir_setdata_t* ir_audio
   return (union ir_setdata_t*) audio;\r
 }\r
 \r
-\r
-#define PN_ALLOCSIZE    (sys_pagesize)\r
-#define PN_HEADERSIZE() (sizeof(struct pagenode_t*) + sizeof(void*))\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
-struct pagenode_t {\r
-  struct pagenode_t* next;\r
-  char*              head;\r
-  char               root[];\r
-}* pagenode_root, * pagenode_head;\r
-\r
-\r
 static\r
 void* stack_alloc(size_t bytes)\r
 { if (!bytes)\r