From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27382 invoked by alias); 27 Feb 2013 03:17:08 -0000 Received: (qmail 27313 invoked by uid 22791); 27 Feb 2013 03:17:07 -0000 X-SWARE-Spam-Status: No, hits=-5.3 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,KHOP_RCVD_TRUST,KHOP_SPAMHAUS_DROP,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-pb0-f45.google.com (HELO mail-pb0-f45.google.com) (209.85.160.45) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 27 Feb 2013 03:16:58 +0000 Received: by mail-pb0-f45.google.com with SMTP id ro8so74065pbb.18 for ; Tue, 26 Feb 2013 19:16:58 -0800 (PST) X-Received: by 10.68.189.9 with SMTP id ge9mr952911pbc.166.1361935018262; Tue, 26 Feb 2013 19:16:58 -0800 (PST) Received: from pebble.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPS id pp1sm265271pac.7.2013.02.26.19.16.56 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 26 Feb 2013 19:16:57 -0800 (PST) From: Richard Henderson To: libc-ports@sourceware.org Cc: Joseph Myers Subject: [PATCH 15/26] arm: Delete LOADREGS macro Date: Wed, 27 Feb 2013 03:17:00 -0000 Message-Id: <1361934986-17018-16-git-send-email-rth@twiddle.net> In-Reply-To: <1361934986-17018-1-git-send-email-rth@twiddle.net> References: <1361934986-17018-1-git-send-email-rth@twiddle.net> X-IsSubscribed: yes Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2013-02/txt/msg00088.txt.bz2 There was only one user. It's "condition" argument was used for "ia" rather than an actual condition. The apcs26 syntax is almost certainly not needed, given current binutils requirements. --- * sysdeps/arm/__longjmp.S (__longjmp): Use ldmia insn directly. * sysdeps/arm/sysdep.h (LOADREGS): Remove. --- ports/sysdeps/arm/__longjmp.S | 2 +- ports/sysdeps/arm/sysdep.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/sysdeps/arm/__longjmp.S b/ports/sysdeps/arm/__longjmp.S index af4b963..050227b 100644 --- a/ports/sysdeps/arm/__longjmp.S +++ b/ports/sysdeps/arm/__longjmp.S @@ -37,7 +37,7 @@ ENTRY (__longjmp) cfi_undefined (r4) CHECK_SP (r4) #endif - LOADREGS(ia, ip!, {v1-v6, sl, fp, sp, lr}) + ldmia ip!, {v1-v6, sl, fp, sp, lr} cfi_restore (v1) cfi_restore (v2) cfi_restore (v3) diff --git a/ports/sysdeps/arm/sysdep.h b/ports/sysdeps/arm/sysdep.h index fed3dfd..bfdba27 100644 --- a/ports/sysdeps/arm/sysdep.h +++ b/ports/sysdeps/arm/sysdep.h @@ -35,8 +35,6 @@ /* APCS-32 doesn't preserve the condition codes across function call. */ #ifdef __APCS_32__ -#define LOADREGS(cond, base, reglist...)\ - ldm##cond base,reglist #ifdef __USE_BX__ #define RETINSTR(cond, reg) \ bx##cond reg @@ -49,8 +47,6 @@ mov pc, _reg #endif #else /* APCS-26 */ -#define LOADREGS(cond, base, reglist...)\ - ldm##cond base,reglist^ #define RETINSTR(cond, reg) \ mov##cond##s pc, reg #define DO_RET(_reg) \ -- 1.8.1.2