From owner-svn-src-head@freebsd.org Wed May 16 16:56:37 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1996FEED405; Wed, 16 May 2018 16:56:37 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C114D710C7; Wed, 16 May 2018 16:56:36 +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 9D9111CDD2; Wed, 16 May 2018 16:56:36 +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 w4GGuaBu097212; Wed, 16 May 2018 16:56:36 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4GGuasU097210; Wed, 16 May 2018 16:56:36 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201805161656.w4GGuasU097210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 16 May 2018 16:56:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333679 - in head: sys/riscv/include tests/sys/kern X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head: sys/riscv/include tests/sys/kern X-SVN-Commit-Revision: 333679 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2018 16:56:37 -0000 Author: jhb Date: Wed May 16 16:56:35 2018 New Revision: 333679 URL: https://svnweb.freebsd.org/changeset/base/333679 Log: Export a breakpoint() function to userland for riscv. As a result, enable tests using breakpoint() on riscv. Reviewed by: br Differential Revision: https://reviews.freebsd.org/D15191 Modified: head/sys/riscv/include/cpufunc.h head/tests/sys/kern/ptrace_test.c Modified: head/sys/riscv/include/cpufunc.h ============================================================================== --- head/sys/riscv/include/cpufunc.h Wed May 16 14:06:41 2018 (r333678) +++ head/sys/riscv/include/cpufunc.h Wed May 16 16:56:35 2018 (r333679) @@ -37,16 +37,16 @@ #ifndef _MACHINE_CPUFUNC_H_ #define _MACHINE_CPUFUNC_H_ -#ifdef _KERNEL - -#include - static __inline void breakpoint(void) { __asm("ebreak"); } + +#ifdef _KERNEL + +#include static __inline register_t intr_disable(void) Modified: head/tests/sys/kern/ptrace_test.c ============================================================================== --- head/tests/sys/kern/ptrace_test.c Wed May 16 14:06:41 2018 (r333678) +++ head/tests/sys/kern/ptrace_test.c Wed May 16 16:56:35 2018 (r333679) @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); * Architectures with a user-visible breakpoint(). */ #if defined(__amd64__) || defined(__i386__) || defined(__mips__) || \ - defined(__sparc64__) + defined(__riscv) || defined(__sparc64__) #define HAVE_BREAKPOINT #endif @@ -67,6 +67,8 @@ __FBSDID("$FreeBSD$"); #define SKIP_BREAK(reg) #elif defined(__mips__) #define SKIP_BREAK(reg) ((reg)->r_regs[PC] += 4) +#elif defined(__riscv) +#define SKIP_BREAK(reg) ((reg)->sepc += 4) #elif defined(__sparc64__) #define SKIP_BREAK(reg) do { \ (reg)->r_tpc = (reg)->r_tnpc + 4; \