justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

[kernel] Make stdout channel available to processes

Browse Source 
The "fake" stdout channel is now being passed in the new j6_process_init
structure to processes, and nulldrv now uses it to print a message to
the console.
This commit is contained in:
Justin C. Miller
2020-08-30 18:47:14 -07:00
parent 724b846ee4
commit 42455873ff
7 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/kernel/scheduler.cpp
View File

@@ -11,6 +11,7 @@
#include "kernel_memory.h"
#include "log.h"
#include "msr.h"
#include "objects/channel.h"
#include "objects/process.h"
#include "page_manager.h"
#include "scheduler.h"
@@ -18,6 +19,7 @@
#include "elf/elf.h"
#include "kutil/assert.h"
scheduler *scheduler::s_instance = nullptr;
const uint64_t rflags_noint = 0x002;
@@ -69,6 +71,7 @@ load_process_image(const void *image_start, size_t bytes, TCB *tcb)
page_manager *pager = page_manager::get();
thread *th = thread::from_tcb(tcb);
process &proc = th->parent();
log::debug(logs::loader, "Loading task! ELF: %016lx [%d]", image_start, bytes);
@@ -115,6 +118,16 @@ load_process_image(const void *image_start, size_t bytes, TCB *tcb)
kutil::memcpy(dest, src, header->size);
}
tcb->rsp3 -= 2 * sizeof(uint64_t);
uint64_t *sentinel = reinterpret_cast<uint64_t*>(tcb->rsp3);
sentinel[0] = sentinel[1] = 0;
tcb->rsp3 -= sizeof(j6_process_init);
j6_process_init *init = reinterpret_cast<j6_process_init*>(tcb->rsp3);
extern channel *std_out;
init->output = proc.add_handle(std_out);
th->clear_state(thread::state::loading);
uintptr_t entrypoint = image.entrypoint();