From owner-svn-src-head@FreeBSD.ORG Tue Mar 11 15:46:04 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32079267; Tue, 11 Mar 2014 15:46: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 071CC779; Tue, 11 Mar 2014 15:46: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 s2BFk3Aw054167; Tue, 11 Mar 2014 15:46:03 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BFk3e5054166; Tue, 11 Mar 2014 15:46:03 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201403111546.s2BFk3e5054166@svn.freebsd.org> From: Ian Lepore Date: Tue, 11 Mar 2014 15:46:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263030 - 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-head@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 11 Mar 2014 15:46:04 -0000 Author: ian Date: Tue Mar 11 15:46:03 2014 New Revision: 263030 URL: http://svnweb.freebsd.org/changeset/base/263030 Log: Remove some unnecessary indirection and jump right to the handler functions. Modified: head/sys/arm/arm/exception.S Modified: head/sys/arm/arm/exception.S ============================================================================== --- head/sys/arm/arm/exception.S Tue Mar 11 15:43:06 2014 (r263029) +++ head/sys/arm/arm/exception.S Tue Mar 11 15:46:03 2014 (r263030) @@ -322,20 +322,9 @@ ASENTRY_NP(prefetch_abort_entry) sub lr, lr, #0x00000004 /* Adjust the lr */ PUSHFRAMEINSVC - ldr r1, Lprefetch_abort_handler_address adr lr, exception_exit mov r0, sp /* pass the stack pointer as r0 */ - ldr pc, [r1] - -Lprefetch_abort_handler_address: - .word _C_LABEL(prefetch_abort_handler_address) - - .data - .global _C_LABEL(prefetch_abort_handler_address) - -_C_LABEL(prefetch_abort_handler_address): - .word prefetch_abort_handler - + b prefetch_abort_handler END(prefetch_abort_entry) /* @@ -352,18 +341,9 @@ ASENTRY_NP(data_abort_entry) sub lr, lr, #0x00000008 /* Adjust the lr */ PUSHFRAMEINSVC /* Push trap frame and switch */ /* to SVC32 mode */ - ldr r1, Ldata_abort_handler_address adr lr, exception_exit mov r0, sp /* pass the stack pointer as r0 */ - ldr pc, [r1] -Ldata_abort_handler_address: - .word _C_LABEL(data_abort_handler_address) - - .data - .global _C_LABEL(data_abort_handler_address) -_C_LABEL(data_abort_handler_address): - .word data_abort_handler - + b data_abort_handler END(data_abort_entry) /* @@ -435,23 +415,10 @@ ASENTRY_NP(undefined_entry) sub lr, lr, #0x00000004 /* Adjust the lr */ PUSHFRAMEINSVC /* Push trap frame and switch */ /* to SVC32 mode */ - ldr r1, Lundefined_handler_address adr lr, exception_exit mov r0, sp /* pass the stack pointer as r0 */ - ldr pc, [r1] -END(undefined_entry) - -ASENTRY_NP(undefinedinstruction_bounce) b undefinedinstruction -END(undefinedinstruction_bounce) - -Lundefined_handler_address: - .word _C_LABEL(undefined_handler_address) - - .data - .global _C_LABEL(undefined_handler_address) -_C_LABEL(undefined_handler_address): - .word undefinedinstruction_bounce +END(undefined_entry) /* * Entry point for FIQ interrupts.