From patchwork Wed Aug 10 15:17:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 73651 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp455565qga; Wed, 10 Aug 2016 08:18:21 -0700 (PDT) X-Received: by 10.98.12.18 with SMTP id u18mr8012756pfi.89.1470842300988; Wed, 10 Aug 2016 08:18:20 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id xr3si25881509pab.234.2016.08.10.08.18.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 08:18:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; 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 198.145.21.10 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 BE77B1A1E36; Wed, 10 Aug 2016 08:18:19 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22d.google.com (mail-wm0-x22d.google.com [IPv6:2a00:1450:400c:c09::22d]) (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 E96C21A1E2F for ; Wed, 10 Aug 2016 08:18:17 -0700 (PDT) Received: by mail-wm0-x22d.google.com with SMTP id i5so111304025wmg.0 for ; Wed, 10 Aug 2016 08:18:17 -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=m7TxY2DKLydeozPGqBg+D8ujf6XQdJeKxDwrJ/U4JTw=; b=Zk7jjH0QWggH9etvx6gTiAg9RzI7KTgtuSeDGqC8kQUy8jnF0t6uGszvwXVcoEXi5A 5spCXQhh6B1O6q9kbjUSPK/qpMGiTkLMHf93+0N/fYcfAWAWfw9+nAxReJ8w6Ex7gHVA 0GSHIt/6svZxsTDuT5FGIOcy1IJfzfNCVno5U= 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=m7TxY2DKLydeozPGqBg+D8ujf6XQdJeKxDwrJ/U4JTw=; b=dsKw9TzMT20sbWAuriWWW/fATqoCxlo5PkAgUWzOL2TjpJWMSsRsyvJfavg33BObUe XSsabPM5upJ0CLZ93iBwzC/eDG7kmOefaDcOPiakMxoNmlnDL4WyQ4JPWbHsIaD3JmEw gTqpTysgdMX8udUD+bWGJ2pA192arHtt9WK81NEIQ1DG2bX2pPhHhFIBno83y/N1hgRl BatcHtsuHJKMOg52pyg8eVTwe/xTMAwtSVsBUQX3z6i1OT8dmBBrow9vXzIpy+KU3gOc ZxbIylIs7yEcXFYu25qyqMYsSgwddPgCdUVKnr/I2licMW+4tnXzWxduDrk19nxhq/Pz qj6g== X-Gm-Message-State: AEkoousg9wpSRxEm5eT/wwVQloz2zdG4bRHzst7RmPcm4lOeVIQhmYQHKo4+bGQy8URYjZ0f X-Received: by 10.194.27.133 with SMTP id t5mr4439048wjg.15.1470842296247; Wed, 10 Aug 2016 08:18:16 -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.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Aug 2016 08:18:15 -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:39 +0200 Message-Id: <1470842282-8415-4-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 03/26] ArmPkg/AsmMacroIoLib: remove unused obsolete MMIO and other asm macros 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" This removes the various Mmio ASM macros that are not used anywhere in the code, and removes some variants of LoadConstant... () that are not used anywhere either. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPkg/Include/AsmMacroIoLib.h | 213 -------------------- ArmPkg/Include/AsmMacroIoLib.inc | 54 ----- 2 files changed, 267 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h index f94dcc619f7a..551b87803d19 100644 --- a/ArmPkg/Include/AsmMacroIoLib.h +++ b/ArmPkg/Include/AsmMacroIoLib.h @@ -24,88 +24,6 @@ // ldr reg, =expr does not work with current Apple tool chain. So do the work our selves // -// returns _Data in R0 and _Address in R1 -#define MmioWrite32(_Address, _Data) \ - ldr r1, [pc, #8] ; \ - ldr r0, [pc, #8] ; \ - str r0, [r1] ; \ - b 1f ; \ - .long (_Address) ; \ - .long (_Data) ; \ -1: - -// returns _Data in R0 and _Address in R1, and _OrData in r2 -#define MmioOr32(_Address, _OrData) \ - ldr r1, [pc, #16] ; \ - ldr r2, [pc, #16] ; \ - ldr r0, [r1] ; \ - orr r0, r0, r2 ; \ - str r0, [r1] ; \ - b 1f ; \ - .long (_Address) ; \ - .long (_OrData) ; \ -1: - -// returns _Data in R0 and _Address in R1, and _OrData in r2 -#define MmioAnd32(_Address, _AndData) \ - ldr r1, [pc, #16] ; \ - ldr r2, [pc, #16] ; \ - ldr r0, [r1] ; \ - and r0, r0, r2 ; \ - str r0, [r1] ; \ - b 1f ; \ - .long (_Address) ; \ - .long (_AndData) ; \ -1: - -// returns result in R0, _Address in R1, and _OrData in r2 -#define MmioAndThenOr32(_Address, _AndData, _OrData) \ - ldr r1, [pc, #24] ; \ - ldr r0, [r1] ; \ - ldr r2, [pc, #20] ; \ - and r0, r0, r2 ; \ - ldr r2, [pc, #16] ; \ - orr r0, r0, r2 ; \ - str r0, [r1] ; \ - b 1f ; \ - .long (_Address) ; \ - .long (_AndData) ; \ - .long (_OrData) ; \ -1: - -// returns _Data in _Reg and _Address in R1 -#define MmioWriteFromReg32(_Address, _Reg) \ - ldr r1, [pc, #4] ; \ - str _Reg, [r1] ; \ - b 1f ; \ - .long (_Address) ; \ -1: - - -// returns _Data in R0 and _Address in R1 -#define MmioRead32(_Address) \ - ldr r1, [pc, #4] ; \ - ldr r0, [r1] ; \ - b 1f ; \ - .long (_Address) ; \ -1: - -// returns _Data in Reg and _Address in R1 -#define MmioReadToReg32(_Address, _Reg) \ - ldr r1, [pc, #4] ; \ - ldr _Reg, [r1] ; \ - b 1f ; \ - .long (_Address) ; \ -1: - - -// load R0 with _Data -#define LoadConstant(_Data) \ - ldr r0, [pc, #0] ; \ - b 1f ; \ - .long (_Data) ; \ -1: - // load _Reg with _Data #define LoadConstantToReg(_Data, _Reg) \ ldr _Reg, [pc, #0] ; \ @@ -113,91 +31,8 @@ .long (_Data) ; \ 1: -// load _Reg with _Data if eq -#define LoadConstantToRegIfEq(_Data, _Reg) \ - ldreq _Reg, [pc, #0] ; \ - b 1f ; \ - .long (_Data) ; \ -1: - -// Reserve a region at the top of the Primary Core stack -// for Global variables for the XIP phase -#define SetPrimaryStack(StackTop, GlobalSize, Tmp) \ - and Tmp, GlobalSize, #7 ; \ - rsbne Tmp, Tmp, #8 ; \ - add GlobalSize, GlobalSize, Tmp ; \ - sub sp, StackTop, GlobalSize ; \ - ; \ - mov Tmp, sp ; \ - mov GlobalSize, #0x0 ; \ -_SetPrimaryStackInitGlobals: ; \ - cmp Tmp, StackTop ; \ - beq _SetPrimaryStackEnd ; \ - str GlobalSize, [Tmp], #4 ; \ - b _SetPrimaryStackInitGlobals ; \ -_SetPrimaryStackEnd: - -// Initialize the Global Variable with '0' -#define InitializePrimaryStack(GlobalSize, Tmp1) \ - and Tmp1, GlobalSize, #7 ; \ - rsbne Tmp1, Tmp1, #8 ; \ - add GlobalSize, GlobalSize, Tmp1 ; \ - ; \ - mov Tmp1, sp ; \ - sub sp, GlobalSize ; \ - mov GlobalSize, #0x0 ; \ -_InitializePrimaryStackLoop: ; \ - cmp Tmp1, sp ; \ - bls _InitializePrimaryStackEnd ; \ - str GlobalSize, [Tmp1, #-4]! ; \ - b _InitializePrimaryStackLoop ; \ -_InitializePrimaryStackEnd: - #elif defined (__GNUC__) -#define MmioWrite32(Address, Data) \ - ldr r1, =Address ; \ - ldr r0, =Data ; \ - str r0, [r1] - -#define MmioOr32(Address, OrData) \ - ldr r1, =Address ; \ - ldr r2, =OrData ; \ - ldr r0, [r1] ; \ - orr r0, r0, r2 ; \ - str r0, [r1] - -#define MmioAnd32(Address, AndData) \ - ldr r1, =Address ; \ - ldr r2, =AndData ; \ - ldr r0, [r1] ; \ - and r0, r0, r2 ; \ - str r0, [r1] - -#define MmioAndThenOr32(Address, AndData, OrData) \ - ldr r1, =Address ; \ - ldr r0, [r1] ; \ - ldr r2, =AndData ; \ - and r0, r0, r2 ; \ - ldr r2, =OrData ; \ - orr r0, r0, r2 ; \ - str r0, [r1] - -#define MmioWriteFromReg32(Address, Reg) \ - ldr r1, =Address ; \ - str Reg, [r1] - -#define MmioRead32(Address) \ - ldr r1, =Address ; \ - ldr r0, [r1] - -#define MmioReadToReg32(Address, Reg) \ - ldr r1, =Address ; \ - ldr Reg, [r1] - -#define LoadConstant(Data) \ - ldr r0, =Data - #define LoadConstantToReg(Data, Reg) \ ldr Reg, =Data @@ -209,59 +44,11 @@ _InitializePrimaryStackEnd: // Less magic in the macros if ldr reg, =expr works // -// returns _Data in R0 and _Address in R1 - - - -#define MmioWrite32(Address, Data) MmioWrite32Macro Address, Data - - - - -// returns Data in R0 and Address in R1, and OrData in r2 -#define MmioOr32(Address, OrData) MmioOr32Macro Address, OrData - - -// returns _Data in R0 and _Address in R1, and _OrData in r2 - - -#define MmioAnd32(Address, AndData) MmioAnd32Macro Address, AndData - -// returns result in R0, _Address in R1, and _OrData in r2 - - -#define MmioAndThenOr32(Address, AndData, OrData) MmioAndThenOr32Macro Address, AndData, OrData - - -// returns _Data in _Reg and _Address in R1 - - -#define MmioWriteFromReg32(Address, Reg) MmioWriteFromReg32Macro Address, Reg - -// returns _Data in R0 and _Address in R1 - - -#define MmioRead32(Address) MmioRead32Macro Address - -// returns _Data in Reg and _Address in R1 - - -#define MmioReadToReg32(Address, Reg) MmioReadToReg32Macro Address, Reg - - -// load R0 with _Data - - -#define LoadConstant(Data) LoadConstantMacro Data - // load _Reg with _Data #define LoadConstantToReg(Data, Reg) LoadConstantToRegMacro Data, Reg -// conditional load testing eq flag -#define LoadConstantToRegIfEq(Data, Reg) LoadConstantToRegIfEqMacro Data, Reg - #endif #endif diff --git a/ArmPkg/Include/AsmMacroIoLib.inc b/ArmPkg/Include/AsmMacroIoLib.inc index 95dc640d6fc3..c9cad5230c94 100644 --- a/ArmPkg/Include/AsmMacroIoLib.inc +++ b/ArmPkg/Include/AsmMacroIoLib.inc @@ -17,60 +17,6 @@ MACRO - MmioWrite32Macro $Address, $Data - ldr r1, = ($Address) - ldr r0, = ($Data) - str r0, [r1] - MEND - - MACRO - MmioOr32Macro $Address, $OrData - ldr r1, =($Address) - ldr r2, =($OrData) - ldr r0, [r1] - orr r0, r0, r2 - str r0, [r1] - MEND - - MACRO - MmioAnd32Macro $Address, $AndData - ldr r1, =($Address) - ldr r2, =($AndData) - ldr r0, [r1] - and r0, r0, r2 - str r0, [r1] - MEND - - MACRO - MmioAndThenOr32Macro $Address, $AndData, $OrData - ldr r1, =($Address) - ldr r0, [r1] - ldr r2, =($AndData) - and r0, r0, r2 - ldr r2, =($OrData) - orr r0, r0, r2 - str r0, [r1] - MEND - - MACRO - MmioWriteFromReg32Macro $Address, $Reg - ldr r1, =($Address) - str $Reg, [r1] - MEND - - MACRO - MmioRead32Macro $Address - ldr r1, =($Address) - ldr r0, [r1] - MEND - - MACRO - MmioReadToReg32Macro $Address, $Reg - ldr r1, =($Address) - ldr $Reg, [r1] - MEND - - MACRO LoadConstantMacro $Data ldr r0, =($Data) MEND