justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[libj6] Change to a more SysV style process init args

Browse Source 
Pull out the old linked list of args structures in favor of doing things
the SysV ABI-specified way.
This commit is contained in:
Justin C. Miller
2024-08-09 19:14:44 -07:00
parent b137c75eb2
commit fa587060f1
9 changed files with 171 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/libraries/j6/init.cpp
View File

@@ -1,5 +1,7 @@
// The kernel depends on libj6 for some shared code,
// but should not include the user-specific code.
#include "j6/init.h"
#include "j6/types.h"
#ifndef __j6kernel
#include <stddef.h>
@@ -10,65 +12,45 @@
#include <j6/types.h>
namespace {
constexpr size_t static_arr_count = 32;
j6_handle_descriptor handle_array[static_arr_count];
j6_init_args init_args = { 0, 0, 0 };
} // namespace
char const * const *envp = nullptr;
const j6_aux *aux = nullptr;
j6_handle_t
j6_find_first_handle(j6_object_type obj_type)
{
size_t count = static_arr_count;
j6_handle_descriptor *handles = handle_array;
j6_status_t s = j6_handle_list(handles, &count);
if (s != j6_err_insufficient && s != j6_status_ok)
return j6_handle_invalid;
if (count > static_arr_count)
count = static_arr_count;
for (size_t i = 0; i < count; ++i) {
j6_handle_descriptor &desc = handle_array[i];
if (desc.type == obj_type) return desc.handle;
const j6_aux * find_aux(uint64_t type) {
if (!aux) return nullptr;
for (j6_aux const *p = aux; p->type; ++p)
if (p->type == type) return p;
return nullptr;
}
return j6_handle_invalid;
}
} // namespace
j6_handle_t
j6_find_init_handle(uint64_t proto)
{
j6_arg_header *arg = init_args.args;
while (arg) {
if (arg->type == j6_arg_type_handles) {
j6_arg_handles *harg = reinterpret_cast<j6_arg_handles*>(arg);
for (unsigned i = 0; i < harg->nhandles; ++i) {
j6_arg_handle_entry &ent = harg->handles[i];
if (ent.proto == proto)
return ent.handle;
}
}
arg = arg->next;
const j6_aux *aux_handles = find_aux(j6_aux_handles);
if (!aux_handles)
return j6_handle_invalid;
const j6_arg_handles *arg = reinterpret_cast<const j6_arg_handles*>(aux_handles->pointer);
for (unsigned i = 0; i < arg->nhandles; ++i) {
const j6_arg_handle_entry &ent = arg->handles[i];
if (ent.proto == proto)
return ent.handle;
}
return j6_handle_invalid;
}
const j6_init_args * API
j6_get_init_args()
{
return &init_args;
}
extern "C" void API
__init_libj6(uint64_t argv0, uint64_t argv1, j6_arg_header *args)
__init_libj6(const uint64_t *stack)
{
init_args.argv[0] = argv0;
init_args.argv[1] = argv1;
init_args.args = args;
}
// Walk the stack to get the aux vector
uint64_t argc = *stack++;
stack += argc + 1; // Skip argv's and sentinel
envp = reinterpret_cast<char const * const *>(stack);
while (*stack++); // Skip envp's and sentinel
aux = reinterpret_cast<const j6_aux*>(stack);
}
#endif // __j6kernel