svn commit: r363614 - head/sys/riscv/riscv

[John Baldwin]

Author: jhb
Date: Mon Jul 27 16:28:44 2020
New Revision: 363614
URL: https://svnweb.freebsd.org/changeset/base/363614

Log:
  Set si_trapno to the exception code from scause.
  
  Reviewed by:  kib
  Obtained from:        CheriBSD
  Sponsored by: DARPA
  Differential Revision:        https://reviews.freebsd.org/D25770

Modified:
  head/sys/riscv/riscv/trap.c

Modified: head/sys/riscv/riscv/trap.c
==============================================================================
--- head/sys/riscv/riscv/trap.c Mon Jul 27 16:25:18 2020        (r363613)
+++ head/sys/riscv/riscv/trap.c Mon Jul 27 16:28:44 2020        (r363614)
@@ -80,7 +80,7 @@ void do_trap_supervisor(struct trapframe *);
 void do_trap_user(struct trapframe *);
 
 static __inline void
-call_trapsignal(struct thread *td, int sig, int code, void *addr)
+call_trapsignal(struct thread *td, int sig, int code, void *addr, int trapno)
 {
        ksiginfo_t ksi;
 
@@ -88,6 +88,7 @@ call_trapsignal(struct thread *td, int sig, int code, 
        ksi.ksi_signo = sig;
        ksi.ksi_code = code;
        ksi.ksi_addr = addr;
+       ksi.ksi_trapno = trapno;
        trapsignal(td, &ksi);
 }
 
@@ -224,7 +225,8 @@ data_abort(struct trapframe *frame, int usermode)
        error = vm_fault_trap(map, va, ftype, VM_FAULT_NORMAL, &sig, &ucode);
        if (error != KERN_SUCCESS) {
                if (usermode) {
-                       call_trapsignal(td, sig, ucode, (void *)stval);
+                       call_trapsignal(td, sig, ucode, (void *)stval,
+                           frame->tf_scause & EXCP_MASK);
                } else {
                        if (pcb->pcb_onfault != 0) {
                                frame->tf_a[0] = error;
@@ -353,11 +355,13 @@ do_trap_user(struct trapframe *frame)
                        break;
                }
 #endif
-               call_trapsignal(td, SIGILL, ILL_ILLTRP, (void *)frame->tf_sepc);
+               call_trapsignal(td, SIGILL, ILL_ILLTRP, (void *)frame->tf_sepc,
+                   exception);
                userret(td, frame);
                break;
        case EXCP_BREAKPOINT:
-               call_trapsignal(td, SIGTRAP, TRAP_BRKPT, (void 
*)frame->tf_sepc);
+               call_trapsignal(td, SIGTRAP, TRAP_BRKPT, (void *)frame->tf_sepc,
+                   exception);
                userret(td, frame);
                break;
        default:
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"