mu2pwryse
/
peari9jp6
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove m-mode and k210 support.

Browse Source
toolchain_update
Jiajie Chen 6 years ago
parent 58192827e1
commit e3fb47a03e
19 changed files with 34 additions and 1089 deletions
Show Stats Download Patch File Download Diff File

19
.travis.yml
Unescape View File

@ -24,13 +24,15 @@ addons:
env:
matrix:
- ARCH="riscv64"
- ARCH="riscv64" OPTS="board=k210"
- ARCH="riscv64" OPTS="board=u540"
- ARCH="riscv32"
- ARCH="riscv32" OPTS="m_mode=1"
- ARCH="x86_64"
- ARCH="aarch64"
allow_failures:
matrix:
- os: osx
install:
- if [ $ARCH = riscv32 ] || [ $ARCH = riscv64 ]; then
[ $TRAVIS_OS_NAME = linux ] && export FILE="riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14";
@ -45,11 +47,24 @@ install:
wget https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.11/$FILE.tar.xz;
tar -xvf $FILE.tar.xz;
export PATH=$PATH:$PWD/$FILE/bin;
wget https://musl.cc/aarch64-linux-musl-cross.tgz;
tar -xvf aarch64-linux-musl-cross.tgz;
export PATH=$PATH:$PWD/aarch64-linux-musl-cross/bin;
elif [ $TRAVIS_OS_NAME = osx ]; then
brew tap SergioBenitez/osxct;
brew install aarch64-none-elf;
fi;
fi
- if [ $ARCH = x86_64 ]; then
if [ $TRAVIS_OS_NAME = linux ]; then
sudo apt update;
sudo apt install linux-headers-$(uname -r);
wget https://musl.cc/x86_64-linux-musl-cross.tgz;
tar -xvf x86_64-linux-musl-cross.tgz;
export PATH=$PATH:$PWD/x86_64-linux-musl-cross/bin;
fi;
fi
- if [ $TRAVIS_OS_NAME = linux ]; then
wget https://download.qemu.org/qemu-3.1.0.tar.xz && tar xvJf qemu-3.1.0.tar.xz > /dev/null && cd qemu-3.1.0 && ./configure --target-list=$ARCH-softmmu && make && cd ..;
export PATH=$PATH:$PWD/qemu-3.1.0/$ARCH-softmmu:$PWD/qemu-3.1.0;

2
README.md
Unescape View File

