From owner-svn-src-all@freebsd.org Mon Jul 27 16:28:45 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 78D6D367CC3; Mon, 27 Jul 2020 16:28:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BFlcF2dV7z415q; Mon, 27 Jul 2020 16:28:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3DA81205CC; Mon, 27 Jul 2020 16:28:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06RGSjcr051447; Mon, 27 Jul 2020 16:28:45 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06RGSjT7051446; Mon, 27 Jul 2020 16:28:45 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202007271628.06RGSjT7051446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 27 Jul 2020 16:28:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r363614 - head/sys/riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/riscv/riscv X-SVN-Commit-Revision: 363614 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2020 16:28:45 -0000 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: