X-Git-Url: https://git.kengrimes.com/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fir.c;h=3577d48e00ae705eed3a3631429236cd8752ab37;hp=4ef2e5a9fa328be6fd935f8624dfc922a36239a3;hb=e4ad1c1a9499babb6804823e60377a14b6a0b583;hpb=32084db924eb07c8a5e44748aaf12883189b37d2

diff --git a/src/ir.c b/src/ir.c
index 4ef2e5a..3577d48 100644
--- a/src/ir.c
+++ b/src/ir.c
@@ -67,6 +67,7 @@ struct ir_link_t
 { struct ir_setdata_header_t header;
   struct ir_classld_t*       classld;
   struct ir_setld_t*         setld;
+  struct ir_set_t*           trg_set;
   enum ltype                 type;
 };
 union ir_setdata_t
@@ -98,6 +99,8 @@ struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,uint8_t*);
 static inline
 union ir_setdata_t*   ir_framedata (enum dtype,const uint8_t*,apc_facing,int,int);
 static inline
+void                  ir_linkdata_resolve_set(union ir_setdata_t*);
+static inline
 int      bytes_identical(const uint8_t*,const uint8_t*);
 static inline
 int      classnames_identical(const uint8_t*,const uint8_t*);
@@ -110,10 +113,12 @@ uint8_t* classname_alloc(const uint8_t*);
 #define  struct_alloc(_T) ((struct _T*) stack_alloc(&datapages, sizeof(struct _T)))
 extern //apc.c
 long     sys_pagesize;
+extern //apc.c
+char*    apc_package_name;
 static
 struct pagelist_t datapages, namepages, refhashpages;
 static
-struct ir_class_t root_class = { .name = (uint8_t*)"." };
+struct ir_class_t root_class;
 
 /* Init */
 int ir_init
@@ -121,7 +126,7 @@ int ir_init
 { pagelist_init(datapages, (size_t)SYS_PAGESIZE);
   pagelist_init(namepages, (size_t)NAME_PAGESIZE);
   pagelist_init(refhashpages, (size_t)SYS_PAGESIZE);
-
+  root_class.name = (uint8_t*) apc_package_name;
   return 0;
 }
 
@@ -615,27 +620,38 @@ union ir_setdata_t* ir_set_link
 ( struct ir_set_t* set )
 { return (union ir_setdata_t*) set->links; }
 
+#define assert_link(linkdata) do {					\
+    if (linkdata->header.type != LDAT)					\
+      eprintf("Data %s is not a link\n", linkdata->header.data_name);	\
+  } while (0)
+
 /* Return the link type */
 enum ltype ir_linkdata_type
 ( union ir_setdata_t* linkdata )
-{ if (linkdata->header.type != LDAT)
-    eprintf("Data %s is not a link\n", linkdata->header.data_name);
+{ assert_link(linkdata);
   return linkdata->link.type;
 }
 
 /* Return the link type */
 uint32_t ir_linkdata_ref
 ( union ir_setdata_t* linkdata )
-{ if (linkdata->header.type != LDAT)
-    eprintf("Data %s is not a link\n", linkdata->header.data_name);
+{ assert_link(linkdata);
   return linkdata->link.setld->ref;
 }
 
-/* Resolve and return the link's target set
-   Fails on error, cannot return NULL
-*/
+/* Return the current target set, resolving it first if not present */
 struct ir_set_t* ir_linkdata_set
 ( union ir_setdata_t* linkdata )
+{ assert_link(linkdata);
+  if (linkdata->link.trg_set == NULL)
+    ir_linkdata_resolve_set(linkdata);
+  return linkdata->link.trg_set;
+}
+
+/* Resolve and assign the link's target set */
+static inline
+void ir_linkdata_resolve_set
+( union ir_setdata_t* linkdata )
 { struct ir_class_t* class_iter;
   struct ir_namelist_t* namelist_iter,* namelist_iter_last;
   struct ir_setld_t* setld;
@@ -643,8 +659,7 @@ struct ir_set_t* ir_linkdata_set
   struct ir_set_t* set;
   set = NULL;
   class_iter = NULL;
-  if (linkdata->header.type != LDAT)
-    eprintf("Data %s is not a link\n", linkdata->header.data_name);
+  assert_link(linkdata);
   setld = linkdata->link.setld;
   if (linkdata->link.setld == NULL)
     eprintf("Link data is invalid\n");
@@ -705,7 +720,7 @@ struct ir_set_t* ir_linkdata_set
 		    class_iter->name);
 	}
     }
-  return set;
+  linkdata->link.trg_set = set;
 }
 
 /* Get a setdata's next sibling */