andrey/osblog
1
0
Fork 0
mirror of https://github.com/sgmarz/osblog.git synced 2024-11-24 02:16:19 +04:00
Code Issues Projects Releases Wiki Activity

Updates to process.

Browse Source
This commit is contained in:
Stephen Marz 2019-12-07 22:04:13 -05:00
parent c1e247cad5
commit eb0c943a71
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
risc_v/ch6/src/lib.rs
View File

@ -125,6 +125,7 @@ extern "C" fn kinit() -> usize {
page::init(); page::init();
kmem::init(); kmem::init();
let ret = process::init(); let ret = process::init();
println!("Init process created at address 0x{:08x}", ret);
// We lower the threshold wall so our interrupts can jump over it. // We lower the threshold wall so our interrupts can jump over it.
plic::set_threshold(0); plic::set_threshold(0);
// VIRTIO = [1..8] // VIRTIO = [1..8]
@ -133,7 +134,7 @@ extern "C" fn kinit() -> usize {
// Enable the UART interrupt. // Enable the UART interrupt.
plic::enable(10); plic::enable(10);
plic::set_priority(10, 1); plic::set_priority(10, 1);
println!("UART interrupts have been enabled and are awaiting your command"); println!("UART interrupts have been enabled and are awaiting your command.");
println!("Getting ready for first process."); println!("Getting ready for first process.");
println!("Issuing the first context-switch timer."); println!("Issuing the first context-switch timer.");
unsafe { unsafe {

16
risc_v/ch6/src/process.rs
View File

@ -24,7 +24,7 @@ use alloc::collections::vec_deque::VecDeque;
const STACK_PAGES: usize = 2; const STACK_PAGES: usize = 2;
// We want to adjust the stack to be at the bottom of the memory allocation // We want to adjust the stack to be at the bottom of the memory allocation
// regardless of where it is on the kernel heap. // regardless of where it is on the kernel heap.
const STACK_ADDR_ADJ: usize = 0x3f_0000_0000; const STACK_ADDR: usize = 0xf_0000_0000;
// const STACK_ADDR_ADJ: usize = 0; // const STACK_ADDR_ADJ: usize = 0;
// All processes will have a defined starting point in virtual memory. // All processes will have a defined starting point in virtual memory.
const PROCESS_STARTING_ADDR: usize = 0x2000_0000; const PROCESS_STARTING_ADDR: usize = 0x2000_0000;
@ -34,6 +34,11 @@ const PROCESS_STARTING_ADDR: usize = 0x2000_0000;
// that we made before and its job is to store all processes. // that we made before and its job is to store all processes.
// We will have this list OWN the process. So, anytime we want // We will have this list OWN the process. So, anytime we want
// the process, we will consult the process list. // the process, we will consult the process list.
// Using an Option here is one method of creating a "lazy static".
// Rust requires that all statics be initialized, but all
// initializations must be at compile-time. We cannot allocate
// a VecDeque at compile time, so we are somewhat forced to
// do this.
static mut PROCESS_LIST: Option<VecDeque<Process>> = None; static mut PROCESS_LIST: Option<VecDeque<Process>> = None;
// We can search through the process list to get a new PID, but // We can search through the process list to get a new PID, but
// it's probably easier and faster just to increase the pid: // it's probably easier and faster just to increase the pid:
@ -167,8 +172,7 @@ impl Process {
// to usize first and then add PAGE_SIZE is better. // to usize first and then add PAGE_SIZE is better.
// We also need to set the stack adjustment so that it is at the // We also need to set the stack adjustment so that it is at the
// bottom of the memory and far away from heap allocations. // bottom of the memory and far away from heap allocations.
ret_proc.frame.regs[2] = ret_proc.stack as usize ret_proc.frame.regs[2] = STACK_ADDR + PAGE_SIZE
+ STACK_ADDR_ADJ + PAGE_SIZE
* STACK_PAGES; * STACK_PAGES;
// Map the stack on the MMU // Map the stack on the MMU
let pt; let pt;
@ -180,11 +184,11 @@ impl Process {
// memory This gets a little hairy because we need to also map // memory This gets a little hairy because we need to also map
// the function code too. // the function code too.
for i in 0..STACK_PAGES { for i in 0..STACK_PAGES {
let addr = saddr + i * PAGE_SIZE; let addr = i * PAGE_SIZE;
map( map(
pt, pt,
addr + STACK_ADDR_ADJ, STACK_ADDR + addr,
addr, saddr + addr,
EntryBits::UserReadWrite.val(), EntryBits::UserReadWrite.val(),
0, 0,
); );