vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix thread locals

Browse source
This commit is contained in:
Jeremy Soller 2016-08-20 08:39:03 -06:00
parent 8ddd0ad3f0
commit 7a59e08e70
5 changed files with 6 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
arch/x86_64/src/paging/mod.rs
View file

@ -5,7 +5,6 @@ use core::ops::{Deref, DerefMut};
use x86::tlb;
use memory::{allocate_frame, Frame};
use tcb::ThreadControlBlock;
use self::entry::{EntryFlags, PRESENT, WRITABLE, NO_EXECUTE};
use self::mapper::Mapper;
@ -45,8 +44,6 @@ pub unsafe fn init(stack_start: usize, stack_end: usize) -> ActivePageTable {
static mut __tbss_start: u8;
/// The ending byte of the thread BSS segment
static mut __tbss_end: u8;
/// The start of the thread control block
static mut __tcb: ThreadControlBlock;
/// The starting byte of the _.bss_ (uninitialized data) segment.
static mut __bss_start: u8;
/// The ending byte of the _.bss_ (uninitialized data) segment.
@ -136,18 +133,9 @@ pub unsafe fn init(stack_start: usize, stack_end: usize) -> ActivePageTable {
tlb::flush_all();
::externs::memset(page.start_address().get() as *mut u8, 0, 4096);
}
}
}
// Map and set TCB
{
let start = & __tcb as *const _ as usize;
println!("TCB: {:X}", start);
let page = Page::containing_address(VirtualAddress::new(start));
active_table.map(page, PRESENT | NO_EXECUTE | WRITABLE);
tlb::flush_all();
::externs::memset(page.start_address().get() as *mut u8, 0, 4096);
__tcb.offset = start;
*(end as *mut usize).offset(-1) = end;
}
}
active_table