From patchwork Wed Dec 13 19:19:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 121848 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5874039qgn; Wed, 13 Dec 2017 11:20:29 -0800 (PST) X-Google-Smtp-Source: ACJfBot2yRWzXo6Og5bCSFdvHdf2WIf1osOdJGKCDpxND+i3g+IKSH2yJ9PazgK0t7Mk8oMQjUgV X-Received: by 10.101.91.78 with SMTP id y14mr6284401pgr.220.1513192829775; Wed, 13 Dec 2017 11:20:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513192829; cv=none; d=google.com; s=arc-20160816; b=YftxoeyUt2Uwi/jpaeV+rxUL2pfPStfPW05nVSs7R1rwg1vQ2Hc3n53VviuFWW7h73 HtOIwKAXvkPxtNwIBYLx77A4V+en2Vh1DOJGNEx0CXTuRPi2QOkpsHraF/1OpYzHdFRo kJNZRkjVhmkcZxzxk8LYDCM52tDt2wHVAeGAcuXzpfDj0mbR3JBh9TiSh9BRtflu49NQ FCctTYYp72Uy5Ko/wPblUhLjUKJfkjbGkEI+NLubTjOz0jYI/kGwvVPXkRW5D90c2IIm NyrmM2ydVsyTxwx5nbwl4GGZ8ylIIf1mZ3Y+o0MPkzKvg2OE3XvEq6eqbn6Vvt9YOBL9 Qh9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=VB5oUL+JbcrBBylcdhIuYYfW1JzdEJllV61ii8EGYUo=; b=HJgEzxij301J6UEbNHLFQ6AfUYa/h7/lTdPOxjrB/EQXcTvthM7E1iBQseylyPgs4c GGSRy3/Wjv36zorQxfORy1Q65xeOh9JhAdTUhHpkArPu5vbviIR169Xk8gXBCs+zuZlm xXJ1Vi5uDS3XoqzKIzO2HrQj0uL5cjSzk4DhvZvYUTf6aCXkcnm+FXXyw23xrRD41Qoa AfNVOR2VQZ5FyzqD+jxBWpfrREKwKQ2hYkaCsPhK/yKwX1wsKNNOim0f3JbhaD2nXS1h E3TyPJEipZldcx2MV61YT44hx2Z2PVGAXuwd9NOpErE3nUhok4chpQ3g6IkM07KgihIS X+xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=QedRYXOR; spf=pass (google.com: domain of libc-alpha-return-88113-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-88113-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id 11si1811169plb.52.2017.12.13.11.20.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 11:20:29 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-88113-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=QedRYXOR; spf=pass (google.com: domain of libc-alpha-return-88113-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-88113-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=jbKJTQ1QF2TYoKAqDFVjcbDCmg8CFa4 QaiYq9fisks11HG3+5MxhZw4Ut5GgD6nAzSBYZwRwI4acxLn7RjVmKz/e36iP0qL 7QTtQsy+xEFYGXQUZS3ZSUl8q+6DBZ7sH7s+RtX+Hv4RNXxxucGBqhwGNPTX6NCt qvbPikMQ9d6Q= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=6zrdn/AQJ1F3F3lVRQr6hHbr1io=; b=QedRY XORWH4J3jnZutpQFaeeEpRjt75VPpisqEz1mAlAUIpwuEJIIK/IR2rDNITF78get OCtGe9NShCzxzmXOdtoKB7xK0wBdgLRvHDPeflBElbcMfGuUDgdsNMblJPF70V0t wEAbIfu+ivfGQn8MXUAblrp7TJkCq95uAuGDdU= Received: (qmail 89548 invoked by alias); 13 Dec 2017 19:20:04 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 89516 invoked by uid 89); 13 Dec 2017 19:20:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=ics, lowercase, tear, briefly X-HELO: mail-qk0-f193.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=VB5oUL+JbcrBBylcdhIuYYfW1JzdEJllV61ii8EGYUo=; b=SRKP/TZtxU0ssEc6YkoZ/iNBiapDICOi4h+iFP7zVWRX8pa9vrwPFz2dFDWylzv62p 7RAPdb0wFGf1r5nIFF6+UGpnU/f3GoWjNyu1viLAk0IvXTTnm7ANNe10hzVsmia80tp6 pSOVFUwxeCS9RO3SYrR7g+9ufSZUCTY6UeQmuOypUchcUDwgskDUUTwbRa5j8GSlecD2 wB/6QoQKYM36P5upcjXMwCYuUszCNI0KLjur9Dy35wO1a1pFbuQ8pMz7gHdu7c6D//t7 +7//Xmn/H5IDlrVBb3Q8UCaHHwoUd210JLUnLlDM/m1z4HztBgFHevitIaRIZyXTmk+D l1JQ== X-Gm-Message-State: AKGB3mIEnl2WjHzJYURkZKD6L+JzJO7gE/oOwedyr7nBkQozstjCvOg3 KdnKaaoUCmDywPOH9PZpIlbmPb6yCFQ= X-Received: by 10.55.119.197 with SMTP id s188mr12328591qkc.233.1513192796277; Wed, 13 Dec 2017 11:19:56 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 3/3] Simplify tile assembly definitions Date: Wed, 13 Dec 2017 17:19:45 -0200 Message-Id: <1513192785-27450-3-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1513192785-27450-1-git-send-email-adhemerval.zanella@linaro.org> References: <1513192785-27450-1-git-send-email-adhemerval.zanella@linaro.org> With tilepro removal, the uppercase instruction are not anymore required to be defines as potentially macros. This is a mechanical change done by the following script: --- INSNS="LD LD4U ST ST4 BNEZ BEQZ BEQZT BGTZ CMPEQI CMPEQ CMOVEQZ CMOVNEZ" FILES=$(find sysdeps/tile sysdeps/unix/sysv/linux/tile -iname *.S) for insn in $INSNS; do repl=$(echo $insn | tr '[:upper:]' '[:lower:]') sed -i 's/\b'$insn'\b/'$repl'/g' $FILES done --- Checked with a build for tilegx-linux-gnu and tilegx-linux-gnu-32 with and without the patch, there is no difference in generated binary with a dissassemble. * sysdeps/tile/__longjmp.S (__longjmp): Use lowercase instructions. * sysdeps/tile/__tls_get_addr.S (__tls_get_addr): Likewise. * sysdeps/tile/_mcount.S (__mcount): Likewise. * sysdeps/tile/crti.S (_init, _fini): Likewise. * sysdeps/tile/crtn.S: Likewise. * sysdeps/tile/dl-start.S (_start): Likewise. * sysdeps/tile/dl-trampoline.S: Likewise. * sysdeps/tile/setjmp.S (__sigsetjmp): Likewise. * sysdeps/tile/start.S (_start): Likewise. * sysdeps/unix/sysv/linux/tile/clone.S (_clone): Likewise. * sysdeps/unix/sysv/linux/tile/getcontext.S (__getcontext): Likewise. * sysdeps/unix/sysv/linux/tile/ioctl.S (__ioctl): Likewise. * sysdeps/unix/sysv/linux/tile/setcontext.S (__setcontext): Likewise. * sysdeps/unix/sysv/linux/tile/swapcontext.S (__swapcontext): Likewise. * sysdeps/unix/sysv/linux/tile/syscall.S (syscall): Likewise. * sysdeps/unix/sysv/linux/tile/vfork.S (__vfork): Likewise. --- ChangeLog | 17 +++++ sysdeps/tile/__longjmp.S | 6 +- sysdeps/tile/__tls_get_addr.S | 114 ++++++++++++++--------------- sysdeps/tile/_mcount.S | 50 ++++++------- sysdeps/tile/crti.S | 10 +-- sysdeps/tile/crtn.S | 4 +- sysdeps/tile/dl-start.S | 6 +- sysdeps/tile/dl-trampoline.S | 28 +++---- sysdeps/tile/setjmp.S | 4 +- sysdeps/tile/start.S | 4 +- sysdeps/unix/sysv/linux/tile/clone.S | 28 +++---- sysdeps/unix/sysv/linux/tile/getcontext.S | 58 +++++++-------- sysdeps/unix/sysv/linux/tile/ioctl.S | 2 +- sysdeps/unix/sysv/linux/tile/setcontext.S | 98 ++++++++++++------------- sysdeps/unix/sysv/linux/tile/swapcontext.S | 22 +++--- sysdeps/unix/sysv/linux/tile/syscall.S | 2 +- sysdeps/unix/sysv/linux/tile/vfork.S | 2 +- 17 files changed, 236 insertions(+), 219 deletions(-) -- 2.7.4 diff --git a/sysdeps/tile/__longjmp.S b/sysdeps/tile/__longjmp.S index c9902b1..7247af8 100644 --- a/sysdeps/tile/__longjmp.S +++ b/sysdeps/tile/__longjmp.S @@ -28,7 +28,7 @@ ENTRY (__longjmp) FEEDBACK_ENTER(__longjmp) -#define RESTORE(r) { LD r, r0 ; ADDI_PTR r0, r0, REGSIZE } +#define RESTORE(r) { ld r, r0 ; ADDI_PTR r0, r0, REGSIZE } FOR_EACH_CALLEE_SAVED_REG(RESTORE) /* Make longjmp(buf, 0) return "1" instead. @@ -36,9 +36,9 @@ ENTRY (__longjmp) we can validly load EX_CONTEXT for iret without being interrupted halfway through. */ { - LD r2, r0 /* retrieve ICS bit from jmp_buf */ + ld r2, r0 /* retrieve ICS bit from jmp_buf */ movei r3, 1 - CMPEQI r0, r1, 0 + cmpeqi r0, r1, 0 } { mtspr INTERRUPT_CRITICAL_SECTION, r3 diff --git a/sysdeps/tile/__tls_get_addr.S b/sysdeps/tile/__tls_get_addr.S index 2402bd1..ea9470a 100644 --- a/sysdeps/tile/__tls_get_addr.S +++ b/sysdeps/tile/__tls_get_addr.S @@ -53,20 +53,20 @@ ENTRY (__tls_get_addr) } { LD_PTR r29, r29 /* r29 = ti_offset */ - CMPEQ r25, r28, r25 /* r25 nonzero if generation OK */ + cmpeq r25, r28, r25 /* r25 nonzero if generation OK */ shli r28, r26, LOG_SIZEOF_DTV_T /* byte index into dtv array */ } { - BEQZ r25, .Lslowpath - CMPEQI r25, r26, -1 /* r25 nonzero if ti_module invalid */ + beqz r25, .Lslowpath + cmpeqi r25, r26, -1 /* r25 nonzero if ti_module invalid */ } { - BNEZ r25, .Lslowpath + bnez r25, .Lslowpath ADD_PTR r28, r28, r27 /* pointer into module array */ } LD_PTR r26, r28 /* r26 = module TLS pointer */ - CMPEQI r25, r26, -1 /* check r26 == TLS_DTV_UNALLOCATED */ - BNEZ r25, .Lslowpath + cmpeqi r25, r26, -1 /* check r26 == TLS_DTV_UNALLOCATED */ + bnez r25, .Lslowpath { ADD_PTR r0, r26, r29 jrp lr @@ -74,68 +74,68 @@ ENTRY (__tls_get_addr) .Lslowpath: { - ST sp, lr + st sp, lr ADDLI_PTR r29, sp, - (25 * REGSIZE) } cfi_offset (lr, 0) { - ST r29, sp + st r29, sp ADDLI_PTR sp, sp, - (26 * REGSIZE) } cfi_def_cfa_offset (26 * REGSIZE) ADDI_PTR r29, sp, (2 * REGSIZE) - { ST r29, r1; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r2; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r3; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r4; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r5; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r6; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r7; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r8; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r9; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r10; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r11; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r12; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r13; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r14; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r15; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r16; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r17; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r18; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r19; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r20; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r21; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r22; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r23; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r24; ADDI_PTR r29, r29, REGSIZE } + { st r29, r1; ADDI_PTR r29, r29, REGSIZE } + { st r29, r2; ADDI_PTR r29, r29, REGSIZE } + { st r29, r3; ADDI_PTR r29, r29, REGSIZE } + { st r29, r4; ADDI_PTR r29, r29, REGSIZE } + { st r29, r5; ADDI_PTR r29, r29, REGSIZE } + { st r29, r6; ADDI_PTR r29, r29, REGSIZE } + { st r29, r7; ADDI_PTR r29, r29, REGSIZE } + { st r29, r8; ADDI_PTR r29, r29, REGSIZE } + { st r29, r9; ADDI_PTR r29, r29, REGSIZE } + { st r29, r10; ADDI_PTR r29, r29, REGSIZE } + { st r29, r11; ADDI_PTR r29, r29, REGSIZE } + { st r29, r12; ADDI_PTR r29, r29, REGSIZE } + { st r29, r13; ADDI_PTR r29, r29, REGSIZE } + { st r29, r14; ADDI_PTR r29, r29, REGSIZE } + { st r29, r15; ADDI_PTR r29, r29, REGSIZE } + { st r29, r16; ADDI_PTR r29, r29, REGSIZE } + { st r29, r17; ADDI_PTR r29, r29, REGSIZE } + { st r29, r18; ADDI_PTR r29, r29, REGSIZE } + { st r29, r19; ADDI_PTR r29, r29, REGSIZE } + { st r29, r20; ADDI_PTR r29, r29, REGSIZE } + { st r29, r21; ADDI_PTR r29, r29, REGSIZE } + { st r29, r22; ADDI_PTR r29, r29, REGSIZE } + { st r29, r23; ADDI_PTR r29, r29, REGSIZE } + { st r29, r24; ADDI_PTR r29, r29, REGSIZE } .hidden __tls_get_addr_slow jal __tls_get_addr_slow ADDI_PTR r29, sp, (2 * REGSIZE) - { LD r1, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r2, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r3, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r4, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r5, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r6, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r7, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r8, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r9, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r10, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r11, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r12, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r13, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r14, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r15, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r16, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r17, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r18, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r19, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r20, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r21, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r22, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r23, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r24, r29; ADDLI_PTR sp, sp, (26 * REGSIZE) } + { ld r1, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r2, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r3, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r4, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r5, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r6, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r7, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r8, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r9, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r10, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r11, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r12, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r13, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r14, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r15, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r16, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r17, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r18, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r19, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r20, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r21, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r22, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r23, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r24, r29; ADDLI_PTR sp, sp, (26 * REGSIZE) } cfi_def_cfa_offset (0) - LD lr, sp + ld lr, sp jrp lr END (__tls_get_addr) diff --git a/sysdeps/tile/_mcount.S b/sysdeps/tile/_mcount.S index c350084..d6ecb93 100644 --- a/sysdeps/tile/_mcount.S +++ b/sysdeps/tile/_mcount.S @@ -33,27 +33,27 @@ .text ENTRY(__mcount) { - ST sp, lr + st sp, lr ADDI_PTR r29, sp, - (12 * REGSIZE) } cfi_offset (lr, 0) { ADDI_PTR sp, sp, - (13 * REGSIZE) - ST r29, sp + st r29, sp ADDI_PTR r29, r29, REGSIZE } cfi_def_cfa_offset (13 * REGSIZE) - { ST r29, r0; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r1; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r2; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r3; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r4; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r5; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r6; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r7; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r8; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r9; ADDI_PTR r29, r29, REGSIZE } - { ST r29, r10; ADDI_PTR r29, r29, REGSIZE; move r0, r10 } + { st r29, r0; ADDI_PTR r29, r29, REGSIZE } + { st r29, r1; ADDI_PTR r29, r29, REGSIZE } + { st r29, r2; ADDI_PTR r29, r29, REGSIZE } + { st r29, r3; ADDI_PTR r29, r29, REGSIZE } + { st r29, r4; ADDI_PTR r29, r29, REGSIZE } + { st r29, r5; ADDI_PTR r29, r29, REGSIZE } + { st r29, r6; ADDI_PTR r29, r29, REGSIZE } + { st r29, r7; ADDI_PTR r29, r29, REGSIZE } + { st r29, r8; ADDI_PTR r29, r29, REGSIZE } + { st r29, r9; ADDI_PTR r29, r29, REGSIZE } + { st r29, r10; ADDI_PTR r29, r29, REGSIZE; move r0, r10 } { move r1, lr jal __mcount_internal @@ -61,20 +61,20 @@ ENTRY(__mcount) { ADDI_PTR r29, sp, (2 * REGSIZE) } - { LD r0, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r1, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r2, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r3, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r4, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r5, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r6, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r7, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r8, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r9, r29; ADDI_PTR r29, r29, REGSIZE } - { LD r10, r29; ADDI_PTR sp, sp, (13 * REGSIZE) } + { ld r0, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r1, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r2, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r3, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r4, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r5, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r6, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r7, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r8, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r9, r29; ADDI_PTR r29, r29, REGSIZE } + { ld r10, r29; ADDI_PTR sp, sp, (13 * REGSIZE) } cfi_def_cfa_offset (0) { - LD lr, sp + ld lr, sp } { move lr, r10 diff --git a/sysdeps/tile/crti.S b/sysdeps/tile/crti.S index 1d714ab..08b9779 100644 --- a/sysdeps/tile/crti.S +++ b/sysdeps/tile/crti.S @@ -63,10 +63,10 @@ _init: { move r29, sp ADDI_PTR r28, sp, -REGSIZE - ST sp, lr + st sp, lr } ADDI_PTR sp, sp, -(2 * REGSIZE) - ST r28, r29 + st r28, r29 #if PREINIT_FUNCTION_WEAK lnk r2 0: @@ -82,7 +82,7 @@ _init: ADD_PTR r0, r0, r1 ADD_PTR r0, r0, r2 LD_PTR r0, r0 - BEQZ r0, .Lno_weak_fn + beqz r0, .Lno_weak_fn jalr r0 #elif !defined(NO_PLT_PCREL) /* Since we are calling from the start of the object to the PLT, @@ -107,7 +107,7 @@ _fini: { move r29, sp ADDI_PTR r28, sp, -REGSIZE - ST sp, lr + st sp, lr } ADDI_PTR sp, sp, -(2 * REGSIZE) - ST r28, r29 + st r28, r29 diff --git a/sysdeps/tile/crtn.S b/sysdeps/tile/crtn.S index 53c6e40..d45bfad 100644 --- a/sysdeps/tile/crtn.S +++ b/sysdeps/tile/crtn.S @@ -42,7 +42,7 @@ ADDI_PTR r29, sp, (2 * REGSIZE) { ADDI_PTR sp, sp, (2 * REGSIZE) - LD lr, r29 + ld lr, r29 } jrp lr @@ -50,6 +50,6 @@ ADDI_PTR r29, sp, (2 * REGSIZE) { ADDI_PTR sp, sp, (2 * REGSIZE) - LD lr, r29 + ld lr, r29 } jrp lr diff --git a/sysdeps/tile/dl-start.S b/sysdeps/tile/dl-start.S index 1782c9c..94deab3 100644 --- a/sysdeps/tile/dl-start.S +++ b/sysdeps/tile/dl-start.S @@ -43,7 +43,7 @@ ENTRY (_start) /* Save zero for caller sp in our 'caller' save area, and make sure lr has a zero value, to limit backtraces. */ move lr, zero - ST r4, zero + st r4, zero } { move r0, r52 @@ -56,8 +56,8 @@ ENTRY (_start) in which case we have to adjust the argument vector. */ lnk r51; .Llink: pic_addr r4, _dl_skip_args - LD4U r4, r4 - BEQZT r4, .Lno_skip + ld4u r4, r4 + beqzt r4, .Lno_skip /* Load the argc word at the initial sp and adjust it. We basically jump "sp" up over the first few argv entries diff --git a/sysdeps/tile/dl-trampoline.S b/sysdeps/tile/dl-trampoline.S index fd7d63d..0d19512 100644 --- a/sysdeps/tile/dl-trampoline.S +++ b/sysdeps/tile/dl-trampoline.S @@ -73,8 +73,8 @@ f(r20); f(r21); f(r22); f(r23); \ f(r24); f(r25) -#define SAVE(REG) { ST r27, REG; ADDI_PTR r27, r27, REGSIZE } -#define RESTORE(REG) { LD REG, r27; ADDI_PTR r27, r27, REGSIZE } +#define SAVE(REG) { st r27, REG; ADDI_PTR r27, r27, REGSIZE } +#define RESTORE(REG) { ld REG, r27; ADDI_PTR r27, r27, REGSIZE } .macro dl_resolve, name, profile, framesize .text @@ -86,7 +86,7 @@ \name: cfi_startproc { - ST sp, lr + st sp, lr move r26, sp } { @@ -95,24 +95,24 @@ } cfi_def_cfa_offset (\framesize) { - ST r27, r26 + st r27, r26 ADDI_PTR r27, r27, FRAME_REGS - FRAME_SP } FOR_EACH_REG(SAVE) { - ST r27, lr + st r27, lr ADDLI_PTR r27, sp, FRAME_TPNT } cfi_offset (lr, FRAME_LR - \framesize) .if \profile { move r0, r28 /* tpnt value */ - ST r27, r28 + st r27, r28 ADDI_PTR r27, r27, FRAME_INDEX - FRAME_TPNT } { move r1, r29 /* PLT index */ - ST r27, r29 + st r27, r29 } { move r2, lr /* retaddr */ @@ -124,7 +124,7 @@ } ADDLI_PTR r28, sp, FRAME_STACKFRAME LD_PTR r28, r28 - BGTZ r28, 1f + bgtz r28, 1f .else { move r0, r28 /* tpnt value 1 */ @@ -141,12 +141,12 @@ FOR_EACH_REG(RESTORE) .if \profile ADDLI_PTR r28, sp, FRAME_STACKFRAME - LD r28, r28 - BGTZ r28, 1f + ld r28, r28 + bgtz r28, 1f .endif { /* Restore original user return address. */ - LD lr, r27 + ld lr, r27 /* Pop off our stack frame. */ ADDLI_PTR sp, sp, \framesize } @@ -162,11 +162,11 @@ } FOR_EACH_REG(SAVE) { - LD r0, r28 + ld r0, r28 ADDI_PTR r28, r28, FRAME_INDEX - FRAME_TPNT } { - LD r1, r28 + ld r1, r28 ADDLI_PTR r2, sp, FRAME_REGS } { @@ -179,7 +179,7 @@ } FOR_EACH_REG(RESTORE) { - LD lr, lr + ld lr, lr ADDLI_PTR sp, sp, \framesize } jrp lr diff --git a/sysdeps/tile/setjmp.S b/sysdeps/tile/setjmp.S index 0321c10..534d57b 100644 --- a/sysdeps/tile/setjmp.S +++ b/sysdeps/tile/setjmp.S @@ -36,11 +36,11 @@ ENTRY(__sigsetjmp) 1: move r2, r0 -#define SAVE(r) { ST r2, r ; ADDI_PTR r2, r2, REGSIZE } +#define SAVE(r) { st r2, r ; ADDI_PTR r2, r2, REGSIZE } FOR_EACH_CALLEE_SAVED_REG(SAVE) mfspr r3, INTERRUPT_CRITICAL_SECTION - ST r2, r3 + st r2, r3 j plt(__sigjmp_save) jrp lr /* Keep the backtracer happy. */ END(__sigsetjmp) diff --git a/sysdeps/tile/start.S b/sysdeps/tile/start.S index da3ba9c..7cdabed 100644 --- a/sysdeps/tile/start.S +++ b/sysdeps/tile/start.S @@ -109,11 +109,11 @@ _start: /* Zero out callee space for return address. Unnecessary but free. This is just paranoia to help backtracing not go awry. */ - ST sp, zero + st sp, zero } { /* Zero out our frame pointer for __libc_start_main. */ - ST r12, zero + st r12, zero /* Zero out lr to make __libc_start_main the end of backtrace. */ move lr, zero diff --git a/sysdeps/unix/sysv/linux/tile/clone.S b/sysdeps/unix/sysv/linux/tile/clone.S index 9610acd..2f624e6 100644 --- a/sysdeps/unix/sysv/linux/tile/clone.S +++ b/sysdeps/unix/sysv/linux/tile/clone.S @@ -44,32 +44,32 @@ ENTRY (__clone) /* Create a stack frame so we can pass callee-saves to new task. */ { move r10, sp - ST sp, lr + st sp, lr ADDI_PTR sp, sp, -FRAME_SIZE } cfi_offset (lr, 0) cfi_def_cfa_offset (FRAME_SIZE) ADDI_PTR r11, sp, FRAME_SP { - ST r11, r10 + st r11, r10 ADDI_PTR r11, sp, FRAME_R30 } { - ST r11, r30 + st r11, r30 ADDI_PTR r11, sp, FRAME_R31 } cfi_offset (r30, FRAME_R30 - FRAME_SIZE) { - ST r11, r31 + st r11, r31 ADDI_PTR r11, sp, FRAME_R32 } cfi_offset (r31, FRAME_R31 - FRAME_SIZE) - ST r11, r32 + st r11, r32 cfi_offset (r32, FRAME_R32 - FRAME_SIZE) /* sanity check arguments */ - BEQZ r0, .Linvalid - BEQZ r1, .Linvalid + beqz r0, .Linvalid + beqz r1, .Linvalid /* Make sure child stack is properly aligned, and set up the top frame so that we can call out of it immediately in the @@ -79,7 +79,7 @@ ENTRY (__clone) ADDI_PTR r1, r1, -C_ABI_SAVE_AREA_SIZE andi r1, r1, -C_ABI_SAVE_AREA_SIZE ADDI_PTR r9, r1, REGSIZE /* sp of this frame on entry, i.e. zero */ - ST r9, zero + st r9, zero /* We need to switch the argument convention around from libc to kernel: @@ -118,30 +118,30 @@ ENTRY (__clone) moveli TREG_SYSCALL_NR_NAME, __NR_clone } swint1 - BEQZ r0, .Lthread_start /* If in child task. */ + beqz r0, .Lthread_start /* If in child task. */ .Ldone: /* Restore the callee-saved registers and return. */ ADDLI_PTR lr, sp, FRAME_SIZE { - LD lr, lr + ld lr, lr ADDLI_PTR r30, sp, FRAME_R30 } { - LD r30, r30 + ld r30, r30 ADDLI_PTR r31, sp, FRAME_R31 } { - LD r31, r31 + ld r31, r31 ADDLI_PTR r32, sp, FRAME_R32 } { - LD r32, r32 + ld r32, r32 ADDI_PTR sp, sp, FRAME_SIZE } cfi_def_cfa_offset (0) - BNEZ r1, .Lerror + bnez r1, .Lerror jrp lr .Lerror: diff --git a/sysdeps/unix/sysv/linux/tile/getcontext.S b/sysdeps/unix/sysv/linux/tile/getcontext.S index e7561ea..1a346cf 100644 --- a/sysdeps/unix/sysv/linux/tile/getcontext.S +++ b/sysdeps/unix/sysv/linux/tile/getcontext.S @@ -33,38 +33,38 @@ ENTRY (__getcontext) Save value "1" to uc_flags to later recognize getcontext(). */ { movei r11, 1; ADDI_PTR r10, r0, UC_FLAGS_OFFSET } { ST_PTR r10, r11; addli r10, r0, UC_REG(30) } - { ST r10, r30; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r31; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r32; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r33; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r34; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r35; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r36; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r37; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r38; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r39; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r40; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r41; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r42; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r43; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r44; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r45; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r46; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r47; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r48; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r49; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r50; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r51; ADDI_PTR r10, r10, REGSIZE } - { ST r10, r52; ADDI_PTR r10, r10, REGSIZE } - { ST r10, tp; ADDI_PTR r10, r10, REGSIZE } - { ST r10, sp; ADDI_PTR r10, r10, REGSIZE } - { ST r10, lr; ADDI_PTR r10, r10, REGSIZE } + { st r10, r30; ADDI_PTR r10, r10, REGSIZE } + { st r10, r31; ADDI_PTR r10, r10, REGSIZE } + { st r10, r32; ADDI_PTR r10, r10, REGSIZE } + { st r10, r33; ADDI_PTR r10, r10, REGSIZE } + { st r10, r34; ADDI_PTR r10, r10, REGSIZE } + { st r10, r35; ADDI_PTR r10, r10, REGSIZE } + { st r10, r36; ADDI_PTR r10, r10, REGSIZE } + { st r10, r37; ADDI_PTR r10, r10, REGSIZE } + { st r10, r38; ADDI_PTR r10, r10, REGSIZE } + { st r10, r39; ADDI_PTR r10, r10, REGSIZE } + { st r10, r40; ADDI_PTR r10, r10, REGSIZE } + { st r10, r41; ADDI_PTR r10, r10, REGSIZE } + { st r10, r42; ADDI_PTR r10, r10, REGSIZE } + { st r10, r43; ADDI_PTR r10, r10, REGSIZE } + { st r10, r44; ADDI_PTR r10, r10, REGSIZE } + { st r10, r45; ADDI_PTR r10, r10, REGSIZE } + { st r10, r46; ADDI_PTR r10, r10, REGSIZE } + { st r10, r47; ADDI_PTR r10, r10, REGSIZE } + { st r10, r48; ADDI_PTR r10, r10, REGSIZE } + { st r10, r49; ADDI_PTR r10, r10, REGSIZE } + { st r10, r50; ADDI_PTR r10, r10, REGSIZE } + { st r10, r51; ADDI_PTR r10, r10, REGSIZE } + { st r10, r52; ADDI_PTR r10, r10, REGSIZE } + { st r10, tp; ADDI_PTR r10, r10, REGSIZE } + { st r10, sp; ADDI_PTR r10, r10, REGSIZE } + { st r10, lr; ADDI_PTR r10, r10, REGSIZE } lnk r11 /* Point PC at the "jrp lr" instruction. */ addli r11, r11, .Lreturn - . - { ST r10, r11; ADDI_PTR r10, r10, REGSIZE } + { st r10, r11; ADDI_PTR r10, r10, REGSIZE } mfspr r11, INTERRUPT_CRITICAL_SECTION { - ST r10, r11 + st r10, r11 movei r1, 0 } @@ -78,7 +78,7 @@ ENTRY (__getcontext) moveli TREG_SYSCALL_NR_NAME, __NR_rt_sigprocmask } swint1 - BNEZ r1, .Lsyscall_error + bnez r1, .Lsyscall_error .Lreturn: { diff --git a/sysdeps/unix/sysv/linux/tile/ioctl.S b/sysdeps/unix/sysv/linux/tile/ioctl.S index 43f9563..9816c18 100644 --- a/sysdeps/unix/sysv/linux/tile/ioctl.S +++ b/sysdeps/unix/sysv/linux/tile/ioctl.S @@ -35,7 +35,7 @@ ENTRY (__ioctl) moveli TREG_SYSCALL_NR_NAME, __NR_ioctl } swint1 - BNEZ r1, 0f + bnez r1, 0f jrp lr PSEUDO_END (__ioctl) libc_hidden_def (__ioctl) diff --git a/sysdeps/unix/sysv/linux/tile/setcontext.S b/sysdeps/unix/sysv/linux/tile/setcontext.S index 8039e7e..2b60c3c 100644 --- a/sysdeps/unix/sysv/linux/tile/setcontext.S +++ b/sysdeps/unix/sysv/linux/tile/setcontext.S @@ -39,15 +39,15 @@ ENTRY (__setcontext) #endif LD_PTR r10, r0 { - BEQZ r10, .Lsigreturn + beqz r10, .Lsigreturn addi r10, r10, -1 /* Confirm that it has value "1". */ } - BNEZ r10, .Lbadcontext + bnez r10, .Lbadcontext /* Save lr and r0 briefly on the stack and set the signal mask: rt_sigprocmask (SIG_SETMASK, &ucp->uc_sigmask, NULL, _NSIG / 8). */ { - ST sp, lr + st sp, lr ADDI_PTR r11, sp, -(2 * REGSIZE) move r10, sp } @@ -55,11 +55,11 @@ ENTRY (__setcontext) cfi_def_cfa_offset (3 * REGSIZE) cfi_offset (lr, 0) { - ST r11, r10 + st r11, r10 ADDI_PTR r10, sp, (2 * REGSIZE) } { - ST r10, r0 + st r10, r0 ADDLI_PTR r1, r0, UC_SIGMASK_OFFSET } cfi_offset (r0, -REGSIZE) @@ -74,62 +74,62 @@ ENTRY (__setcontext) swint1 ADDI_PTR r11, sp, 2 * REGSIZE /* Restore uc_context to r11. */ { - LD r11, r11 + ld r11, r11 ADDI_PTR sp, sp, 3 * REGSIZE } cfi_def_cfa_offset (0) - LD lr, sp + ld lr, sp { ADDI_PTR r10, r11, UC_REG(0) - BNEZ r1, .Lsyscall_error + bnez r1, .Lsyscall_error } /* Restore the argument registers; note they will be random unless makecontext() has been called. */ - { LD r0, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r1, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r2, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r3, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r4, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r5, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r6, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r7, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r8, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r9, r10; ADDLI_PTR r10, r10, UC_REG(30) - UC_REG(9) } + { ld r0, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r1, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r2, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r3, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r4, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r5, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r6, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r7, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r8, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r9, r10; ADDLI_PTR r10, r10, UC_REG(30) - UC_REG(9) } /* Restore the callee-saved GPRs. */ - { LD r30, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r31, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r32, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r33, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r34, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r35, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r36, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r37, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r38, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r39, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r40, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r41, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r42, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r43, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r44, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r45, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r46, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r47, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r48, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r49, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r50, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r51, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r52, r10; ADDI_PTR r10, r10, REGSIZE * 2 } + { ld r30, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r31, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r32, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r33, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r34, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r35, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r36, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r37, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r38, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r39, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r40, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r41, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r42, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r43, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r44, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r45, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r46, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r47, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r48, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r49, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r50, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r51, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r52, r10; ADDI_PTR r10, r10, REGSIZE * 2 } /* Skip tp since it must not change for a given thread. */ - { LD sp, r10; ADDI_PTR r10, r10, REGSIZE } - { LD lr, r10; ADDI_PTR r10, r10, REGSIZE } - { LD r11, r10; ADDI_PTR r10, r10, REGSIZE } + { ld sp, r10; ADDI_PTR r10, r10, REGSIZE } + { ld lr, r10; ADDI_PTR r10, r10, REGSIZE } + { ld r11, r10; ADDI_PTR r10, r10, REGSIZE } /* Construct an iret context; we set ICS so we can validly load EX_CONTEXT for iret without being interrupted halfway through. */ { - LD r12, r10 + ld r12, r10 movei r13, 1 } { @@ -157,15 +157,15 @@ ENTRY (__setcontext) cfi_def_cfa_offset (C_ABI_SAVE_AREA_SIZE + SI_MAX_SIZE + UC_SIZE) moveli r2, UC_SIZE / REGSIZE 0: { - LD r10, r0 + ld r10, r0 ADDI_PTR r0, r0, REGSIZE } { - ST r1, r10 + st r1, r10 ADDI_PTR r1, r1, REGSIZE addi r2, r2, -1 } - BNEZ r2, 0b + bnez r2, 0b moveli TREG_SYSCALL_NR_NAME, __NR_rt_sigreturn swint1 @@ -193,7 +193,7 @@ ENTRY (__startcontext) cfi_undefined (lr) FEEDBACK_ENTER(__startcontext) jalr r31 - BEQZ r30, 1f + beqz r30, 1f { move r0, r30 jal __setcontext diff --git a/sysdeps/unix/sysv/linux/tile/swapcontext.S b/sysdeps/unix/sysv/linux/tile/swapcontext.S index 1778dfa..a955ca1 100644 --- a/sysdeps/unix/sysv/linux/tile/swapcontext.S +++ b/sysdeps/unix/sysv/linux/tile/swapcontext.S @@ -27,7 +27,7 @@ ENTRY (__swapcontext) FEEDBACK_ENTER(__swapcontext) /* Set up a frame and save r0 and r1. */ { - ST sp, lr + st sp, lr ADDI_PTR r11, sp, -(3 * REGSIZE) move r10, sp } @@ -35,43 +35,43 @@ ENTRY (__swapcontext) cfi_def_cfa_offset (4 * REGSIZE) cfi_offset (lr, 0) { - ST r11, r10 + st r11, r10 ADDI_PTR r10, sp, (2 * REGSIZE) } { - ST r10, r0 + st r10, r0 ADDI_PTR r10, sp, (3 * REGSIZE) } - ST r10, r1 + st r10, r1 /* Save the current context. */ jal __getcontext /* Tear down the frame and restore r0, r1, and lr. */ { - BNEZ r0, .Lerror + bnez r0, .Lerror ADDI_PTR r1, sp, 3 * REGSIZE } { - LD r1, r1 + ld r1, r1 ADDI_PTR r0, sp, 2 * REGSIZE } { - LD r0, r0 + ld r0, r0 ADDI_PTR sp, sp, 4 * REGSIZE } cfi_def_cfa_offset (0) { - LD lr, sp + ld lr, sp ADDLI_PTR r10, r0, UC_REG(54) } /* Update the stored sp and lr. */ { - ST r10, sp + st r10, sp ADDLI_PTR r10, r0, UC_REG(55) } - ST r10, lr + st r10, lr /* Tail-call setcontext to finish up. */ { @@ -82,7 +82,7 @@ ENTRY (__swapcontext) .Lerror: ADDI_PTR sp, sp, 4 * REGSIZE cfi_def_cfa_offset (0) - LD lr, sp + ld lr, sp jrp lr END (__swapcontext) diff --git a/sysdeps/unix/sysv/linux/tile/syscall.S b/sysdeps/unix/sysv/linux/tile/syscall.S index 627ab0e..3aa0a2b 100644 --- a/sysdeps/unix/sysv/linux/tile/syscall.S +++ b/sysdeps/unix/sysv/linux/tile/syscall.S @@ -27,6 +27,6 @@ ENTRY (syscall) { move r3, r4; move r4, r5 } { move r5, r6; move r6, r7 } swint1 - BNEZ r1, 0f + bnez r1, 0f jrp lr PSEUDO_END (syscall) diff --git a/sysdeps/unix/sysv/linux/tile/vfork.S b/sysdeps/unix/sysv/linux/tile/vfork.S index 725bd4b..1f4885f 100644 --- a/sysdeps/unix/sysv/linux/tile/vfork.S +++ b/sysdeps/unix/sysv/linux/tile/vfork.S @@ -40,7 +40,7 @@ ENTRY (__vfork) moveli TREG_SYSCALL_NR_NAME, __NR_clone swint1 - BNEZ r1, 0f + bnez r1, 0f jrp lr PSEUDO_END (__vfork) libc_hidden_def (__vfork)