andrey/osblog
1
0
Fork 0
mirror of https://github.com/sgmarz/osblog.git synced 2024-11-23 18:06:20 +04:00
Code Issues Projects Releases Wiki Activity

Updates to handling write

Browse Source
This commit is contained in:
Stephen Marz 2020-06-03 21:34:28 -04:00
parent f6d842b02b
commit fd80c2bd83
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
risc_v/src/syscall.rs
View File

@ -175,7 +175,7 @@ pub unsafe fn do_syscall(mepc: usize, frame: *mut TrapFrame) -> usize {
} }
64 => { // sys_write 64 => { // sys_write
let fd = (*frame).regs[gp(Registers::A0)]; let fd = (*frame).regs[gp(Registers::A0)];
let mut buf = (*frame).regs[gp(Registers::A1)] as *const u8; let buf = (*frame).regs[gp(Registers::A1)] as *const u8;
let size = (*frame).regs[gp(Registers::A2)]; let size = (*frame).regs[gp(Registers::A2)];
let process = get_by_pid((*frame).pid as u16); let process = get_by_pid((*frame).pid as u16);
// if (*frame).satp >> 60 != 0 { // if (*frame).satp >> 60 != 0 {
@ -193,11 +193,11 @@ pub unsafe fn do_syscall(mepc: usize, frame: *mut TrapFrame) -> usize {
// stdout / stderr // stdout / stderr
// println!("WRITE {}, 0x{:08x}, {}", fd, bu/f as usize, size); // println!("WRITE {}, 0x{:08x}, {}", fd, bu/f as usize, size);
let mut iter = 0; let mut iter = 0;
for _ in 0..size { for i in 0..size {
iter += 1; iter += 1;
if (*frame).satp >> 60 != 0 { if (*frame).satp >> 60 != 0 {
let table = ((*process).mmu_table).as_mut().unwrap(); let table = ((*process).mmu_table).as_mut().unwrap();
let paddr = virt_to_phys(table, buf as usize); let paddr = virt_to_phys(table, buf.add(i) as usize);
if let Some(bufaddr) = paddr { if let Some(bufaddr) = paddr {
let output = *(bufaddr as *const u8) as char; let output = *(bufaddr as *const u8) as char;
print!("{}", output); print!("{}", output);
@ -207,7 +207,6 @@ pub unsafe fn do_syscall(mepc: usize, frame: *mut TrapFrame) -> usize {
return 0; return 0;
} }
} }
buf = buf.add(1);
} }
(*frame).regs[gp(Registers::A0)] = iter as usize; (*frame).regs[gp(Registers::A0)] = iter as usize;
} }