Author: markj
Date: Wed Jan 2 16:41:39 2019
New Revision: 342697
URL: https://svnweb.freebsd.org/changeset/base/342697
Log:
MFC r342223:
Replace uses of sbadaddr with stval.
Modified:
stable/12/sys/riscv/include/frame.h
stable/12/sys/riscv/riscv/db_interface.c
stable/12/sys/riscv/riscv/exception.S
stable/12/sys/riscv/riscv/genassym.c
stable/12/sys/riscv/riscv/trap.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/riscv/include/frame.h
==============================================================================
--- stable/12/sys/riscv/include/frame.h Wed Jan 2 16:40:54 2019
(r342696)
+++ stable/12/sys/riscv/include/frame.h Wed Jan 2 16:41:39 2019
(r342697)
@@ -55,7 +55,7 @@ struct trapframe {
uint64_t tf_a[8];
uint64_t tf_sepc;
uint64_t tf_sstatus;
- uint64_t tf_sbadaddr;
+ uint64_t tf_stval;
uint64_t tf_scause;
};
Modified: stable/12/sys/riscv/riscv/db_interface.c
==============================================================================
--- stable/12/sys/riscv/riscv/db_interface.c Wed Jan 2 16:40:54 2019
(r342696)
+++ stable/12/sys/riscv/riscv/db_interface.c Wed Jan 2 16:41:39 2019
(r342697)
@@ -98,7 +98,7 @@ struct db_variable db_regs[] = {
{ "a7", DB_OFFSET(tf_a[7]), db_frame },
{ "sepc", DB_OFFSET(tf_sepc), db_frame },
{ "sstatus", DB_OFFSET(tf_sstatus), db_frame },
- { "sbadaddr", DB_OFFSET(tf_sbadaddr), db_frame },
+ { "stval", DB_OFFSET(tf_stval), db_frame },
{ "scause", DB_OFFSET(tf_scause), db_frame },
};
Modified: stable/12/sys/riscv/riscv/exception.S
==============================================================================
--- stable/12/sys/riscv/riscv/exception.S Wed Jan 2 16:40:54 2019
(r342696)
+++ stable/12/sys/riscv/riscv/exception.S Wed Jan 2 16:41:39 2019
(r342697)
@@ -107,8 +107,8 @@ __FBSDID("$FreeBSD$");
sd t0, (TF_SEPC)(sp)
csrr t0, sstatus
sd t0, (TF_SSTATUS)(sp)
- csrr t0, sbadaddr
- sd t0, (TF_SBADADDR)(sp)
+ csrr t0, stval
+ sd t0, (TF_STVAL)(sp)
csrr t0, scause
sd t0, (TF_SCAUSE)(sp)
.endm
Modified: stable/12/sys/riscv/riscv/genassym.c
==============================================================================
--- stable/12/sys/riscv/riscv/genassym.c Wed Jan 2 16:40:54 2019
(r342696)
+++ stable/12/sys/riscv/riscv/genassym.c Wed Jan 2 16:41:39 2019
(r342697)
@@ -96,6 +96,6 @@ ASSYM(TF_T, offsetof(struct trapframe, tf_t));
ASSYM(TF_S, offsetof(struct trapframe, tf_s));
ASSYM(TF_A, offsetof(struct trapframe, tf_a));
ASSYM(TF_SEPC, offsetof(struct trapframe, tf_sepc));
-ASSYM(TF_SBADADDR, offsetof(struct trapframe, tf_sbadaddr));
+ASSYM(TF_STVAL, offsetof(struct trapframe, tf_stval));
ASSYM(TF_SCAUSE, offsetof(struct trapframe, tf_scause));
ASSYM(TF_SSTATUS, offsetof(struct trapframe, tf_sstatus));
Modified: stable/12/sys/riscv/riscv/trap.c
==============================================================================
--- stable/12/sys/riscv/riscv/trap.c Wed Jan 2 16:40:54 2019
(r342696)
+++ stable/12/sys/riscv/riscv/trap.c Wed Jan 2 16:41:39 2019
(r342697)
@@ -170,7 +170,7 @@ static void
data_abort(struct trapframe *frame, int usermode)
{
struct vm_map *map;
- uint64_t sbadaddr;
+ uint64_t stval;
struct thread *td;
struct pcb *pcb;
vm_prot_t ftype;
@@ -188,7 +188,7 @@ data_abort(struct trapframe *frame, int usermode)
td = curthread;
p = td->td_proc;
pcb = td->td_pcb;
- sbadaddr = frame->tf_sbadaddr;
+ stval = frame->tf_stval;
if (td->td_critnest != 0 || td->td_intr_nesting_level != 0 ||
WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL,
@@ -197,7 +197,7 @@ data_abort(struct trapframe *frame, int usermode)
if (usermode)
map = &td->td_proc->p_vmspace->vm_map;
- else if (sbadaddr >= VM_MAX_USER_ADDRESS)
+ else if (stval >= VM_MAX_USER_ADDRESS)
map = kernel_map;
else {
if (pcb->pcb_onfault == 0)
@@ -205,7 +205,7 @@ data_abort(struct trapframe *frame, int usermode)
map = &td->td_proc->p_vmspace->vm_map;
}
- va = trunc_page(sbadaddr);
+ va = trunc_page(stval);
if ((frame->tf_scause == EXCP_FAULT_STORE) ||
(frame->tf_scause == EXCP_STORE_PAGE_FAULT)) {
@@ -247,7 +247,7 @@ data_abort(struct trapframe *frame, int usermode)
ucode = SEGV_ACCERR;
else
ucode = SEGV_MAPERR;
- call_trapsignal(td, sig, ucode, (void *)sbadaddr);
+ call_trapsignal(td, sig, ucode, (void *)stval);
} else {
if (pcb->pcb_onfault != 0) {
frame->tf_a[0] = error;
@@ -265,7 +265,7 @@ done:
fatal:
dump_regs(frame);
- panic("Fatal page fault at %#lx: %#016lx", frame->tf_sepc, sbadaddr);
+ panic("Fatal page fault at %#lx: %#016lx", frame->tf_sepc, stval);
}
void
@@ -322,8 +322,8 @@ do_trap_supervisor(struct trapframe *frame)
break;
default:
dump_regs(frame);
- panic("Unknown kernel exception %x badaddr %lx\n",
- exception, frame->tf_sbadaddr);
+ panic("Unknown kernel exception %x trap value %lx\n",
+ exception, frame->tf_stval);
}
}
@@ -390,7 +390,7 @@ do_trap_user(struct trapframe *frame)
break;
default:
dump_regs(frame);
- panic("Unknown userland exception %x, badaddr %lx\n",
- exception, frame->tf_sbadaddr);
+ panic("Unknown userland exception %x, trap value %lx\n",
+ exception, frame->tf_stval);
}
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