@ -24,7 +24,7 @@ Tested boards: QEMU, HiFive Unleashed, x86_64 PC (i5/i7), Raspberry Pi 3B+
* [bootimage](https://github.com/rust-osdev/bootimage) (for x86_64)
* [RISCV64 GNU toolchain](https://www.sifive.com/boards) (for riscv32/64)
* [AArch64 GNU toolchain](https://cs140e.sergio.bz/assignments/0-blinky/) (for aarch64)
* [musl-cross-make](https://github.com/richfelker/musl-cross-make) (for userland musl)
* [musl-cross-make](https://github.com/richfelker/musl-cross-make) (for userland musl, or download prebuilt toolchain from [musl.cc](https://musl.cc/))
* [libfuse-dev](https://github.com/libfuse/libfuse) (for userland image generation)
See [Travis script](./.travis.yml) for details.

1
crate/thread/build.rs
Unescape View File

@ -1,3 +1,2 @@
fn main() {
println!("cargo:rerun-if-env-changed=M_MODE");
}

24
crate/thread/src/interrupt.rs
Unescape View File

@ -25,35 +25,21 @@ pub unsafe fn enable_and_wfi() {
#[inline(always)]
#[cfg(any(target_arch = "riscv32", target_arch = "riscv64"))]
pub unsafe fn disable_and_store() -> usize {
if env!("M_MODE") == "1" {
let mstatus: usize;
asm!("csrci mstatus, 1 << 3" : "=r"(mstatus) ::: "volatile");
mstatus & (1 << 3)
} else {
let sstatus: usize;
asm!("csrci sstatus, 1 << 1" : "=r"(sstatus) ::: "volatile");
sstatus & (1 << 1)
}
let sstatus: usize;
asm!("csrci sstatus, 1 << 1" : "=r"(sstatus) ::: "volatile");
sstatus & (1 << 1)
}
#[inline(always)]
#[cfg(any(target_arch = "riscv32", target_arch = "riscv64"))]
pub unsafe fn restore(flags: usize) {
if env!("M_MODE") == "1" {
asm!("csrs mstatus, $0" :: "r"(flags) :: "volatile");
} else {
asm!("csrs sstatus, $0" :: "r"(flags) :: "volatile");
}
asm!("csrs sstatus, $0" :: "r"(flags) :: "volatile");
}
#[inline(always)]
#[cfg(any(target_arch = "riscv32", target_arch = "riscv64"))]
pub unsafe fn enable_and_wfi() {
if env!("M_MODE") == "1" {
asm!("csrsi mstatus, 1 << 3; wfi" :::: "volatile");
} else {
asm!("csrsi sstatus, 1 << 1; wfi" :::: "volatile");
}
asm!("csrsi sstatus, 1 << 1; wfi" :::: "volatile");
}
#[inline(always)]

6
kernel/Cargo.toml
Unescape View File

@ -17,10 +17,6 @@ authors = [
]
[features]
# Disable paging (for riscv)
no_mmu = []
# Kernel in M-mode (for riscv)
m_mode = ["no_mmu"]
# Page table sv39 or sv48 (for riscv64)
sv39 = []
board_u540 = ["sv39", "link_user"]
@ -28,8 +24,6 @@ board_u540 = ["sv39", "link_user"]
nographic = []
board_raspi3 = ["bcm2837", "link_user"]
raspi3_use_generic_timer = ["bcm2837/use_generic_timer"]
# (for riscv64)
board_k210 = ["m_mode"]
# Hard link user program
link_user = []

49
kernel/Makefile
Unescape View File

@ -1,10 +1,3 @@
# Commands:
# make build Build
# make run Build and run in QEMU
# make justrun Run the last build
# make doc Generate docs
# make asm Open the deassemble file of the last build
# make header Open 'objdump -h' of the last build
# make addr2line Use addr2line to recover line info in backtrace
# make clean Clean
#
@ -17,10 +10,8 @@
# smp = 1 | 2 | ... SMP core number
# graphic = on | off enable/disable qemu graphical output
# board = none Running on QEMU
# | k210 Only available on riscv64, build without bbl, run on K210
# | u540 Only available on riscv64, run on HiFive U540, use Sv39
# | raspi3 Only available on aarch64, run on Raspberry Pi 3 Model B/B+
# m_mode Only available on riscv32, build for M-Mode, without MMU
# pci_passthru Only available on x86_64, passthrough the specified PCI device
arch ?= riscv64
@ -29,7 +20,6 @@ mode ?= debug
LOG ?= debug
graphic ?= off
smp ?= 4
m_mode ?=
pci_passthru ?=
target := $(arch)
@ -41,7 +31,6 @@ bootloader_dir = ../bootloader
bootloader := $(bootloader_dir)/target/$(target)/$(mode)/rcore-bootloader
bbl_path := $(PWD)/../riscv-pk
user_dir := ../user
k210_lib := ../tools/k210/libkendryte.a
### export environments ###
export ARCH = $(arch)
@ -51,11 +40,6 @@ export SFSIMG = $(user_dir)/build/$(arch).qcow2
ifeq ($(arch), aarch64)
board := raspi3
endif
ifeq ($(board), k210)
m_mode := 1
endif
# crate 'process' use this to set interrupt (MIE or SIE)
export M_MODE = $(m_mode)
ifeq ($(arch), aarch64)
graphic := on
@ -87,28 +71,20 @@ else ifeq ($(arch), riscv32)
qemu_opts += \
-machine virt \
-kernel $(kernel_img) \
-drive file=$(SFSIMG),format=raw,id=sfs \
-drive file=$(SFSIMG),format=qcow2,id=sfs \
-device virtio-blk-device,drive=sfs
qemu_net_opts += \
-device virtio-net-device,netdev=net0
ifdef m_mode
qemu_opts += -cpu rv32imacu-nommu
endif
else ifeq ($(arch), riscv64)
qemu_opts += \
-machine virt \
-kernel $(kernel_img) \
-drive file=$(SFSIMG),format=raw,id=sfs \
-drive file=$(SFSIMG),format=qcow2,id=sfs \
-device virtio-blk-device,drive=sfs
qemu_net_opts += \
-device virtio-net-device,netdev=net0
ifdef m_mode
qemu_opts += -cpu rv64imacu-nommu
endif
else ifeq ($(arch), aarch64)
qemu_opts += \
-machine $(board) \
@ -138,11 +114,6 @@ features += raspi3_use_generic_timer
endif
endif
ifdef m_mode
features += no_mmu m_mode
riscv_pk_args := --enable-boot-machine
endif
ifeq ($(board), u540)
features += sv39
riscv_pk_args += --enable-sv39
@ -248,9 +219,6 @@ ifeq ($(arch), riscv32)
make -j && \
cp bbl $(abspath $@)
else ifeq ($(arch), riscv64)
ifeq ($(board), k210)
@$(objcopy) $(kernel) --strip-all -O binary $@
else
@mkdir -p target/$(target)/bbl && \
cd target/$(target)/bbl && \
$(bbl_path)/configure \
@ -261,7 +229,6 @@ else
--with-payload=$(abspath $(kernel)) && \
make -j && \
cp bbl $(abspath $@)
endif
else ifeq ($(arch), aarch64)
@$(objcopy) $(bootloader) --strip-all -O binary $@
endif
@ -277,12 +244,7 @@ else ifeq ($(arch), riscv32)
src/arch/riscv32/atomic.patch
@cargo xbuild $(build_args)
else ifeq ($(arch), riscv64)
ifeq ($(board), k210)
@[[ -f $(k210_lib) ]] || wget https://github.com/wangrunji0408/RustOS/releases/download/v0.1/libkendryte.a -O $(k210_lib)
@cp src/arch/riscv32/board/k210/linker.ld src/arch/riscv32/boot/linker64.ld
else
@cp src/arch/riscv32/board/u540/linker.ld src/arch/riscv32/boot/linker64.ld
endif
@-patch -p0 -N -b \
$(shell rustc --print sysroot)/lib/rustlib/src/rust/src/libcore/sync/atomic.rs \
src/arch/riscv32/atomic.patch
@ -316,13 +278,6 @@ endif
endif
ifeq ($(board), k210)
.PHONY:
install: $(kernel_img)
## baudrate no more than 600000
@python3 ../tools/k210/kflash.py $(kernel_img) -b 600000
endif
ifeq ($(board), u540)
.PHONY:
install: $(kernel_img)

4
kernel/build.rs
Unescape View File

@ -17,10 +17,6 @@ fn main() {
"riscv32" => {
}
"riscv64" => {
if board == "k210" {
println!("cargo:rustc-link-search=native={}", "../tools/k210");
println!("cargo:rustc-link-lib=static=kendryte");
}
}
"aarch64" => {
}

11
kernel/src/arch/riscv32/consts.rs
Unescape View File

@ -22,23 +22,16 @@ pub const KERNEL_P2_INDEX: usize = (KERNEL_OFFSET >> 12 >> 10) & 0x3ff;
#[cfg(target_arch = "riscv64")]
pub const KERNEL_P4_INDEX: usize = (KERNEL_OFFSET >> 12 >> 9 >> 9 >> 9) & 0o777;
#[cfg(feature = "board_k210")]
pub const KERNEL_HEAP_SIZE: usize = 0x0010_0000;
#[cfg(not(feature = "board_k210"))]
pub const KERNEL_HEAP_SIZE: usize = 0x00a0_0000;
#[cfg(feature = "board_k210")]
pub const MEMORY_OFFSET: usize = 0x4000_0000;
#[cfg(target_arch = "riscv32")]
pub const MEMORY_OFFSET: usize = 0x8000_0000;
#[cfg(all(target_arch = "riscv64", not(feature = "board_k210")))]
#[cfg(target_arch = "riscv64")]
pub const MEMORY_OFFSET: usize = 0x8000_0000;
#[cfg(target_arch = "riscv32")]
pub const MEMORY_END: usize = 0x8100_0000;
#[cfg(feature = "board_k210")]
pub const MEMORY_END: usize = 0x4060_0000;
#[cfg(all(target_arch = "riscv64", not(feature = "board_k210")))]
#[cfg(target_arch = "riscv64")]
pub const MEMORY_END: usize = 0x8100_0000;
// FIXME: rv64 `sh` and `ls` will crash if stack top > 0x80000000 ???

22
kernel/src/arch/riscv32/context.rs
Unescape View File

@ -1,10 +1,3 @@
#[cfg(feature = "m_mode")]
use riscv::register::{
mstatus as xstatus,
mstatus::Mstatus as Xstatus,
mcause::Mcause,
};
#[cfg(not(feature = "m_mode"))]
use riscv::register::{
sstatus as xstatus,
sstatus::Sstatus as Xstatus,
@ -41,14 +34,6 @@ impl TrapFrame {
tf.x[2] = sp;
tf.sepc = entry as usize;
tf.sstatus = xstatus::read();
#[cfg(feature = "m_mode")]
{
tf.sstatus.set_mpie(true);
tf.sstatus.set_mie(false);
tf.sstatus.set_mpp(xstatus::MPP::Machine);
}
#[cfg(not(feature = "m_mode"))]
{
tf.sstatus.set_spie(true);
tf.sstatus.set_sie(false);
@ -72,13 +57,6 @@ impl TrapFrame {
tf.x[2] = sp;
tf.sepc = entry_addr;
tf.sstatus = xstatus::read();
#[cfg(feature = "m_mode")]
{
tf.sstatus.set_mpie(true);
tf.sstatus.set_mie(false);
tf.sstatus.set_mpp(xstatus::MPP::User);
}
#[cfg(not(feature = "m_mode"))]
{
tf.sstatus.set_spie(true);
tf.sstatus.set_sie(false);

3
kernel/src/arch/riscv32/cpu.rs
Unescape View File

@ -9,10 +9,7 @@ pub unsafe fn set_cpu_id(cpu_id: usize) {
pub fn id() -> usize {
let cpu_id;
#[cfg(not(feature = "m_mode"))]
unsafe { asm!("mv $0, gp" : "=r"(cpu_id)); }
#[cfg(feature = "m_mode")]
unsafe { asm!("csrr $0, mhartid" : "=r"(cpu_id)); }
cpu_id
}

28
kernel/src/arch/riscv32/interrupt.rs
Unescape View File

@ -1,10 +1,3 @@
#[cfg(feature = "m_mode")]
use riscv::register::{
mstatus as xstatus,
mscratch as xscratch,
mtvec as xtvec,
};
#[cfg(not(feature = "m_mode"))]
use riscv::register::{
sstatus as xstatus,
sscratch as xscratch,
@ -36,9 +29,6 @@ pub fn init() {
sie::set_ssoft();
// Enable external interrupt
if super::cpu::id() == super::BOOT_HART_ID {
#[cfg(feature = "m_mode")]
mie::set_mext();
#[cfg(not(feature = "m_mode"))]
sie::set_sext();
// NOTE: In M-mode: mie.MSIE is set by BBL.
// mie.MEIE can not be set in QEMU v3.0
@ -54,28 +44,10 @@ pub fn init() {
*/
#[inline]
pub unsafe fn enable() {
#[cfg(feature = "m_mode")]
xstatus::set_mie();
#[cfg(not(feature = "m_mode"))]
xstatus::set_sie();
}
/*
* @brief:
* store and disable interrupt
* @retbal:
* a usize value store the origin sie
*/
#[inline]
#[cfg(feature = "m_mode")]
pub unsafe fn disable_and_store() -> usize {
let e = xstatus::read().mie() as usize;
xstatus::clear_mie();
e
}
#[inline]
#[cfg(not(feature = "m_mode"))]
pub unsafe fn disable_and_store() -> usize {
let e = xstatus::read().sie() as usize;
xstatus::clear_sie();

30
kernel/src/arch/riscv32/io.rs
Unescape View File

@ -19,36 +19,16 @@ impl Write for SerialPort {
}
fn putchar(c: u8) {
if cfg!(feature = "board_k210") {
unsafe {
while TXDATA.read_volatile() & (1 << 31) != 0 {}
(TXDATA as *mut u8).write_volatile(c as u8);
if cfg!(feature = "board_u540") {
if c == b'\n' {
sbi::console_putchar(b'\r' as usize);
}
} else if cfg!(feature = "m_mode") {
(super::BBL.mcall_console_putchar)(c);
} else {
if cfg!(feature = "board_u540") {
if c == b'\n' {
sbi::console_putchar(b'\r' as usize);
}
}
sbi::console_putchar(c as usize);
}
sbi::console_putchar(c as usize);
}
pub fn getchar() -> char {
let c = if cfg!(feature = "board_k210") {
loop {
let rxdata = unsafe { RXDATA.read_volatile() };
if rxdata & (1 << 31) == 0 {
break rxdata as u8;
}
}
} else if cfg!(feature = "m_mode") {
(super::BBL.mcall_console_getchar)() as u8
} else {
sbi::console_getchar() as u8
};
let c = sbi::console_getchar() as u8;
match c {
255 => '\0', // null

12
kernel/src/arch/riscv32/memory.rs
Unescape View File

@ -6,21 +6,10 @@ use crate::memory::{FRAME_ALLOCATOR, init_heap, MemoryAttr, MemorySet, Linear};
use crate::consts::{MEMORY_OFFSET, MEMORY_END, KERNEL_OFFSET};
use riscv::register::satp;
#[cfg(feature = "no_mmu")]
pub fn init(_dtb: usize) {
init_heap();
let heap_bottom = end as usize;
let heap_size = MEMORY_END - heap_bottom;
unsafe { crate::memory::MEMORY_ALLOCATOR.lock().init(heap_bottom, heap_size); }
info!("available memory: [{:#x}, {:#x})", heap_bottom, MEMORY_END);
}
/*
* @brief:
* Init the mermory management module, allow memory access and set up page table and init heap and frame allocator
*/
#[cfg(not(feature = "no_mmu"))]
pub fn init(dtb: usize) {
unsafe { sstatus::set_sum(); } // Allow user memory access
// initialize heap and Frame allocator
@ -69,7 +58,6 @@ fn init_frame_allocator() {
}
/// Remap the kernel memory address with 4K page recorded in p1 page table
#[cfg(not(feature = "no_mmu"))]
fn remap_the_kernel(dtb: usize) {
let offset = -(KERNEL_OFFSET as isize - MEMORY_OFFSET as isize);
let mut ms = MemorySet::new_bare();

16
kernel/src/arch/riscv32/mod.rs
Unescape View File

@ -61,20 +61,6 @@ const BOOT_HART_ID: usize = 0;
const BOOT_HART_ID: usize = 1;
/// Constant & Macro for `trap.asm`
#[cfg(feature = "m_mode")]
global_asm!("
.equ xstatus, 0x300
.equ xscratch, 0x340
.equ xepc, 0x341
.equ xcause, 0x342
.equ xtval, 0x343
.macro XRET\n mret\n .endm
.macro TEST_BACK_TO_KERNEL // s0 == back to kernel?
li s3, 3 << 11
and s0, s1, s3 // mstatus.MPP = 3
.endm
");
#[cfg(not(feature = "m_mode"))]
global_asm!("
.equ xstatus, 0x100
.equ xscratch, 0x140
@ -111,8 +97,6 @@ global_asm!(r"
");
#[cfg(feature = "board_k210")]
global_asm!(include_str!("board/k210/boot.asm"));
global_asm!(include_str!("boot/entry.asm"));
global_asm!(include_str!("boot/trap.asm"));

21
kernel/src/arch/riscv32/timer.rs
Unescape View File

@ -38,12 +38,7 @@ pub fn read_epoch() -> u64 {
*/
pub fn init() {
// Enable supervisor timer interrupt
#[cfg(feature = "m_mode")]
unsafe { mie::set_mtimer(); }
#[cfg(not(feature = "m_mode"))]
unsafe { sie::set_stimer(); }
#[cfg(feature = "board_k210")]
unsafe { assert_eq!(clint_timer_init(), 0); }
set_next();
info!("timer: init end");
}
@ -52,24 +47,8 @@ pub fn init() {
* @brief:
* set the next timer interrupt
*/
#[cfg(not(feature = "board_k210"))]
pub fn set_next() {
// 100Hz @ QEMU
let timebase = 250000;
sbi::set_timer(get_cycle() + timebase);
}
#[cfg(feature = "board_k210")]
pub fn set_next() {
unsafe {
assert_eq!(clint_timer_start(10, true), 0);
mstatus::clear_mie(); // mie is set on 'clint_timer_start'
}
}
#[link(name = "kendryte")]
#[cfg(feature = "board_k210")]
extern "C" {
fn clint_timer_init() -> i32;
fn clint_timer_start(interval_ms: u64, single_shot: bool) -> i32;
}

8
kernel/src/fs/stdio.rs
Unescape View File

@ -22,13 +22,7 @@ impl Stdin {
pub fn pop(&self) -> char {
// QEMU v3.0 don't support M-mode external interrupt (bug?)
// So we have to use polling.
#[cfg(feature = "m_mode")]
loop {
let c = crate::arch::io::getchar();
if c != '\0' { return c; }
}
#[cfg(not(feature = "m_mode"))]
loop {
loop {
let ret = self.buf.lock().pop_front();
match ret {
Some(c) => return c,

22
kernel/src/memory.rs
Unescape View File

@ -10,12 +10,8 @@ use lazy_static::*;
use log::*;
use buddy_system_allocator::LockedHeap;
#[cfg(not(feature = "no_mmu"))]
pub type MemorySet = rcore_memory::memory_set::MemorySet<InactivePageTable0>;
#[cfg(feature = "no_mmu")]
pub type MemorySet = rcore_memory::no_mmu::MemorySet<NoMMUSupportImpl>;
// x86_64 support up to 64G memory
#[cfg(target_arch = "x86_64")]
pub type FrameAlloc = bit_allocator::BitAlloc16M;
@ -99,7 +95,6 @@ impl Drop for KernelStack {
/// Handle page fault at `addr`.
/// Return true to continue, false to halt.
#[cfg(not(feature = "no_mmu"))]
pub fn handle_page_fault(addr: usize) -> bool {
debug!("page fault @ {:#x}", addr);
@ -117,19 +112,4 @@ pub fn init_heap() {
}
/// Allocator for the rest memory space on NO-MMU case.
pub static MEMORY_ALLOCATOR: LockedHeap = LockedHeap::empty();
#[derive(Debug, Clone, Copy)]
pub struct NoMMUSupportImpl;
impl rcore_memory::no_mmu::NoMMUSupport for NoMMUSupportImpl {
type Alloc = LockedHeap;
fn allocator() -> &'static Self::Alloc {
&MEMORY_ALLOCATOR
}
}
#[cfg(feature = "no_mmu")]
pub fn handle_page_fault(_addr: usize) -> bool {
unreachable!()
}
pub static MEMORY_ALLOCATOR: LockedHeap = LockedHeap::empty();

16
kernel/src/process/structs.rs
Unescape View File

@ -192,7 +192,6 @@ impl Thread {
match elf.header.pt2.type_().as_type() {
header::Type::Executable => {
// #[cfg(feature = "no_mmu")]
// panic!("ELF is not shared object");
},
header::Type::SharedObject => {},
@ -232,7 +231,6 @@ impl Thread {
// User stack
use crate::consts::{USER_STACK_OFFSET, USER_STACK_SIZE, USER32_STACK_OFFSET};
#[cfg(not(feature = "no_mmu"))]
let mut ustack_top = {
let (ustack_buttom, ustack_top) = match is32 {
true => (USER32_STACK_OFFSET, USER32_STACK_OFFSET + USER_STACK_SIZE),
@ -241,8 +239,6 @@ impl Thread {
vm.push(ustack_buttom, ustack_top, MemoryAttr::default().user(), ByFrame::new(GlobalFrameAlloc), "user_stack");
ustack_top
};
#[cfg(feature = "no_mmu")]
let mut ustack_top = vm.push(USER_STACK_SIZE).as_ptr() as usize + USER_STACK_SIZE;
let init_info = ProcInitInfo {
args: args.map(|s| String::from(s)).collect(),
@ -311,7 +307,6 @@ impl Thread {
// MMU: copy data to the new space
// NoMMU: coping data has been done in `vm.clone()`
#[cfg(not(feature = "no_mmu"))]
for area in vm.iter() {
let data = Vec::<u8>::from(unsafe { area.as_slice() });
unsafe { vm.with(|| {
@ -397,12 +392,6 @@ fn memory_set_from(elf: &ElfFile<'_>) -> (MemorySet, usize) {
.filter(|ph| ph.get_type() == Ok(Type::Load))
.map(|ph| ph.virtual_addr() + ph.mem_size()).max().unwrap() as usize;
let va_size = va_end - va_begin;
#[cfg(feature = "no_mmu")]
let target = ms.push(va_size);
#[cfg(feature = "no_mmu")]
{ entry = entry - va_begin + target.as_ptr() as usize; }
#[cfg(feature = "board_k210")]
{ entry += 0x40000000; }
for ph in elf.program_iter() {
if ph.get_type() != Ok(Type::Load) {
@ -414,11 +403,6 @@ fn memory_set_from(elf: &ElfFile<'_>) -> (MemorySet, usize) {
let mem_size = ph.mem_size() as usize;
// Get target slice
#[cfg(feature = "no_mmu")]
let target = &mut target[virt_addr - va_begin..virt_addr - va_begin + mem_size];
#[cfg(feature = "no_mmu")]
debug!("area @ {:?}, size = {:#x}", target.as_ptr(), mem_size);
#[cfg(not(feature = "no_mmu"))]
let target = {
ms.push(virt_addr, virt_addr + mem_size, ph.flags().to_attr(), ByFrame::new(GlobalFrameAlloc), "");
unsafe { ::core::slice::from_raw_parts_mut(virt_addr as *mut u8, mem_size) }

829
tools/k210/kflash.py
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save