From owner-svn-src-all@freebsd.org Mon Feb 22 14:54:52 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A810AAF79B; Mon, 22 Feb 2016 14:54:52 +0000 (UTC) (envelope-from br@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 mx1.freebsd.org (Postfix) with ESMTPS id 382821E80; Mon, 22 Feb 2016 14:54:52 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1MEsp7g093659; Mon, 22 Feb 2016 14:54:51 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1MEspOc093658; Mon, 22 Feb 2016 14:54:51 GMT (envelope-from br@FreeBSD.org) Message-Id: <201602221454.u1MEspOc093658@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Mon, 22 Feb 2016 14:54:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295893 - head/sys/riscv/riscv X-SVN-Group: head 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.20 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, 22 Feb 2016 14:54:52 -0000 Author: br Date: Mon Feb 22 14:54:50 2016 New Revision: 295893 URL: https://svnweb.freebsd.org/changeset/base/295893 Log: Add basic trap handlers for illegal instruction and breakpoint exceptions. Modified: head/sys/riscv/riscv/trap.c Modified: head/sys/riscv/riscv/trap.c ============================================================================== --- head/sys/riscv/riscv/trap.c Mon Feb 22 14:19:45 2016 (r295892) +++ head/sys/riscv/riscv/trap.c Mon Feb 22 14:54:50 2016 (r295893) @@ -270,6 +270,17 @@ do_trap_supervisor(struct trapframe *fra case EXCP_INSTR_ACCESS_FAULT: data_abort(frame, 0); break; + case EXCP_INSTR_BREAKPOINT: +#ifdef KDB + kdb_trap(exception, 0, frame); +#else + dump_regs(frame); + panic("No debugger in kernel.\n"); +#endif + case EXCP_INSTR_ILLEGAL: + dump_regs(frame); + panic("Illegal instruction at %x\n", frame->tf_sepc); + break; default: dump_regs(frame); panic("Unknown kernel exception %x badaddr %lx\n", @@ -281,6 +292,10 @@ void do_trap_user(struct trapframe *frame) { uint64_t exception; + struct thread *td; + + td = curthread; + td->td_frame = frame; exception = (frame->tf_scause & EXCP_MASK); if (frame->tf_scause & EXCP_INTR) { @@ -302,6 +317,14 @@ do_trap_user(struct trapframe *frame) frame->tf_sepc += 4; /* Next instruction */ svc_handler(frame); break; + case EXCP_INSTR_ILLEGAL: + call_trapsignal(td, SIGILL, ILL_ILLTRP, (void *)frame->tf_sepc); + userret(td, frame); + break; + case EXCP_INSTR_BREAKPOINT: + call_trapsignal(td, SIGTRAP, TRAP_BRKPT, (void *)frame->tf_sepc); + userret(td, frame); + break; default: dump_regs(frame); panic("Unknown userland exception %x badaddr %lx\n",