Skip to content

(dynlink) Port #753 and #784 #27

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 1 commit into from
Closed

(dynlink) Port #753 and #784 #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions ocaml/runtime/dynlink_nat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static value Val_handle(void* handle) {
}

static void *getsym(void *handle, const char *module, const char *name){
char *fullname = caml_stat_strconcat(4, "caml", module, ".", name);
char *fullname = caml_stat_strconcat(3, module, ".", name);
void *sym;
sym = caml_dlsym (handle, fullname);
/* printf("%s => %lx\n", fullname, (uintnat) sym); */
Expand Down Expand Up @@ -110,25 +110,27 @@ CAMLprim value caml_natdynlink_register(value handle_v, value symbols) {

for (i = 0; i < nsymbols; i++) {
const char* unit = String_val(Field(symbols, i));
table[i] = getsym(handle, unit, "frametable");
table[i] = getsym(handle, unit, "gc_roots");
if (table[i] == NULL) {
caml_stat_free(table);
caml_invalid_argument_value(
caml_alloc_sprintf("Dynlink: Missing frametable for %s", unit));
caml_alloc_sprintf("Dynlink: Missing gc_roots for %s", unit));
}
}
caml_register_frametables(table, nsymbols);
caml_register_dyn_globals(table, nsymbols);
/* [caml_register_dyn_global] can raise, so do it prior to registering
frametables etc. */

for (i = 0; i < nsymbols; i++) {
const char* unit = String_val(Field(symbols, i));
table[i] = getsym(handle, unit, "gc_roots");
table[i] = getsym(handle, unit, "frametable");
if (table[i] == NULL) {
caml_stat_free(table);
caml_invalid_argument_value(
caml_alloc_sprintf("Dynlink: Missing gc_roots for %s", unit));
caml_alloc_sprintf("Dynlink: Missing frametable for %s", unit));
}
}
caml_register_dyn_globals(table, nsymbols);
caml_register_frametables(table, nsymbols);

for (i = 0; i < nsymbols; i++) {
const char* unit = String_val(Field(symbols, i));
Expand Down