From nobody Mon Dec 23 14:15:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 151624349595870.81470577726293; Wed, 17 Jan 2018 18:44:55 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 7A782221F93AD; Wed, 17 Jan 2018 18:39:33 -0800 (PST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 660542034A8CC for ; Wed, 17 Jan 2018 18:39:30 -0800 (PST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jan 2018 18:44:51 -0800 Received: from shwde7172.ccr.corp.intel.com ([10.239.9.15]) by orsmga004.jf.intel.com with ESMTP; 17 Jan 2018 18:44:50 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,375,1511856000"; d="scan'208";a="167022597" From: Liming Gao To: edk2-devel@lists.01.org Date: Thu, 18 Jan 2018 10:44:47 +0800 Message-Id: <1516243487-3992-1-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 Subject: [edk2] [Patch] IntelFsp2WrapperPkg: Update BaseFspWrapperApiLib to pass XCODE5 build X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" XCODE5 doesn't support absolute addressing in the assembly code. This change uses lea instruction to get the address. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Cc: Jiewen Yao Reviewed-by: Jiewen.yao@intel.com --- .../Library/BaseFspWrapperApiLib/X64/Thunk64To32.nasm | 10 +++++-= ---- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/X64/Thunk64To= 32.nasm b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/X64/Thunk64To32.= nasm index bcc6d70..a6ad6cf 100644 --- a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/X64/Thunk64To32.nasm +++ b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/X64/Thunk64To32.nasm @@ -1,5 +1,5 @@ ; -; Copyright (c) 2016, Intel Corporation. All rights reserved.
+; Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BS= D License ; which accompanies this distribution. The full text of the license may b= e found at @@ -81,7 +81,7 @@ ASM_PFX(AsmExecute32BitCode): ; mov rax, dword 0x10 ; load long mode selector shl rax, 32 - mov r9, ReloadCS ;Assume the ReloadCS is under 4G + lea r9, [ReloadCS] ;Assume the ReloadCS is under 4G or rax, r9 push rax ; @@ -95,7 +95,7 @@ ASM_PFX(AsmExecute32BitCode): ; save the 32-bit function entry and the return address into stack whi= ch will be ; retrieve in compatibility mode. ; - mov rax, ReturnBack ;Assume the ReloadCS is under 4G + lea rax, [ReturnBack] ;Assume the ReloadCS is under 4G shl rax, 32 or rax, rcx push rax @@ -110,7 +110,7 @@ ASM_PFX(AsmExecute32BitCode): ; mov rcx, dword 0x8 ; load compatible mode selector shl rcx, 32 - mov rdx, Compatible ; assume address < 4G + lea rdx, [Compatible] ; assume address < 4G or rcx, rdx push rcx retf @@ -208,7 +208,7 @@ ReloadCS: ; pop r9 ; get CS shl r9, 32 ; rcx[32..47] <- Cs - mov rcx, .0 + lea rcx, [.0] or rcx, r9 push rcx retf --=20 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel