From nobody Sat May 18 21:45:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+105504+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105504+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1685546338; cv=none; d=zohomail.com; s=zohoarc; b=hV+YTyNmSAUeBo9vYEEMfrrJjtkiPQbAvqaSLiyMDsATFLUXawV0oMinh2DlFrsYQjcnrw5fhj6HVcmIEvi64oOBuJ9oTmX0j42R0xz7cG4tWAZ3tMEb/nNt/0lIkEM78+Cmv2/ZhX5eQRV4+orTh39nIMKsdjaGTftNe7+tM5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685546338; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=FBoSohwo2lX8oiE6Tlohpd1Uf/0aMLVZDNUerazXEKA=; b=Xripj8QtgecvXE44jlLq7dc5KtPEGqLJzinbBt5cgDVZQIs25GsJDv8HORwZQKbiJDSlzKSgQUVQhTa9yX4omOSNSVH2oxbyz+RYqGU5Cbb6359nhx3nI5tRJWFtwcBT8VVbMW5I1efAyV/j8b2qgOZm0hsYc1R0iCUJGAg5vI0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105504+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1685546338134176.2752040380501; Wed, 31 May 2023 08:18:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id m938YY1788612xlA1JyJwhFC; Wed, 31 May 2023 08:18:57 -0700 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.5760.1685504915983820065 for ; Tue, 30 May 2023 20:48:36 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="358387626" X-IronPort-AV: E=Sophos;i="6.00,205,1681196400"; d="scan'208";a="358387626" X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 20:48:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="953450630" X-IronPort-AV: E=Sophos;i="6.00,205,1681196400"; d="scan'208";a="953450630" X-Received: from unknown (HELO jiaqingz-acrn-container.sh.intel.com) ([10.239.138.235]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 20:48:33 -0700 From: Jiaqing Zhao To: devel@edk2.groups.io Cc: Jiaqing Zhao Subject: [edk2-devel] [PATCH] IntelFsp2Pkg/Tools: PatchFv: Handle 32-bit address in GCC map Date: Wed, 31 May 2023 03:48:27 +0000 Message-Id: <20230531034827.93847-1-jiaqing.zhao@linux.intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jiaqing.zhao@linux.intel.com X-Gm-Message-State: 8PgsgRdxiNXXwfcNVs57z8FSx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1685546337; bh=w9CIeWQzzjqKDdp3zVXNRYnvxb+432EjKY5ct0ModcM=; h=Cc:Date:From:Reply-To:Subject:To; b=V3IZnTOU9kDjOsLk+Hp/0NSpsXeBntFCglGiozzS6J/HbmJqIZguMSrG7i9mOYuqTSZ H+KLSIR+pzDyTeFp3HZng3dJPs9aKlKol1GBCn8CRYmfsrQwBsYlc4exy3rVl5QAoFx8W 2+3tnSLGPDqQNcICQdGwrW2HkSALRCnx+7E= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1685546339587100005 Content-Type: text/plain; charset="utf-8" Some versions of ld (like 2.40 in Ubuntu 23.04) uses 32-bit address when generating map files for IA32 build. This patch enables PatchFv.py to parse these 32-bit addresses in GCC map properly. Signed-off-by: Jiaqing Zhao --- IntelFsp2Pkg/Tools/PatchFv.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/IntelFsp2Pkg/Tools/PatchFv.py b/IntelFsp2Pkg/Tools/PatchFv.py index 73ab877c71..2e60343180 100644 --- a/IntelFsp2Pkg/Tools/PatchFv.py +++ b/IntelFsp2Pkg/Tools/PatchFv.py @@ -432,7 +432,8 @@ class Symbols: if reportLine.strip().find("Archive member included") !=3D -1: #GCC # 0x0000000000001d55 IoRead8 - patchMapFileMatchString =3D "\s+(0x[0-9a-fA-F]{16})\s+([^\s][^= 0x][_a-zA-Z0-9\-]+)\s" + # 0x00001d55 IoRead8 + patchMapFileMatchString =3D "\s+(0x[0-9a-fA-F]{8,16})\s+([^\s]= [^0x][_a-zA-Z0-9\-]+)\s" matchKeyGroupIndex =3D 2 matchSymbolGroupIndex =3D 1 prefix =3D '_' @@ -458,7 +459,7 @@ class Symbols: if handleNext: handleNext =3D False pcdName =3D match.group(1) - match =3D re.match("\s+(0x[0-9a-fA-F]{16})\s+", repo= rtLine) + match =3D re.match("\s+(0x[0-9a-fA-F]{8,16})\s+", re= portLine) if match is not None: modSymbols[prefix + pcdName] =3D match.group(1) else: --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#105504): https://edk2.groups.io/g/devel/message/105504 Mute This Topic: https://groups.io/mt/99244490/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-