X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl.c;h=300f5bdd36b6e1a782285e54423dbfbb3e2064bf;hp=2d974808b7bd8ee3d7cf735632ba22ad8f878876;hb=02e801eabbe26a129ea05e6723c94e10bb653dab;hpb=440ff658995f1378fd74c0101ff6c2b4951ffdf9

diff --git a/src/types/decl.c b/src/types/decl.c
index 2d97480..300f5bd 100644
--- a/src/types/decl.c
+++ b/src/types/decl.c
@@ -57,6 +57,9 @@ void psi_decl_free(struct psi_decl **d_ptr)
 		if (d->args) {
 			psi_plist_free(d->args);
 		}
+		if (d->redir) {
+			free(d->redir);
+		}
 		free(d);
 	}
 }
@@ -65,6 +68,7 @@ void psi_decl_dump(int fd, struct psi_decl *decl)
 {
 	psi_decl_abi_dump(fd, decl->abi);
 	dprintf(fd, " ");
+	/* FIXME: functions returning arrays */
 	psi_decl_arg_dump(fd, decl->func, 0);
 	dprintf(fd, "(");
 	if (decl->args) {
@@ -81,11 +85,15 @@ void psi_decl_dump(int fd, struct psi_decl *decl)
 			dprintf(fd, ", ...");
 		}
 	}
-	dprintf(fd, ");");
+	if (decl->redir) {
+		dprintf(fd, ") __asm__ (\"%s\");", decl->redir);
+	} else {
+		dprintf(fd, ");");
+	}
 }
 
 static inline bool psi_decl_validate_func(struct psi_data *data,
-		struct psi_decl *decl, struct psi_decl_arg *func, void *dl)
+		struct psi_decl *decl, struct psi_decl_arg *func)
 {
 	struct psi_func_redir *redir;
 
@@ -99,6 +107,14 @@ static inline bool psi_decl_validate_func(struct psi_data *data,
 			decl->sym = redir->func;
 		}
 	}
+	if (!decl->sym) {
+		size_t i = 0;
+		void *dl;
+
+		while (!decl->sym && psi_plist_get(data->file.dlopened, i++, &dl)) {
+			decl->sym = dlsym(dl, decl->redir ?: func->var->name);
+		}
+	}
 	if (!decl->sym) {
 #ifndef RTLD_NEXT
 # define RTLD_NEXT ((void *) -1l)
@@ -106,10 +122,11 @@ static inline bool psi_decl_validate_func(struct psi_data *data,
 #ifndef RTLD_DEFAULT
 # define RTLD_DEFAULT ((void *) 0)
 #endif
-		decl->sym = dlsym(dl ?: RTLD_DEFAULT, func->var->name);
+		decl->sym = dlsym(RTLD_DEFAULT, decl->redir ?: func->var->name);
 		if (!decl->sym) {
 			data->error(data, func->token, PSI_WARNING,
-					"Failed to locate symbol '%s': %s", func->var->name,
+					"Failed to locate symbol '%s(%s)': %s",
+					func->var->name, decl->redir ?: "",
 					dlerror() ?: "not found");
 			return false;
 		}
@@ -117,13 +134,13 @@ static inline bool psi_decl_validate_func(struct psi_data *data,
 	return true;
 }
 
-bool psi_decl_validate(struct psi_data *data, struct psi_decl *decl, void *dl,
-		struct psi_validate_stack *type_stack)
+bool psi_decl_validate(struct psi_data *data, struct psi_decl *decl,
+		struct psi_validate_scope *scope)
 {
-	if (!psi_decl_validate_nodl(data, decl, type_stack)) {
+	if (!psi_decl_validate_nodl(data, decl, scope)) {
 		return false;
 	}
-	if (!psi_decl_validate_func(data, decl, decl->func, dl)) {
+	if (!psi_decl_validate_func(data, decl, decl->func)) {
 		return false;
 	}
 
@@ -131,7 +148,7 @@ bool psi_decl_validate(struct psi_data *data, struct psi_decl *decl, void *dl,
 }
 
 bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl,
-		struct psi_validate_stack *type_stack)
+		struct psi_validate_scope *scope)
 {
 	if (!decl->abi) {
 		decl->abi = psi_decl_abi_init("default");
@@ -140,7 +157,7 @@ bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl,
 				"Invalid calling convention: '%s'", decl->abi->token->text);
 		return false;
 	}
-	if (!psi_decl_arg_validate(data, decl->func, type_stack)) {
+	if (!psi_decl_arg_validate(data, decl->func, scope)) {
 		return false;
 	}
 	if (decl->args) {
@@ -153,7 +170,7 @@ bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl,
 				snprintf(arg->var->name, 6, "arg%zu", i);
 				arg->var->fqn = strdup(arg->var->name);
 			}
-			if (!psi_decl_arg_validate(data, arg, type_stack)) {
+			if (!psi_decl_arg_validate(data, arg, scope)) {
 				return false;
 			}
 		}
@@ -175,3 +192,18 @@ bool psi_decl_is_blacklisted(const char *name)
 	return false;
 }
 
+struct psi_decl_arg *psi_decl_get_arg(struct psi_decl *decl, struct psi_decl_var *var) {
+	if (var->arg) {
+		size_t i = 0;
+		struct psi_decl_arg *arg = decl->func;
+
+		do {
+			if (var->arg == arg) {
+				return arg;
+			}
+		} while (psi_plist_get(decl->args, i++, &arg));
+	}
+
+	return psi_decl_arg_get_by_var(var, decl->args, decl->func);
+}
+