Skip to content

Fix: LibCallg() now has similar edits to LibCallgFfi() #2892

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
mwinkel-dev merged 2 commits into from
Apr 2, 2025
Merged

Fix: LibCallg() now has similar edits to LibCallgFfi() #2892

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e3cf0c
LibCallg: similar edits to LibCallgFfi
mwinkel-dev Mar 12, 2025
39ea472
Fix: assert() replaced with abort() in LibCallg* routines
mwinkel-dev Mar 27, 2025
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
21 changes: 16 additions & 5 deletions mdsshr/librtl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,19 @@ EXPORT char *Now32(char *const buf)
///
EXPORT void *LibCallg(void **const a, void *(*const routine)())
{
if (!routine)
if (!routine) {
abort(); // intercept definite stack corruption
switch (*(int *)a & 0xff)
}

// The "a" parameter is the arglist for the "routine" and contains the following:
// arglist[0] = N (total number of args excluding first and last elements of vector)
// arglist[1] = expression
// arglist[2 .. N-1] = variable args (pointer to descriptors)
// arglist[N] = result xd1 descriptor
// arglist[N+1] = NULL
int num_args = *(int *)a & 0xff;

switch (num_args)
{
case 0:
return routine();
Expand Down Expand Up @@ -281,8 +291,7 @@ EXPORT void *LibCallg(void **const a, void *(*const routine)())
a[19], a[20], a[21], a[22], a[23], a[24], a[25], a[26],
a[27], a[28], a[29], a[30], a[31], a[32]);
default:
printf("Error - currently no more than 32 arguments supported on external "
"calls\n");
printf("Error - currently no more than %d arguments supported on external calls\n", LIBCALLG_MAX_ARGS);
}
return 0;
}
Expand All @@ -295,7 +304,9 @@ EXPORT void *LibCallg(void **const a, void *(*const routine)())
// If the external function does not fit that constraint, users will have to write a shim function.
EXPORT void *LibCallgFfi(void **const a, void *(*const routine)(), int num_fixed_args, int rtype)
{
assert(routine); // in DEBUG mode checks for stack corruption
if (!routine) {
abort(); // intercept definite stack corruption
}

// The "a" parameter is the arglist for the "routine" and contains the following:
// arglist[0] = N (total number of args excluding first and last elements of vector)
Expand Down