Support efault fixup for riscv

master
Jiajie Chen 6 years ago
parent 92a9674f66
commit 6344f80a9b

@ -17,6 +17,9 @@ SECTIONS
.text : { .text : {
stext = .; stext = .;
*(.text.entry) *(.text.entry)
_copy_user_start = .;
*(.text.copy_user)
_copy_user_end = .;
*(.text .text.*) *(.text .text.*)
. = ALIGN(4K); . = ALIGN(4K);
etext = .; etext = .;

@ -17,6 +17,9 @@ SECTIONS
.text : { .text : {
stext = .; stext = .;
*(.text.entry) *(.text.entry)
_copy_user_start = .;
*(.text.copy_user)
_copy_user_end = .;
*(.text .text.*) *(.text .text.*)
. = ALIGN(4K); . = ALIGN(4K);
etext = .; etext = .;

@ -17,6 +17,9 @@ SECTIONS
.text : { .text : {
stext = .; stext = .;
*(.text.entry) *(.text.entry)
_copy_user_start = .;
*(.text.copy_user)
_copy_user_end = .;
*(.text .text.*) *(.text .text.*)
. = ALIGN(4K); . = ALIGN(4K);
etext = .; etext = .;

@ -22,6 +22,9 @@ SECTIONS
.text : { .text : {
stext = .; stext = .;
*(.text.entry) *(.text.entry)
_copy_user_start = .;
*(.text.copy_user)
_copy_user_end = .;
*(.text .text.*) *(.text .text.*)
. = ALIGN(4K); . = ALIGN(4K);
etext = .; etext = .;

@ -17,6 +17,9 @@ SECTIONS
.text : { .text : {
stext = .; stext = .;
*(.text.entry) *(.text.entry)
_copy_user_start = .;
*(.text.copy_user)
_copy_user_end = .;
*(.text .text.*) *(.text .text.*)
. = ALIGN(4K); . = ALIGN(4K);
etext = .; etext = .;

@ -132,6 +132,15 @@ fn page_fault(tf: &mut TrapFrame) {
trace!("\nEXCEPTION: Page Fault @ {:#x}", addr); trace!("\nEXCEPTION: Page Fault @ {:#x}", addr);
if !crate::memory::handle_page_fault(addr) { if !crate::memory::handle_page_fault(addr) {
extern "C" {
fn _copy_user_start();
fn _copy_user_end();
}
if tf.sepc >= _copy_user_start as usize && tf.sepc < _copy_user_end as usize {
debug!("fixup for addr {:x?}", addr);
tf.sepc = crate::memory::read_user_fixup as usize;
return;
}
crate::trap::error(tf); crate::trap::error(tf);
} }
} }

@ -1 +1 @@
Subproject commit ad822e6d3b626b598874bb52a407e90f549c5ab9 Subproject commit bf02e72b85784af3555c7abe6b985aefc215023e
Loading…
Cancel
Save