X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fdata.h;h=1d8414f8b231b03fd0d8166c5a02d560dbe3ea66;hp=3c48716cd21820af4b1d4e30f657e8a3479c04e9;hb=a7ac1c0a3c855321f21682c127a4b707de33a303;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84

diff --git a/src/data.h b/src/data.h
index 3c48716..1d8414f 100644
--- a/src/data.h
+++ b/src/data.h
@@ -29,18 +29,71 @@
 #include "types.h"
 #include "error.h"
 #include "plist.h"
+#include "validate.h"
 
 #define PSI_DEBUG 0x1
 #define PSI_SILENT 0x2
 
 #include <stdarg.h>
+#include <dlfcn.h>
 
-#define PSI_DEBUG_PRINT(ctx, msg, ...) do { \
-	if (PSI_DATA(ctx)->flags & PSI_DEBUG) { \
-		fprintf(stderr, msg, __VA_ARGS__); \
+#ifndef RTLD_NEXT
+# define RTLD_NEXT ((void *) -1l)
+#endif
+#ifndef RTLD_DEFAULT
+# define RTLD_DEFAULT ((void *) 0)
+#endif
+
+static inline void *psi_dlsym(struct psi_plist *dllist, const char *name, const char *redir)
+{
+	void *dl, *sym = NULL;
+	const char *test = redir ?: name;
+
+again:
+	if (dllist) {
+		size_t i = 0;
+
+		while (!sym && psi_plist_get(dllist, i++, &dl)) {
+			sym = dlsym(dl, test);
+		}
+	}
+	if (!sym) {
+		sym = dlsym(RTLD_DEFAULT, test);
+	}
+	if (!sym && test == redir) {
+		test = name;
+		goto again;
+	}
+
+	return sym;
+}
+
+#define PSI_DEBUG_PRINT(ctx, ...) do { \
+	if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
+		dprintf(PSI_DATA(ctx)->debug_fd, __VA_ARGS__); \
+	} \
+} while(0)
+#define PSI_DEBUG_PRINTV(ctx, msg, argv) do { \
+	if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
+		vdprintf(PSI_DATA(ctx)->debug_fd, msg, argv); \
 	} \
 } while(0)
+#define PSI_DEBUG_DUMP(ctx, dump_func, ...) do { \
+	if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
+		dump_func(PSI_DATA(ctx)->debug_fd, __VA_ARGS__); \
+	} \
+} while (0)
 
+union psi_dump_arg {
+	void *hn;
+	int fd;
+};
+typedef void (*psi_dump_cb)(union psi_dump_arg, const char *msg, ...);
+struct psi_dump {
+	union psi_dump_arg ctx;
+	psi_dump_cb fun;
+};
+#define PSI_DUMP(dump, ...) (dump)->fun((dump)->ctx, __VA_ARGS__)
 
 #define PSI_DATA(D) ((struct psi_data *) (D))
 
@@ -52,12 +105,13 @@
 	struct psi_plist *unions; \
 	struct psi_plist *enums; \
 	struct psi_plist *decls; \
+	struct psi_plist *vars; \
 	struct psi_plist *impls; \
-	struct psi_plist *libs; \
 	psi_error_cb error; \
 	char last_error[0x1000]; \
 	unsigned errors; \
-	unsigned flags
+	unsigned flags; \
+	int debug_fd
 
 struct psi_data {
 	PSI_DATA_MEMBERS;
@@ -66,7 +120,6 @@ struct psi_data {
 struct psi_data *psi_data_ctor(struct psi_data *data, psi_error_cb error, unsigned flags);
 struct psi_data *psi_data_ctor_with_dtors(struct psi_data *data, psi_error_cb error, unsigned flags);
 struct psi_data *psi_data_exchange(struct psi_data *dest, struct psi_data *src);
-bool psi_data_validate(struct psi_data *dst, struct psi_data *src);
 void psi_data_dtor(struct psi_data *data);
 void psi_data_dump(int fd, struct psi_data *data);