#include <stdarg.h> //va_args\r
#include <stdint.h> //uint64_t\r
#include <string.h> //memset, str*\r
+#include <errno.h>\r
/* Unicode */\r
#include <unistd.h> //u8_* functions\r
#include <unitypes.h> //uint8_t as a char\r
#include <unistr.h> //u32_cpy\r
+#include <unistdio.h> //ulc_fprintf\r
/* Local */\r
+#include "print.h"\r
#include "apc.h"\r
#include "ir.h"\r
+#include "pagenode.h"\r
+#undef do_error\r
+#define do_error(...) exit(-1)\r
+#define XXH_PRIVATE_API\r
+#include "../xxHash/xxhash.h"\r
/* Public */\r
int ir_init(void);\r
void ir_quit(void);\r
+void ir_test(void);\r
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 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_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
/* Set data mem */\r
+enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };\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, * namelist_head;\r
+};\r
+struct ir_setld_t\r
+{ struct ir_classld_t* classld;\r
+ uint32_t ref;\r
+ struct ir_namelist_t* namelist, * namelist_head;\r
+};\r
struct ir_setdata_header_t\r
{ enum dtype type;\r
uint8_t* src_filename, * data_name;\r
union ir_setdata_t* nextsib;\r
+ long filepos;\r
};\r
-struct ir_frameinfo_t\r
-{ int facing, w, h; };\r
struct ir_framedata_t\r
{ struct ir_setdata_header_t header;\r
struct ir_frameinfo_t frameinfo;\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_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
{ struct ir_class_t* nextchild, * nextsib;\r
struct ir_set_t* root_set;\r
uint8_t* name;\r
+ long filepos;\r
};\r
struct ir_set_t\r
{ struct ir_set_t* nextchild, * nextsib;\r
- struct ir_class_t* class;\r
- long long ref;\r
+ uint32_t ref;\r
uint8_t* name;\r
struct ir_framebox_t* frameboxes;\r
struct ir_simplex_t* audio;\r
struct ir_link_t* links;\r
+ long filepos;\r
};\r
-/* Function-Like Macros */\r
-#define do_warn() do { \\r
- } while (0)\r
-#define wprint(str) do { \\r
- fprintf(stderr, str); \\r
- do_warn(); \\r
- } while (0)\r
- #define wprintf(fmt,...) do { \\r
- fprintf(stderr, fmt, __VA_ARGS__); \\r
- do_warn(); \\r
- } while (0)\r
-#define do_error() do { \\r
- exit(-1); \\r
- } while (0)\r
-#define eprint(str) do { \\r
- fprintf(stderr, str); \\r
- do_error(); \\r
- } while (0)\r
-#define eprintf(fmt,...) do { \\r
- fprintf(stderr, fmt, __VA_ARGS__); \\r
- do_error(); \\r
- } while (0)\r
-#define struct_alloc(_T) ((struct _T*) stack_alloc(sizeof(struct _T)))\r
-\r
+/* Functions */\r
+static inline\r
+struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,uint8_t*);\r
+static inline\r
+union ir_setdata_t* ir_framedata (enum dtype,const uint8_t*,apc_facing,int,int);\r
+static inline\r
+int bytes_identical(const uint8_t*,const uint8_t*);\r
+static inline\r
+int classnames_identical(const uint8_t*,const uint8_t*);\r
+static\r
+uint8_t* name_alloc(const uint8_t*);\r
+static\r
+uint8_t* classname_alloc(const uint8_t*);\r
+#define struct_clear(_S) (memset((_S), 0, sizeof(*(_S))))\r
+#define REFHASH(ref) (XXH32(&ref, sizeof(uint32_t), 0xCEED) & 0xCFF)\r
+#define struct_alloc(_T) ((struct _T*) stack_alloc(&datapages, sizeof(struct _T)))\r
+extern //apc.c\r
+long sys_pagesize;\r
+static\r
+struct pagelist_t datapages, namepages, refhashpages;\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
- return -1;\r
- pagenode_root->head = pagenode_root->root;\r
- pagenode_head = pagenode_root;\r
+{ pagelist_init(datapages, (size_t)SYS_PAGESIZE);\r
+ pagelist_init(namepages, (size_t)NAME_PAGESIZE);\r
+ pagelist_init(refhashpages, (size_t)SYS_PAGESIZE);\r
+\r
return 0;\r
-} \r
+}\r
\r
-/* Quit/Cleanup\r
- Recursively clean pagenode linked list\r
-*/\r
+/* Quit/Cleanup */\r
void ir_quit\r
( void )\r
-{ ir_free_pages(pagenode_root); }\r
+{ pagenode_free(datapages.root);\r
+ pagenode_free(namepages.root);\r
+ pagenode_free(refhashpages.root);\r
\r
-static\r
-void ir_free_pages\r
-( struct pagenode_t* pagenode )\r
-{ if (pagenode->next != NULL)\r
- ir_free_pages(pagenode->next);\r
- free(pagenode);\r
}\r
\r
-/* Link\r
-*/\r
+/* Link */\r
int ir_linker\r
( void )\r
-{ return 0; }\r
+{ \r
+ return 0;\r
+}\r
\r
-/* Condense\r
-*/\r
+/* Condense */\r
int ir_condenser\r
( void )\r
{ return 0; }\r
\r
+/* Return the class's name string */\r
+uint8_t* ir_class_name\r
+( struct ir_class_t* class )\r
+{ return class->name; }\r
+\r
/* Return a pointer to the root class */\r
struct ir_class_t* ir_class_root\r
( void )\r
*/\r
struct ir_class_t* ir_class_addchild\r
( struct ir_class_t* class,\r
- uint8_t* name\r
+ const uint8_t* name\r
)\r
{ struct ir_class_t* iter;\r
if (class->nextchild == NULL)\r
- return class->nextchild = struct_alloc(ir_class_t);\r
+ { class->nextchild = struct_alloc(ir_class_t);\r
+ struct_clear(class->nextchild);\r
+ class->nextchild->name = classname_alloc(name);\r
+ return class->nextchild;\r
+ }\r
iter = class->nextchild;\r
+ if (iter->name == NULL)\r
+ eprintf("Null name pointer in class %p\n", iter);\r
+ if (name == NULL)\r
+ eprintf("Null child added to class %s\n", iter->name);\r
check:\r
- if (bytes_identical(iter->name, name))\r
+ if (classnames_identical(iter->name, name))\r
return iter;\r
if (iter->nextsib != NULL)\r
{ iter = iter->nextsib;\r
goto check;\r
}\r
- return iter->nextsib = struct_alloc(ir_class_t);\r
+ iter->nextsib = struct_alloc(ir_class_t);\r
+ struct_clear(iter->nextsib);\r
+ iter->nextsib->name = classname_alloc(name);\r
+ return iter->nextsib;\r
}\r
\r
/* Add a set to a class\r
*/\r
struct ir_set_t* ir_class_addset\r
( struct ir_class_t* class,\r
- uint8_t* name\r
+ const uint8_t* name\r
)\r
{ struct ir_set_t* iter;\r
if (class->root_set == NULL)\r
- return class->root_set = struct_alloc(ir_set_t);\r
+ { class->root_set = struct_alloc(ir_set_t);\r
+ struct_clear(class->root_set);\r
+ class->root_set->name = name_alloc(name);\r
+ return class->root_set;\r
+ }\r
iter = class->root_set;\r
+ if (iter->name == NULL)\r
+ eprintf("Null name pointer in class %p\n", iter);\r
+ if (name == NULL)\r
+ eprintf("Null set added to class %U\n", iter->name);\r
check:\r
if (bytes_identical(iter->name, name))\r
return iter;\r
{ iter = iter->nextsib;\r
goto check;\r
}\r
- return iter->nextsib = struct_alloc(ir_set_t);\r
+ iter->nextsib = struct_alloc(ir_set_t);\r
+ struct_clear(iter->nextsib);\r
+ iter->nextsib->name = name_alloc(name);\r
+ return iter->nextsib;\r
+}\r
+\r
+/* Get the root set of the class */\r
+struct ir_set_t* ir_class_rootset\r
+( struct ir_class_t* class )\r
+{ return class->root_set; }\r
+\r
+struct ir_set_t* ir_set_from_ref\r
+( uint32_t ref )\r
+{ uint16_t hash;\r
+ struct ir_set_t** iters;\r
+ struct pagenode_t* iterp;\r
+ iterp = refhashpages.root;\r
+ hash = REFHASH(ref);\r
+ do\r
+ iters = ((struct ir_set_t**) iterp->root) + hash;\r
+ while (*iters != NULL && (*iters)->ref != ref && (iterp = iterp->header.next) != NULL);\r
+ return *iters;\r
}\r
\r
+\r
/* Add a set to a set\r
Attempts to create a new subset of the specified set, returning the\r
child if it already exists\r
*/\r
struct ir_set_t* ir_set_addchild\r
( struct ir_set_t* set,\r
- uint8_t* name\r
+ const uint8_t* name\r
)\r
{ struct ir_set_t* iter;\r
if (set->nextchild == NULL)\r
- return set->nextchild = struct_alloc(ir_set_t);\r
+ { set->nextchild = struct_alloc(ir_set_t);\r
+ struct_clear(set->nextchild);\r
+ set->nextchild->name = name_alloc(name);\r
+ return set->nextchild;\r
+ }\r
iter = set->nextchild;\r
+ if (name == NULL)\r
+ eprintf("Null child added to set %s\n", iter->name);\r
+ if (iter->name == NULL)\r
+ eprintf("Null name pointer in set %p\n", iter);\r
check:\r
if (bytes_identical(iter->name, name))\r
return iter;\r
{ iter = iter->nextsib;\r
goto check;\r
}\r
- return iter->nextsib = struct_alloc(ir_set_t);\r
+ iter->nextsib = struct_alloc(ir_set_t);\r
+ struct_clear(iter->nextsib);\r
+ iter->nextsib->name = name_alloc(name);\r
+ return iter->nextsib;\r
}\r
\r
/* Add a framebox to a set\r
Attempts to create a new framebox of the specified set, returning\r
the framebox if it already exists\r
+ Name is not allocated, but assigned, unlike other "XXX_add" functions where\r
+ name is duplicated into IR's internal array.\r
*/\r
static inline\r
struct ir_framebox_t* ir_set_add_framebox\r
)\r
{ struct ir_framebox_t* iter;\r
if (set->frameboxes == NULL)\r
- return set->frameboxes = struct_alloc(ir_framebox_t);\r
+ { set->frameboxes = struct_alloc(ir_framebox_t);\r
+ struct_clear(set->frameboxes);\r
+ set->frameboxes->header.data_name = name;\r
+ return set->frameboxes;\r
+ }\r
iter = set->frameboxes;\r
check:\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
iter->header.nextsib = (union ir_setdata_t*) struct_alloc(ir_framebox_t);\r
- return iter->header.nextsib;\r
+ struct_clear(iter->header.nextsib);\r
+ iter->header.nextsib->header.data_name = name;\r
+ return (struct ir_framebox_t*) (iter->header.nextsib);\r
}\r
\r
/* Match two null-terminated bytestrings\r
*/\r
static inline\r
int bytes_identical\r
-( uint8_t* stra,\r
- uint8_t* strb\r
+( const uint8_t* stra,\r
+ const uint8_t* strb\r
+)\r
+{ int ca, cb;\r
+ do {\r
+ ca = *stra++;\r
+ cb = *strb++;\r
+ } while (ca && ca != '_' && ca == cb);\r
+ return (ca == cb);\r
+}\r
+\r
+static inline\r
+int classnames_identical\r
+( const uint8_t* stra,\r
+ const 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
+/* Return the name of the set */\r
+uint8_t* ir_set_name\r
+( struct ir_set_t* set)\r
+{ return set->name; }\r
+\r
+/* Return the next sib of the class */\r
+struct ir_class_t* ir_class_nextsib\r
+( struct ir_class_t* class )\r
+{ return class->nextsib; }\r
+\r
+/* Return the next sib of the class */\r
+struct ir_class_t* ir_class_nextchild\r
+( struct ir_class_t* class )\r
+{ return class->nextchild; }\r
+\r
+/* Get the file position of the class */\r
+long ir_class_fpos\r
+( struct ir_class_t* class )\r
+{ return class->filepos; }\r
\r
- */\r
+/* Set the file position of the class */\r
+void ir_class_assign_fpos\r
+( struct ir_class_t* class,\r
+ long newpos\r
+)\r
+{ class->filepos = newpos; }\r
+\r
+/* Get the next sibling of the provided set */\r
+struct ir_set_t* ir_set_nextsib\r
+( struct ir_set_t* set )\r
+{ return set->nextsib; }\r
+\r
+/* Get the next child of the provided set */\r
+struct ir_set_t* ir_set_nextchild\r
+( struct ir_set_t* set )\r
+{ return set->nextchild; }\r
+\r
+/* Get the file position of the class */\r
+long ir_set_fpos\r
+( struct ir_set_t* set )\r
+{ return set->filepos; }\r
+\r
+/* Set the file position of the class */\r
+void ir_set_assign_fpos\r
+( struct ir_set_t* set,\r
+ long newpos\r
+)\r
+{ set->filepos = newpos; }\r
+\r
+/* Assign Setdata to Set */\r
void ir_set_assign_data\r
( struct ir_set_t* set,\r
union ir_setdata_t* setdata\r
)\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
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
+ //setdata is now a pointer to redundant, unused memory.\r
return;\r
}\r
else\r
- simplex = simplex->header.nextsib->audio;\r
- simplex->header.nextsib = setdata;\r
+ simplex = (struct ir_simplex_t*) simplex->header.nextsib;\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
- if (set->links == NULL)\r
- { set->links = setdata;\r
- return;\r
- }\r
- link = set->links;\r
- while (link->header.nextsib != NULL)\r
- link = link->header.nextsib.link;\r
- link->header.nextsib = setdata;\r
+ setdata->link.header.nextsib = (union ir_setdata_t*) 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
\r
void ir_set_assign_ref\r
( struct ir_set_t* set,\r
- long long ref\r
+ uint32_t ref\r
)\r
-{ if (set->ref != 0)\r
- wprintf("Ref override: 0x%lx -> 0x%lx for set %s\n",\r
- set->ref, ref, set->name);\r
+{ uint16_t hash, oldhash;\r
+ struct ir_set_t** iters;\r
+ struct pagenode_t* iterp;\r
+ uint32_t oldref;\r
+ oldref = set->ref;\r
+ oldhash = 0;\r
+ hash = REFHASH(ref);\r
+ iterp = refhashpages.root;\r
+ check_depth:\r
+ iters = ((struct ir_set_t**) iterp->root) + hash;\r
+ if (*iters == NULL || *iters == set)\r
+ *iters = set;\r
+ else\r
+ { if (iterp->header.next == NULL)\r
+ pagelist_alloc(refhashpages);\r
+ iterp = iterp->header.next;\r
+ goto check_depth;\r
+ }\r
+ if (oldref != 0)\r
+ { wprintf("Ref override: 0x%x -> 0x%x for set %s\n", oldref, ref, set->name);\r
+ if (oldhash != 0)\r
+ *iters = NULL;\r
+ else\r
+ { oldhash = hash;\r
+ hash = REFHASH(oldref);\r
+ goto check_depth;\r
+ }\r
+ }\r
set->ref = ref;\r
- //TODO: reflist_add(set);\r
}\r
\r
void ir_data_assign_path\r
( union ir_setdata_t* setdata,\r
- uint8_t* path\r
+ const uint8_t* path\r
)\r
-{ setdata->header.src_filename = path;\r
- //TODO: internal strdup, not assign (= path;)\r
+{ if (path == NULL)\r
+ eprintf("Null path in data %s\n", setdata->header.data_name);\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
-//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
+( const 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
- apc_facing d,\r
- int width,\r
- int height\r
+( const uint8_t* name,\r
+ apc_facing d,\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
+ const 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
+ struct_clear(framedata);\r
+ if (name == NULL)\r
+ eprintf("Null name in set allocation\n");\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
+( const uint8_t* name )\r
{ struct ir_simplex_t* audio = struct_alloc(ir_simplex_t);\r
+ struct_clear(audio);\r
+ if (name == NULL)\r
+ eprintf("Null audio\n");\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
+\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
+ if (class == NULL)\r
+ eprintf("Null class in classld\n");\r
+ classld = struct_alloc(ir_classld_t);\r
+ struct_clear(classld);\r
+ classld->root_class = class;\r
+ return classld;\r
+}\r
+\r
+struct ir_setld_t* ir_setld_from_ref\r
+( uint32_t ref )\r
+{ struct ir_setld_t* setld;\r
+ setld = struct_alloc(ir_setld_t);\r
+ struct_clear(setld);\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
+ const uint8_t* name\r
+)\r
+{ struct ir_setld_t* setld;\r
+ setld = struct_alloc(ir_setld_t);\r
+ struct_clear(setld);\r
+ setld->namelist = struct_alloc(ir_namelist_t);\r
+ struct_clear(setld->namelist);\r
+ setld->namelist_head = setld->namelist;\r
+ setld->namelist_head->name = name_alloc(name);\r
+ setld->classld = classld;\r
+ return setld; \r
+}\r
+\r
+struct ir_setld_t* ir_setld_addchild\r
+( struct ir_setld_t* setld,\r
+ const uint8_t* name\r
+)\r
+{ if (setld->namelist == NULL)\r
+ { setld->namelist = struct_alloc(ir_namelist_t);\r
+ struct_clear(setld->namelist);\r
+ setld->namelist_head = setld->namelist;\r
+ }\r
+ else\r
+ { setld->namelist_head->nextsib = struct_alloc(ir_namelist_t);\r
+ struct_clear(setld->namelist_head->nextsib);\r
+ setld->namelist_head = setld->namelist_head->nextsib;\r
+ }\r
+ setld->namelist_head->name = name_alloc(name);\r
+ return setld;\r
+}\r
+\r
+union ir_setdata_t* ir_link\r
+( enum ltype link_type,\r
+ struct ir_setld_t* setld,\r
+ const uint8_t* name\r
+)\r
+{ struct ir_link_t* link;\r
+ link = struct_alloc(ir_link_t);\r
+ struct_clear(link);\r
+ link->header.type = LDAT;\r
+ link->type = link_type; \r
+ link->classld = setld->classld;\r
+ link->setld = setld;\r
+ if (link_type != OLINK && name != NULL)\r
+ link->header.data_name = name_alloc(name);\r
+ return (union ir_setdata_t*) link;\r
+}\r
+\r
+/* Return a set's root framebox */\r
+union ir_setdata_t* ir_set_framebox\r
+( struct ir_set_t* set )\r
+{ return (union ir_setdata_t*) set->frameboxes; }\r
+\r
+/* Return a set's root audio data */\r
+union ir_setdata_t* ir_set_audio\r
+( struct ir_set_t* set )\r
+{ return (union ir_setdata_t*) set->audio; }\r
+\r
+/* Return a set's root link data */\r
+union ir_setdata_t* ir_set_link\r
+( struct ir_set_t* set )\r
+{ return (union ir_setdata_t*) set->links; }\r
+\r
+/* Return the link type */\r
+enum ltype ir_linkdata_type\r
+( union ir_setdata_t* linkdata )\r
+{ if (linkdata->header.type != LDAT)\r
+ eprintf("Data %s is not a link\n", linkdata->header.data_name);\r
+ return linkdata->link.type;\r
+}\r
+\r
+/* Return the link type */\r
+uint32_t ir_linkdata_ref\r
+( union ir_setdata_t* linkdata )\r
+{ if (linkdata->header.type != LDAT)\r
+ eprintf("Data %s is not a link\n", linkdata->header.data_name);\r
+ return linkdata->link.setld->ref;\r
+}\r
+\r
+/* Get a setdata's next sibling */\r
+union ir_setdata_t* ir_setdata_nextsib\r
+( union ir_setdata_t* setdata )\r
+{ return setdata->header.nextsib; }\r
+\r
+/* Get a setdata's name */\r
+uint8_t* ir_setdata_name\r
+( union ir_setdata_t* setdata )\r
+{ return setdata->header.data_name; }\r
+\r
+/* Get a setdata's filename */\r
+uint8_t* ir_setdata_filename\r
+( union ir_setdata_t* setdata )\r
+{ return setdata->header.src_filename; }\r
+\r
+/* Get a setdata's file position */\r
+long ir_setdata_fpos\r
+( union ir_setdata_t* setdata )\r
+{ return setdata->header.filepos; }\r
+\r
+/* Set a setdata's file position */\r
+void ir_setdata_assign_fpos\r
+( union ir_setdata_t* setdata,\r
+ long newpos\r
+)\r
+{ setdata->header.filepos = newpos; }\r
+\r
+/* Return a framebox's specified framesheet */\r
+union ir_setdata_t* ir_framebox_framesheet\r
+( union ir_setdata_t* fbox,\r
+ apc_facing facing\r
+)\r
+{ if (fbox->header.type != FBDAT)\r
+ eprintf("Data %s is not a framebox\n", fbox->header.data_name);\r
+ return (union ir_setdata_t*) &fbox->framebox.framesheets[facing];\r
+}\r
+\r
+/* Return a framebox's specified mapsheet */\r
+union ir_setdata_t* ir_framebox_mapsheet\r
+( union ir_setdata_t* fbox,\r
+ apc_facing facing\r
+)\r
+{ if (fbox->header.type != FBDAT)\r
+ eprintf("Data %s is not a framebox\n", fbox->header.data_name);\r
+ return (union ir_setdata_t*) &fbox->framebox.mapsheets[facing];\r
+}\r
+\r
+/* Return a framedata's frame info */\r
+struct ir_frameinfo_t* ir_framedata_mapsheet\r
+( union ir_setdata_t* framedata )\r
+{ if (framedata->header.type != MSDAT && framedata->header.type != FSDAT)\r
+ eprintf("Data %s is not a framedata\n", framedata->header.data_name);\r
+ return &framedata->mapsheet.frameinfo;\r
+}\r
+\r
+/** Allocators **/\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
+uint8_t* name_alloc\r
+( const uint8_t* name_src )\r
+{ const uint8_t* iter;\r
+ uint8_t* name;\r
+ int head_mem;\r
+ copy:\r
+ name = (uint8_t*)namepages.head->header.head;\r
+ iter = name_src;\r
+ for (head_mem = PL_HEADMEM(namepages); *iter && *iter != '_' && *iter != '.' && head_mem; head_mem--)\r
+ *(namepages.head->header.head)++ = *iter++;\r
+ if (head_mem < 1) //not enough room\r
+ { pagelist_alloc(namepages);\r
+ goto copy;\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
+ *(namepages.head->header.head)++ = '\0';\r
+ return name;\r
+}\r
+\r
+static\r
+uint8_t* classname_alloc\r
+( const uint8_t* name_src )\r
+{ const uint8_t* iter;\r
+ uint8_t* name;\r
+ int head_mem;\r
+ copy:\r
+ name = (uint8_t*)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 < 1) //not enough room\r
+ { pagelist_alloc(namepages);\r
+ goto copy;\r
+ }\r
+ *(namepages.head->header.head)++ = '\0';\r
+ return name;\r
+}\r
+\r
+static void crawl_class(struct ir_class_t*);\r
+static void crawl_set(struct ir_set_t*,int);\r
+\r
+extern\r
+int binout_init(ir_class);\r
+void ir_test(void)\r
+{ uprintf("IR From Directory: %s\n",getcwd(NULL,255));\r
+ crawl_class(&root_class);\r
+ if (root_class.root_set != NULL)\r
+ crawl_set(root_class.root_set, 0);\r
+ uprintf("starting binaryout \n");\r
+ binout_init(&root_class);\r
+}\r
+\r
+\r
+static\r
+void crawl_class\r
+( struct ir_class_t* class )\r
+{ struct ir_class_t* iter;\r
+ for (iter = class->nextchild; iter != NULL; iter = iter->nextsib)\r
+ { wprintf("Crawling class %U/\n", iter->name);\r
+ if(chdir((char*)iter->name))\r
+ eprintf("CHDIR %U from %s\n",iter->name,getcwd(NULL,255));\r
+ crawl_class(iter);\r
+ if (iter->root_set != NULL)\r
+ crawl_set(iter->root_set, 0);\r
+ uprintf("%U\\\n",iter->name);\r
+ if (chdir(".."))\r
+ eprintf("CHDIR ..\n");\r
+ wprintf("Finished crawling class %U/\n", iter->name);\r
}\r
- pagenode_head->head += bytes;\r
- return (void*) pagenode_head->head - bytes;\r
}\r
\r
+#define push_setp(setp) (*(struct ir_set_t**)stack_alloc(&datapages, sizeof(struct ir_set_t*)) = setp)\r
+#define pop_setp() (*(struct ir_set_t**)pagelist_pop(&datapages, sizeof(struct ir_set_t*)))\r
+static\r
+void crawl_set\r
+( struct ir_set_t* set,\r
+ int depth\r
+)\r
+{ struct ir_set_t* iter;\r
+ int i;\r
+ i = depth * 12;\r
+ while (i--)\r
+ putchar('.');\r
+ i = depth;\r
+\r
+ for(iter = set; iter != NULL; iter = iter->nextchild)\r
+ { uprintf("[%10U]", iter->name);\r
+ push_setp(iter);\r
+ i++;\r
+ }\r
+\r
+ putchar('\n');\r
+ while (--i >= depth)\r
+ if (((iter = pop_setp())->nextsib) != NULL)\r
+ crawl_set(iter->nextsib,i);\r
+}\r