int ir_linker(void);\r
int ir_condenser(void);\r
/* Private */\r
+struct pagenode_t;\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* 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
{ int facing, w, h; };\r
struct ir_framedata_t\r
{ struct ir_setdata_header_t header;\r
- struct ir_frameinfo_t frameinfo;\r
-}** framedatas;\r
+ struct ir_frameinfo_t frameinfo;\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
{ 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
- long long ref;\r
- uint8_t* name;\r
- struct framebox_t* frameboxes;\r
- struct simplex_t* audio;\r
- struct link_t* links;\r
-}** sets;\r
+{ struct ir_set_t* nextchild, * nextsib;\r
+ struct ir_class_t* class;\r
+ long long ref;\r
+ uint8_t* name;\r
+ struct ir_framebox_t* frameboxes;\r
+ struct ir_simplex_t* audio;\r
+ struct ir_link_t* links;\r
+};\r
/* Function-Like Macros */\r
#define do_warn() do { \\r
} while (0)\r
} 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((size_t)PN_ALLOCSIZE,1);\r
if (pagenode_root == NULL)\r
return -1;\r
pagenode_root->head = pagenode_root->root;\r
*/\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
return set->frameboxes = struct_alloc(ir_framebox_t);\r
iter = set->frameboxes;\r
check:\r
- if (bytes_identical(iter->header.name, name))\r
+ 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->header.nextsib = (union ir_setdata_t*) struct_alloc(ir_framebox_t);\r
+ return (struct ir_framebox_t*) iter->header.nextsib;\r
}\r
\r
/* Match two null-terminated bytestrings\r
struct ir_link_t* link;\r
switch (setdata->header.type)\r
{ case FSDAT:\r
- framebox = ir_set_add_framebox(set, setdata->header.name);\r
- if (framebox->framesheets[setdata->framesheet.frameinfo.facing] != NULL)\r
+ framebox = ir_set_add_framebox(set, setdata->header.data_name);\r
+ if (framebox->framesheets[setdata->framesheet.frameinfo.facing].header.data_name != NULL)\r
wprintf("Duplicate framesheet [%i] %s\n",\r
setdata->framesheet.frameinfo.facing, setdata->header.data_name);\r
framebox->framesheets[setdata->framesheet.frameinfo.facing] = setdata->framesheet;\r
break;\r
case MSDAT:\r
- framebox = ir_set_add_framebox(set, setdata->header.name);\r
- if (framebox->mapsheets[setdata->mapsheet.frameinfo.facing] != NULL)\r
+ framebox = ir_set_add_framebox(set, setdata->header.data_name);\r
+ if (framebox->mapsheets[setdata->mapsheet.frameinfo.facing].header.data_name != NULL)\r
wprintf("Duplicate mapsheet [%i] %s\n",\r
setdata->mapsheet.frameinfo.facing, setdata->header.data_name);\r
framebox->mapsheets[setdata->mapsheet.frameinfo.facing] = setdata->mapsheet;\r
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
+ 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
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
+ { set->links = (struct ir_link_t*) setdata;\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
+ link = (struct ir_link_t*) link->header.nextsib;\r
+ link->header.nextsib = setdata;\r
break;\r
default:\r
fprintf(stderr, "Unknown setdata type %x\n", setdata->header.type);\r
}\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
( union ir_setdata_t* setdata,\r
uint8_t* path\r
)\r
-{ if (set->header.src_filename)\r
- wprintf("Path override: %s -> %s for set %s\n",\r
- set->header.src_filename, path, set->name);\r
- set->header.src_filename = path;\r
+{ setdata->header.src_filename = path;\r
//TODO: internal strdup, not assign (= path;)\r
}\r
\r
int height\r
)\r
{ struct ir_framedata_t* framesheet = struct_alloc(ir_framedata_t);\r
- framesheet->header->type = FSDAT;\r
+ framesheet->header.type = FSDAT;\r
framesheet->header.data_name = name;\r
framesheet->frameinfo.facing = d;\r
framesheet->frameinfo.w = width;\r
( uint8_t* name,\r
apc_facing d,\r
int width,\r
- int height,\r
+ int height\r
)\r
{ struct ir_framedata_t* mapsheet = struct_alloc(ir_framedata_t);\r
mapsheet->header.type = MSDAT;\r
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
return pagenode_head->head;\r
}\r
if (PN_HEADSPACE() < bytes) \r
- { pagenode_head->next = (struct pagenode_t*) calloc(PN_ALLOCSIZE);\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
}\r
projects / henge / apc.git / blobdiff