X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fir.c;h=0f98698036edec70aaf431099db7a387816e526d;hp=76c221d2d376d164489635b47fec0920c976cd8c;hb=59459f248b674ffefa42bc8f6b0326879953f814;hpb=9aae885b30d1325721b77ad072007af7089d7b69 diff --git a/src/ir.c b/src/ir.c index 76c221d..0f98698 100644 --- a/src/ir.c +++ b/src/ir.c @@ -23,20 +23,46 @@ void ir_quit(void); int ir_linker(void); int ir_condenser(void); /* Private */ +struct pagenode_t; extern //apc.c long sys_pagesize; -static - static inline struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*, uint8_t*); -static inline -void ir_quit_r(struct pagenode_t*); +static +void ir_free_pages(struct pagenode_t*); static inline int bytes_identical(uint8_t*,uint8_t*); - +static +void* stack_alloc(size_t); +/* Memory allocator */ +struct pagenode_t { + struct pagenode_t* next; + char* head; + char root[]; +}* pagenode_root, * pagenode_head; +#define PN_ALLOCSIZE (sys_pagesize) +#define PN_HEADERSIZE() (sizeof(struct pagenode_t*) + sizeof(char*)) +#define PN_MEMSIZE() (PN_ALLOCSIZE - PN_HEADERSIZE()) +#define PN_HEADSIZE() (pagenode_head->head - pagenode_head->root) +#define PN_HEADSPACE() (PN_MEMSIZE() - PN_HEADSIZE()) /* Enumerated types */ enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT }; enum ltype { OLINK, MLINK, VLINK, ALINK }; +/* Set link data */ +struct ir_namelist_t; +struct ir_namelist_t +{ struct ir_namelist_t* nextsib; + uint8_t* name; +}; +struct ir_classld_t +{ struct ir_class_t* root_class; + struct ir_namelist_t* namelist; +}; +struct ir_setld_t +{ struct classld_t* classld; + long long ref; + struct ir_namelist_t* namelist; +}; /* Set data mem */ struct ir_setdata_header_t { enum dtype type; @@ -47,21 +73,21 @@ struct ir_frameinfo_t { int facing, w, h; }; struct ir_framedata_t { struct ir_setdata_header_t header; - struct ir_frameinfo_t frameinfo; -}** framedatas; + struct ir_frameinfo_t frameinfo; +}; struct ir_framebox_t { struct ir_setdata_header_t header; struct ir_framedata_t framesheets[FACING_MAX]; struct ir_framedata_t mapsheets[FACING_MAX]; -}** frameboxes; +}; struct ir_simplex_t -{ struct ir_setdat_header_t header; -}** simplexes; +{ struct ir_setdata_header_t header; }; struct ir_link_t -{ struct ir_setdat_header_t header; - struct ir_set_t* src, * trg; - enum ltype type; -}** links; +{ struct ir_setdata_header_t header; + struct ir_classld_t* classld; + struct ir_setld_t* setld; + enum ltype type; +}; union ir_setdata_t { struct ir_setdata_header_t header; struct ir_framebox_t framebox; @@ -74,16 +100,16 @@ struct ir_class_t { struct ir_class_t* nextchild, * nextsib; struct ir_set_t* root_set; uint8_t* name; -}** classes; +}; struct ir_set_t -{ struct ir_set_t* nextchild, * nextsib; - struct ir_class_t* class; - long long ref; - uint8_t* name; - struct framebox_t* frameboxes; - struct simplex_t* audio; - struct link_t* links; -}** sets; +{ struct ir_set_t* nextchild, * nextsib; + struct ir_class_t* class; + long long ref; + uint8_t* name; + struct ir_framebox_t* frameboxes; + struct ir_simplex_t* audio; + struct ir_link_t* links; +}; /* Function-Like Macros */ #define do_warn() do { \ } while (0) @@ -108,14 +134,13 @@ struct ir_set_t } while (0) #define struct_alloc(_T) ((struct _T*) stack_alloc(sizeof(struct _T))) - static -struct ir_class_t root_class = { .name = "." }; +struct ir_class_t root_class = { .name = (uint8_t*)"." }; /* Init */ int ir_init ( void ) -{ pagenode_root = calloc(struct pagenode_t*) calloc(PN_ALLOCSIZE); +{ pagenode_root = (struct pagenode_t*) calloc((size_t)PN_ALLOCSIZE,1); if (pagenode_root == NULL) return -1; pagenode_root->head = pagenode_root->root; @@ -128,13 +153,13 @@ int ir_init */ void ir_quit ( void ) -{ ir_quit_r(pagenode_root); } +{ ir_free_pages(pagenode_root); } -static inline -void ir_quit_r +static +void ir_free_pages ( struct pagenode_t* pagenode ) { if (pagenode->next != NULL) - ir_quit_r(pagenode->next); + ir_free_pages(pagenode->next); free(pagenode); } @@ -174,7 +199,9 @@ struct ir_class_t* ir_class_addchild { iter = iter->nextsib; goto check; } - return iter->nextsib = struct_alloc(ir_class_t); + iter = struct_alloc(ir_class_t); + iter->nextsib = class->nextchild; + return class->nextchild = iter; } /* Add a set to a class @@ -196,7 +223,9 @@ struct ir_set_t* ir_class_addset { iter = iter->nextsib; goto check; } - return iter->nextsib = struct_alloc(ir_set_t); + iter = struct_alloc(ir_set_t); + iter->nextsib = class->root_set; + return class->root_set = iter; } /* Add a set to a set @@ -218,7 +247,9 @@ struct ir_set_t* ir_set_addchild { iter = iter->nextsib; goto check; } - return iter->nextsib = struct_alloc(ir_set_t); + iter = struct_alloc(ir_set_t); + iter->nextsib = set->nextchild; + return set->nextchild = iter; } /* Add a framebox to a set @@ -235,13 +266,15 @@ struct ir_framebox_t* ir_set_add_framebox return set->frameboxes = struct_alloc(ir_framebox_t); iter = set->frameboxes; check: - if (bytes_identical(iter->header.name, name)) + if (bytes_identical(iter->header.data_name, name)) return iter; if (iter->header.nextsib != NULL) - { iter = iter->header.nextsib; + { iter = (struct ir_framebox_t*) iter->header.nextsib; goto check; } - return iter->header.nextsib = struct_alloc(ir_framebox_t); + iter = struct_alloc(ir_framebox_t); + iter->header.nextsib = (union ir_setdata_t*) set->frameboxes; + return set->frameboxes = iter; } /* Match two null-terminated bytestrings @@ -252,10 +285,12 @@ int bytes_identical ( uint8_t* stra, uint8_t* strb ) -{ while (*stra && *strb) - if (*stra++ != *strb++) - return 0; - return *stra == *strb; +{ int ca, cb; + do { + ca = *stra++; + cb = *strb++; + } while (ca && ca == cb); + return (ca == cb); } /* Assign Setdata to Set @@ -267,47 +302,41 @@ void ir_set_assign_data ) { struct ir_framebox_t* framebox; struct ir_simplex_t* simplex; - struct ir_link_t* link; switch (setdata->header.type) { case FSDAT: - framebox = ir_set_add_framebox(set, setdata->header.name); - if (framebox->framesheets[setdata->framesheet.frameinfo.facing] != NULL) + framebox = ir_set_add_framebox(set, setdata->header.data_name); + if (framebox->framesheets[setdata->framesheet.frameinfo.facing].header.data_name != NULL) wprintf("Duplicate framesheet [%i] %s\n", setdata->framesheet.frameinfo.facing, setdata->header.data_name); framebox->framesheets[setdata->framesheet.frameinfo.facing] = setdata->framesheet; break; case MSDAT: - framebox = ir_set_add_framebox(set, setdata->header.name); - if (framebox->mapsheets[setdata->mapsheet.frameinfo.facing] != NULL) + framebox = ir_set_add_framebox(set, setdata->header.data_name); + if (framebox->mapsheets[setdata->mapsheet.frameinfo.facing].header.data_name != NULL) wprintf("Duplicate mapsheet [%i] %s\n", setdata->mapsheet.frameinfo.facing, setdata->header.data_name); framebox->mapsheets[setdata->mapsheet.frameinfo.facing] = setdata->mapsheet; break; case ADAT: if (set->audio == NULL) - { set->audio = &setdata->audio; + { set->audio = (struct ir_simplex_t*) setdata; return; } simplex = set->audio; - while (simplex->header.nextsib != NULL;) + while (simplex->header.nextsib != NULL) if (bytes_identical(simplex->header.data_name, setdata->header.data_name)) { wprintf("Duplicate audio %s\n", setdata->header.data_name); *simplex = setdata->audio; + //setdata is now a pointer to redundant, unused memory. return; } else - simplex = simplex->header.nextsib; - simplex->header.nextsib = &setdata->audio; + simplex = (struct ir_simplex_t*) simplex->header.nextsib; + simplex->header.nextsib = setdata; break; case LDAT: - if (set->links == NULL) - { set->links = &setdata->link; - return; - } - link = set->links; - while (link->header.nextsib != NULL) - link = link->header.nextsib; - link->header.nextsib = &setdata->link; + setdata->link.header.nextsib = set->links; + set->links = (struct ir_link_t*) setdata; break; default: fprintf(stderr, "Unknown setdata type %x\n", setdata->header.type); @@ -316,12 +345,12 @@ void ir_set_assign_data } void ir_set_assign_ref -( ir_set_t* set, - long long ref +( struct ir_set_t* set, + long long ref ) { if (set->ref != 0) - wprintf("Ref override: 0x%x -> 0x%x for set %s\n", - set->ref, ref, set->name); + wprintf("Ref override: 0x%lx -> 0x%lx for set %s\n", + (long unsigned) set->ref, (long unsigned) ref, set->name); set->ref = ref; //TODO: reflist_add(set); } @@ -330,10 +359,7 @@ void ir_data_assign_path ( union ir_setdata_t* setdata, uint8_t* path ) -{ if (set->header.src_filename) - wprintf("Path override: %s -> %s for set %s\n", - set->header.src_filename, path, set->name); - set->header.src_filename = path; +{ setdata->header.src_filename = path; //TODO: internal strdup, not assign (= path;) } @@ -346,7 +372,7 @@ union ir_setdata_t* ir_framesheet int height ) { struct ir_framedata_t* framesheet = struct_alloc(ir_framedata_t); - framesheet->header->type = FSDAT; + framesheet->header.type = FSDAT; framesheet->header.data_name = name; framesheet->frameinfo.facing = d; framesheet->frameinfo.w = width; @@ -358,7 +384,7 @@ union ir_setdata_t* ir_mapsheet ( uint8_t* name, apc_facing d, int width, - int height, + int height ) { struct ir_framedata_t* mapsheet = struct_alloc(ir_framedata_t); mapsheet->header.type = MSDAT; @@ -377,19 +403,6 @@ union ir_setdata_t* ir_audio return (union ir_setdata_t*) audio; } - -#define PN_ALLOCSIZE (sys_pagesize) -#define PN_HEADERSIZE() (sizeof(struct pagenode_t*) + sizeof(void*)) -#define PN_MEMSIZE() (PN_ALLOCSIZE - PN_HEADERSIZE()) -#define PN_HEADSIZE() (pagenode_head->head - pagenode_head->root) -#define PN_HEADSPACE() (PN_MEMSIZE() - PN_HEADSIZE()) -struct pagenode_t { - struct pagenode_t* next; - char* head; - char root[]; -}* pagenode_root, * pagenode_head; - - static void* stack_alloc(size_t bytes) { if (!bytes) @@ -397,7 +410,7 @@ void* stack_alloc(size_t bytes) return pagenode_head->head; } if (PN_HEADSPACE() < bytes) - { pagenode_head->next = (struct pagenode_t*) calloc(PN_ALLOCSIZE); + { pagenode_head->next = (struct pagenode_t*) calloc(PN_ALLOCSIZE,1); pagenode_head = pagenode_head->next; pagenode_head->head = pagenode_head->root; }