Remove debugging

This commit is contained in:
Jeremy Soller 2016-10-31 19:40:27 -06:00
parent 973fdcb20b
commit b95a399a59
2 changed files with 2 additions and 8 deletions

View file

@ -1,6 +1,5 @@
acid tls
randd
initfs:bin/pcid /etc/pcid.toml initfs:bin/pcid /etc/pcid.toml
randd
ethernetd ethernetd
ipd ipd
tcpd tcpd

View file

@ -206,8 +206,6 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<usize> {
tls.file_size); tls.file_size);
} }
println!("TLS clone {:X} {} {}", new_tls.mem.start_address().get(), new_tls.file_size, new_tls.mem.size());
new_tls.mem.remap(tls.mem.flags(), true); new_tls.mem.remap(tls.mem.flags(), true);
tls_option = Some(new_tls); tls_option = Some(new_tls);
} }
@ -429,7 +427,6 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<usize> {
// Setup user TLS // Setup user TLS
if let Some(mut tls) = tls_option { if let Some(mut tls) = tls_option {
tls.mem.move_to(VirtualAddress::new(arch::USER_TLS_OFFSET), &mut new_table, &mut temporary_page, true); tls.mem.move_to(VirtualAddress::new(arch::USER_TLS_OFFSET), &mut new_table, &mut temporary_page, true);
println!("TLS clone move {:X}, {}, {}", tls.mem.start_address().get(), tls.file_size, tls.mem.size());
context.tls = Some(tls); context.tls = Some(tls);
} }
@ -602,7 +599,7 @@ pub fn exec(path: &[u8], arg_ptrs: &[[usize; 2]]) -> Result<usize> {
file_size: file_size, file_size: file_size,
mem: context::memory::Memory::new( mem: context::memory::Memory::new(
VirtualAddress::new(arch::USER_TLS_OFFSET), VirtualAddress::new(arch::USER_TLS_OFFSET),
(size + 4095)/4096 * 4096, size,
entry::NO_EXECUTE | entry::WRITABLE | entry::USER_ACCESSIBLE, entry::NO_EXECUTE | entry::WRITABLE | entry::USER_ACCESSIBLE,
true, true,
true true
@ -616,8 +613,6 @@ pub fn exec(path: &[u8], arg_ptrs: &[[usize; 2]]) -> Result<usize> {
file_size); file_size);
} }
println!("Map TLS {:X} {} {} to {:X} {}", master.get(), file_size, size, tls.mem.start_address().get(), tls.mem.size());
context.tls = Some(tls); context.tls = Some(tls);
} }