Skip to content

Commit 4096048

Browse files
authored
Merge pull request #8 from wyfcyx/main
Support virtio0 in pmp config
2 parents 9885e74 + 67beb76 commit 4096048

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

rustsbi-qemu/src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ fn set_pmp() {
150150
// todo: 根据QEMU的loader device等等,设置这里的权限配置
151151
unsafe {
152152
asm!(
153-
"li {tmp}, ((0x08 << 16) |(0x1F << 8) | (0x1F << 0) )", // 0 = NAPOT,ARWX; 1 = NAPOT,ARWX; 2 = TOR,A;
153+
"li {tmp}, ((0x08 << 16) | (0x1F << 8) | (0x1F << 0) )", // 0 = NAPOT,ARWX; 1 = NAPOT,ARWX; 2 = TOR,A;
154154
"csrw 0x3A0, {tmp}",
155-
"li {tmp}, ((0x0000000080000000 >> 2) | 0x3ffffff)", // 0 = 0x0000000080000000-0x000000008fffffff
155+
"li {tmp}, ((0x0000000010001000 >> 2) | 0x3ff)", // 0 = 0x0000000010001000-0x0000000010001fff
156156
"csrw 0x3B0, {tmp}",
157-
"li {tmp}, ((0x0000000010001000 >> 2) | 0x3ff)", // 1 = 0x0000000010001000-0x0000000010001fff
157+
"li {tmp}, ((0x0000000080000000 >> 2) | 0x3ffffff)", // 1 = 0x0000000080000000-0x000000008fffffff
158158
"csrw 0x3B1, {tmp}",
159159
"sfence.vma",
160160
tmp = out(reg) _
@@ -178,7 +178,7 @@ unsafe extern "C" fn entry(_a0: usize, _a1: usize) -> ! {
178178
bnez t1, 1b
179179
",
180180
// 2. jump to rust_main (absolute address)
181-
"j {rust_main}",
181+
"j {rust_main}",
182182
per_hart_stack_size = const PER_HART_STACK_SIZE,
183183
stack = sym SBI_STACK,
184184
rust_main = sym rust_main,

0 commit comments

Comments
 (0)