From owner-svn-src-all@FreeBSD.ORG Tue Mar 11 16:53:04 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 50943A13; Tue, 11 Mar 2014 16:53:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3D62EDBE; Tue, 11 Mar 2014 16:53:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BGr4QI082502; Tue, 11 Mar 2014 16:53:04 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BGr4Za082501; Tue, 11 Mar 2014 16:53:04 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201403111653.s2BGr4Za082501@svn.freebsd.org> From: Ian Lepore Date: Tue, 11 Mar 2014 16:53:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263034 - head/sys/arm/arm 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.17 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: Tue, 11 Mar 2014 16:53:04 -0000 Author: ian Date: Tue Mar 11 16:53:03 2014 New Revision: 263034 URL: http://svnweb.freebsd.org/changeset/base/263034 Log: Use panic rather than printf to "handle" an arm26 address exception (should never happen on arm32). Pass the right arguments to panic for the reset exception (which also should never happen). Modified: head/sys/arm/arm/exception.S Modified: head/sys/arm/arm/exception.S ============================================================================== --- head/sys/arm/arm/exception.S Tue Mar 11 16:48:46 2014 (r263033) +++ head/sys/arm/arm/exception.S Tue Mar 11 16:53:03 2014 (r263034) @@ -379,7 +379,6 @@ END(irq_entry) * install itself in the FIQ vector using code (that may or may not work * these days) in fiq.c. If nobody does that and an FIQ happens, this * default handler just disables FIQs and otherwise ignores it. - */ ASENTRY_NP(fiq_entry) mrs r8, cpsr /* FIQ handling isn't supported, */ @@ -393,12 +392,11 @@ END(fiq_entry) * This is an arm26 exception that should never happen. */ ASENTRY_NP(addr_exception_entry) - mrs r1, cpsr - mrs r2, spsr mov r3, lr + mrs r2, spsr + mrs r1, cpsr adr r0, Laddr_exception_msg - bl _C_LABEL(printf) /* XXX CLOBBERS LR!! */ - b data_abort_entry + b _C_LABEL(panic) Laddr_exception_msg: .asciz "Address Exception CPSR=0x%08x SPSR=0x%08x LR=0x%08x\n" .balign 4 @@ -409,8 +407,9 @@ END(addr_exception_entry) * This should never happen, so panic. */ ASENTRY_NP(reset_entry) + mov r1, lr adr r0, Lreset_panicmsg - bl _C_LABEL(panic) + b _C_LABEL(panic) /* NOTREACHED */ Lreset_panicmsg: .asciz "Reset vector called, LR = 0x%08x"