From patchwork Wed Aug 10 15:17:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 73663 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp456055qga; Wed, 10 Aug 2016 08:18:58 -0700 (PDT) X-Received: by 10.98.59.70 with SMTP id i67mr8035990pfa.45.1470842338674; Wed, 10 Aug 2016 08:18:58 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id kg11si48912134pab.248.2016.08.10.08.18.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 08:18:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B68631A1E49; Wed, 10 Aug 2016 08:18:51 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com [IPv6:2a00:1450:400c:c09::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 20E2F1A1DF8 for ; Wed, 10 Aug 2016 08:18:49 -0700 (PDT) Received: by mail-wm0-x234.google.com with SMTP id i5so111336929wmg.0 for ; Wed, 10 Aug 2016 08:18:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FI/hbL3nWl2wg8BEOCIxUiEGkLw81uecxsHzuTGEGao=; b=dH2UQDO46mSI779ory834x3b65hrAyvIAXYoQ0VCOeey+Q+VTmvKJC3FiW1brfuSP4 9fYL3knVJyZlfNo5BZhKXDipPhmCb2YRIYipdQH/qvVRIn7dPeZ/xxuJOLsxr86pqqDV hvp/R6YaTmMJw9oR/2oYRsx75SCK/zP8Hzjyo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FI/hbL3nWl2wg8BEOCIxUiEGkLw81uecxsHzuTGEGao=; b=k0TRz45dy6TW2S/JKhgKABibArm14pfXeoVYHiLYLZMAbs7zdzamZH3S5tJMreSufA u4m2h1VkuO5FRmpt3mLRVBlKcq5ZrD4X+MuwfNMWS+CfqwN7Pzs3xyo5F+nLWmTMpJkf D41hOI7V4MS+8UJsYoPQ+rqFaWBh0DxJntwEhjaL8Erq9nINDahb1fQRbqDUieUqugZn 0pChbmatg0FIvQHOJTYPRZ6/FHHqB0xsX/Fw2+XB6V4Ig0bDjGzrU17Kh9F8eAQV6G5U ZTJdQE66DdklpzniaarZ804j0FIHlm0ZCLDIa3p8gWt3bmnGNmB3LxrMbJSVEwUoS0zp 0usQ== X-Gm-Message-State: AEkoousBE/jnCdwSIX3b+ETqZ3uTrSVfBSgTpecR/xcEpC9MdmAugtYiGzUbKYEDjskiMdOS X-Received: by 10.194.142.198 with SMTP id ry6mr4500204wjb.62.1470842327681; Wed, 10 Aug 2016 08:18:47 -0700 (PDT) Received: from localhost.localdomain (46.red-81-37-107.dynamicip.rima-tde.net. [81.37.107.46]) by smtp.gmail.com with ESMTPSA id c16sm8908374wme.4.2016.08.10.08.18.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Aug 2016 08:18:47 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, eugene@hp.com Date: Wed, 10 Aug 2016 17:17:51 +0200 Message-Id: <1470842282-8415-16-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470842282-8415-1-git-send-email-ard.biesheuvel@linaro.org> References: <1470842282-8415-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 15/26] ArmPkg/BaseMemoryLibSm: switch to ASM_FUNC() asm macro X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lersek@redhat.com, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Annotate functions with ASM_FUNC() so that they are emitted into separate sections. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S | 8 +++----- ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S index 7985b59279ba..f90589c22594 100644 --- a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S +++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S @@ -17,6 +17,8 @@ # #------------------------------------------------------------------------------ +#include + /** Copy Length bytes from Source to Destination. Overlap is OK. @@ -37,11 +39,7 @@ InternalMemCopyMem ( IN UINTN Length ) **/ -.text -.align 2 -GCC_ASM_EXPORT(InternalMemCopyMem) - -ASM_PFX(InternalMemCopyMem): +ASM_FUNC(InternalMemCopyMem) stmfd sp!, {r4-r11, lr} // Save the input parameters in extra registers (r11 = destination, r14 = source, r12 = length) mov r11, r0 diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S index 970d030ca368..242de95f74d1 100644 --- a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S +++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S @@ -17,6 +17,8 @@ # #------------------------------------------------------------------------------ +#include + /** Set Buffer to Value for Size bytes. @@ -35,12 +37,9 @@ InternalMemSetMem ( ) **/ -.text .syntax unified -.align 2 -GCC_ASM_EXPORT(InternalMemSetMem) -ASM_PFX(InternalMemSetMem): +ASM_FUNC(InternalMemSetMem) stmfd sp!, {r4-r11, lr} tst r0, #3 movne r3, #0