diff --git a/loader/src/main.rs b/loader/src/main.rs index 0ad9bdb36..ff152173a 100644 --- a/loader/src/main.rs +++ b/loader/src/main.rs @@ -575,13 +575,13 @@ fn copy_processes(cfg: &mut BootConfig) { if tag.name == make_type!("IniE") { let mut page_addr: usize = 0; let mut previous_addr: usize = 0; - let mut top = 0 as *mut usize; + let mut top = 0 as *mut u8; let inie = MiniElf::new(&tag); let mut src_addr = unsafe { cfg.base_addr .add(inie.load_offset as usize / mem::size_of::()) - }; + } as *const u8; // Example: Page starts at 0xf0c0 and is 8192 bytes long. // 1. Copy 3094 bytes to page 1 @@ -620,28 +620,18 @@ fn copy_processes(cfg: &mut BootConfig) { ); unsafe { bzero( - top.add( - (previous_addr as usize & (PAGE_SIZE - 1)) - / mem::size_of::(), - ), - top.add(PAGE_SIZE as usize / mem::size_of::()), + top.add(previous_addr as usize & (PAGE_SIZE - 1)), + top.add(PAGE_SIZE as usize), ) }; } // Allocate a new page. cfg.extra_pages += 1; - top = cfg.get_top(); + top = cfg.get_top() as *mut u8; // Zero out the page, if necessary. - unsafe { - bzero( - top, - top.add( - (section.virt as usize & (PAGE_SIZE - 1)) / mem::size_of::(), - ), - ) - }; + unsafe { bzero(top, top.add(section.virt as usize & (PAGE_SIZE - 1))) }; } // Part 1: Copy the first chunk over. @@ -654,29 +644,23 @@ fn copy_processes(cfg: &mut BootConfig) { "First chunk is {} bytes, copying from {:08x}:{:08x} -> {:08x}:{:08x} (virt: {:08x})", first_chunk_size, src_addr as usize, - unsafe { src_addr.add(first_chunk_size / 4) as usize }, - unsafe { top.add(first_chunk_offset / mem::size_of::()) as usize }, - unsafe { top.add((first_chunk_size + first_chunk_offset) / mem::size_of::()) + unsafe { src_addr.add(first_chunk_size) as usize }, + unsafe { top.add(first_chunk_offset) as usize }, + unsafe { top.add(first_chunk_size + first_chunk_offset) as usize }, this_page + first_chunk_offset, ); // Perform the copy, if NOCOPY is not set if !section.no_copy() { unsafe { - memcpy( - top.add(first_chunk_offset / mem::size_of::()), - src_addr, - first_chunk_size, - ); - src_addr = src_addr.add(first_chunk_size / mem::size_of::()); + memcpy(top.add(first_chunk_offset), src_addr, first_chunk_size); + src_addr = src_addr.add(first_chunk_size); } } else { unsafe { bzero( - top.add(first_chunk_offset / mem::size_of::()), - top.add( - (first_chunk_offset + first_chunk_size) / mem::size_of::(), - ), + top.add(first_chunk_offset), + top.add(first_chunk_offset + first_chunk_size), ); } } @@ -685,7 +669,7 @@ fn copy_processes(cfg: &mut BootConfig) { // Part 2: Copy any full pages. while bytes_to_copy > PAGE_SIZE { cfg.extra_pages += 1; - top = cfg.get_top(); + top = cfg.get_top() as *mut u8; // println!( // "Copying next page from {:08x} {:08x}", // src_addr as usize, top as usize @@ -693,10 +677,10 @@ fn copy_processes(cfg: &mut BootConfig) { if !section.no_copy() { unsafe { memcpy(top, src_addr, PAGE_SIZE); - src_addr = src_addr.add(PAGE_SIZE / mem::size_of::()); + src_addr = src_addr.add(PAGE_SIZE); } } else { - unsafe { bzero(top, top.add(PAGE_SIZE / 4)) }; + unsafe { bzero(top, top.add(PAGE_SIZE)) }; } bytes_to_copy -= PAGE_SIZE; } @@ -705,14 +689,14 @@ fn copy_processes(cfg: &mut BootConfig) { if bytes_to_copy > 0 { println!("Copying final section -- {} bytes", bytes_to_copy); cfg.extra_pages += 1; - top = cfg.get_top(); + top = cfg.get_top() as *mut u8; if !section.no_copy() { unsafe { memcpy(top, src_addr, bytes_to_copy); - src_addr = src_addr.add(bytes_to_copy / mem::size_of::()); + src_addr = src_addr.add(bytes_to_copy); } } else { - unsafe { bzero(top, top.add(bytes_to_copy / 4)) }; + unsafe { bzero(top, top.add(bytes_to_copy)) }; } } @@ -725,8 +709,8 @@ fn copy_processes(cfg: &mut BootConfig) { // Zero-out the trailing bytes unsafe { bzero( - top.add((previous_addr as usize & (PAGE_SIZE - 1)) / mem::size_of::()), - top.add(PAGE_SIZE as usize / mem::size_of::()), + top.add(previous_addr as usize & (PAGE_SIZE - 1)), + top.add(PAGE_SIZE as usize), ) }; } else if tag.name == make_type!("XKrn") { diff --git a/loader/src/test.rs b/loader/src/test.rs index 19dc3e1c0..aca2ea793 100644 --- a/loader/src/test.rs +++ b/loader/src/test.rs @@ -191,6 +191,11 @@ fn read_word(satp: usize, virt: usize) -> Result { Ok(unsafe { (page_base as *mut u32).read() }) } +fn read_byte(satp: usize, virt: usize) -> Result { + let word = read_word(satp, virt & 0xfffffffc)?; + Ok(word.to_le_bytes()[virt & 3]) +} + fn verify_kernel(cfg: &BootConfig, pid: usize, arg: &crate::args::KernelArgument) { let prog = unsafe { &*(arg.data.as_ptr() as *const crate::ProgramDescription) }; let program_offset = prog.load_offset as usize; @@ -273,21 +278,21 @@ fn verify_program(cfg: &BootConfig, pid: usize, arg: &crate::args::KernelArgumen let mut program_offset = elf.load_offset as usize; for section in elf.sections.iter() { - for addr in (section.virt..(section.virt + section.len() as u32)).step_by(4) { + for addr in section.virt..(section.virt + section.len() as u32) { let addr = addr as usize; - let word = read_word(cfg.processes[pid].satp as usize, addr).unwrap(); + let word = read_byte(cfg.processes[pid].satp as usize, addr).unwrap(); if section.no_copy() { assert!(word == 0, "bss is {:08x}, not 0 @ {:08x}", word, addr); } else { let check_word = unsafe { - (cfg.base_addr as *mut u32) - .add(program_offset / 4) + (cfg.base_addr as *mut u8) + .add(program_offset) .read() }; - program_offset += 4; + program_offset += 1; assert!( word == check_word, - "program doesn't match @ {:08x} (expected: {:08x} found: {:08x})", + "program doesn't match @ {:08x} (expected: {:02x} found: {:02x})", addr, check_word, word, diff --git a/loader/test/args.bin b/loader/test/args.bin index 7df7f69b2..aa67a29b5 100644 Binary files a/loader/test/args.bin and b/loader/test/args.bin differ