From owner-svn-src-head@FreeBSD.ORG Mon May 11 18:52:07 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3FC092EF; Mon, 11 May 2015 18:52:07 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E08C1AF0; Mon, 11 May 2015 18:52:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4BIq7el020225; Mon, 11 May 2015 18:52:07 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4BIq7dI020224; Mon, 11 May 2015 18:52:07 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201505111852.t4BIq7dI020224@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Mon, 11 May 2015 18:52:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282776 - head/sys/arm/include 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.20 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: Mon, 11 May 2015 18:52:07 -0000 Author: andrew Date: Mon May 11 18:52:06 2015 New Revision: 282776 URL: https://svnweb.freebsd.org/changeset/base/282776 Log: List both registers to use in the 64-bit atomic instructions. We will need these to build for Thumb-2. Modified: head/sys/arm/include/atomic.h Modified: head/sys/arm/include/atomic.h ============================================================================== --- head/sys/arm/include/atomic.h Mon May 11 17:49:07 2015 (r282775) +++ head/sys/arm/include/atomic.h Mon May 11 18:52:06 2015 (r282776) @@ -151,10 +151,10 @@ atomic_set_64(volatile uint64_t *p, uint __asm __volatile( "1: \n" - " ldrexd %[tmp], [%[ptr]]\n" + " ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n" " orr %Q[tmp], %Q[val]\n" " orr %R[tmp], %R[val]\n" - " strexd %[exf], %[tmp], [%[ptr]]\n" + " strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n" " teq %[exf], #0\n" " it ne \n" " bne 1b\n" @@ -204,10 +204,10 @@ atomic_clear_64(volatile uint64_t *p, ui __asm __volatile( "1: \n" - " ldrexd %[tmp], [%[ptr]]\n" + " ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n" " bic %Q[tmp], %Q[val]\n" " bic %R[tmp], %R[val]\n" - " strexd %[exf], %[tmp], [%[ptr]]\n" + " strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n" " teq %[exf], #0\n" " it ne \n" " bne 1b\n" @@ -263,13 +263,13 @@ atomic_cmpset_64(volatile uint64_t *p, u __asm __volatile( "1: \n" - " ldrexd %[tmp], [%[ptr]]\n" + " ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n" " teq %Q[tmp], %Q[cmpval]\n" " itee eq \n" " teqeq %R[tmp], %R[cmpval]\n" " movne %[ret], #0\n" " bne 2f\n" - " strexd %[ret], %[newval], [%[ptr]]\n" + " strexd %[ret], %Q[newval], %R[newval], [%[ptr]]\n" " teq %[ret], #0\n" " it ne \n" " bne 1b\n" @@ -381,10 +381,10 @@ atomic_add_64(volatile uint64_t *p, uint __asm __volatile( "1: \n" - " ldrexd %[tmp], [%[ptr]]\n" + " ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n" " adds %Q[tmp], %Q[val]\n" - " adc %R[tmp], %R[val]\n" - " strexd %[exf], %[tmp], [%[ptr]]\n" + " adc %R[tmp], %R[tmp], %R[val]\n" + " strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n" " teq %[exf], #0\n" " it ne \n" " bne 1b\n" @@ -433,10 +433,10 @@ atomic_subtract_64(volatile uint64_t *p, __asm __volatile( "1: \n" - " ldrexd %[tmp], [%[ptr]]\n" + " ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n" " subs %Q[tmp], %Q[val]\n" - " sbc %R[tmp], %R[val]\n" - " strexd %[exf], %[tmp], [%[ptr]]\n" + " sbc %R[tmp], %R[tmp], %R[val]\n" + " strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n" " teq %[exf], #0\n" " it ne \n" " bne 1b\n" @@ -536,10 +536,10 @@ atomic_fetchadd_64(volatile uint64_t *p, __asm __volatile( "1: \n" - " ldrexd %[ret], [%[ptr]]\n" + " ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n" " adds %Q[tmp], %Q[ret], %Q[val]\n" " adc %R[tmp], %R[ret], %R[val]\n" - " strexd %[exf], %[tmp], [%[ptr]]\n" + " strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n" " teq %[exf], #0\n" " it ne \n" " bne 1b\n" @@ -560,10 +560,10 @@ atomic_readandclear_64(volatile uint64_t __asm __volatile( "1: \n" - " ldrexd %[ret], [%[ptr]]\n" + " ldrexd %Q[ret], %R[ret], [%[ptr]]\n" " mov %Q[tmp], #0\n" " mov %R[tmp], #0\n" - " strexd %[exf], %[tmp], [%[ptr]]\n" + " strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n" " teq %[exf], #0\n" " it ne \n" " bne 1b\n" @@ -587,7 +587,7 @@ atomic_load_64(volatile uint64_t *p) */ __asm __volatile( "1: \n" - " ldrexd %[ret], [%[ptr]]\n" + " ldrexd %Q[ret], %R[ret], [%[ptr]]\n" " clrex \n" : [ret] "=&r" (ret) : [ptr] "r" (p) @@ -618,8 +618,8 @@ atomic_store_64(volatile uint64_t *p, ui */ __asm __volatile( "1: \n" - " ldrexd %[tmp], [%[ptr]]\n" - " strexd %[exf], %[val], [%[ptr]]\n" + " ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n" + " strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n" " teq %[exf], #0\n" " it ne \n" " bne 1b\n"