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

[srv.init] Load initial programs in srv.init

Browse Source 
Add a simple ELF loader to srv.init to load and start any module_program
parameters passed from the bootloader. Also creates stacks for newly
created threads.

Also update thread creation in testapp to create stacks.
This commit is contained in:
Justin C. Miller
2021-12-26 15:42:12 -08:00
parent 300bf9c2c5
commit 25522a8450
6 changed files with 183 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/user/testapp/main.cpp
View File

@@ -3,6 +3,7 @@
#include "j6/types.h"
#include "j6/errors.h"
#include "j6/flags.h"
#include "j6/signals.h"
#include "j6/syscalls.h"
@@ -17,6 +18,11 @@ extern "C" {
int main(int, const char **);
}
constexpr j6_handle_t handle_self = 1; // Self program handle is always 1
constexpr size_t stack_size = 0x10000;
constexpr uintptr_t stack_top = 0xf80000000;
void
thread_proc()
{
@@ -52,7 +58,6 @@ thread_proc()
int
main(int argc, const char **argv)
{
j6_handle_t children[2] = {j6_handle_invalid, j6_handle_invalid};
j6_signal_t out = 0;
j6_log("main thread starting");
@@ -76,7 +81,13 @@ main(int argc, const char **argv)
j6_log("main thread created endpoint");
result = j6_thread_create(&children[1], reinterpret_cast<uintptr_t>(&thread_proc));
j6_handle_t child_stack_vma = j6_handle_invalid;
result = j6_vma_create_map(&child_stack_vma, stack_size, stack_top-stack_size, j6_vm_flag_write);
if (result != j6_status_ok)
return result;
j6_handle_t child = j6_handle_invalid;
result = j6_thread_create(&child, handle_self, stack_top, reinterpret_cast<uintptr_t>(&thread_proc));
if (result != j6_status_ok)
return result;
@@ -98,29 +109,20 @@ main(int argc, const char **argv)
j6_log(message);
j6_log("main thread creating a new process");
result = j6_process_create(&children[0]);
j6_log("main thread waiting on sub thread");
result = j6_kobject_wait(child, -1ull, &out);
if (result != j6_status_ok)
return result;
j6_log("main thread waiting on children");
j6_log("main setting IOPL");
j6_handle_t outhandle;
result = j6_kobject_wait_many(children, 2, -1ull, &outhandle, &out);
result = j6_system_request_iopl(__handle_sys, 3);
if (result != j6_status_ok)
return result;
if (outhandle == children[1]) {
j6_log(" ok from child thread");
} else if (outhandle == children[0]) {
j6_log(" ok from child process");
} else {
j6_log(" ... got unknown handle");
}
j6_log("main testing irqs");
serial_port com2(COM2);
const char *fgseq = "\x1b[2J";