From patchwork Thu Dec 20 17:31:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 154351 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6456764ljp; Thu, 20 Dec 2018 09:31:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/XtqmNrmobH149uDG+xbPnihTWqhEV1s/QydNwsjrkqZriamrRH24q95BI45IUQZI6AH33C X-Received: by 2002:a63:2a4a:: with SMTP id q71mr23725010pgq.374.1545327080696; Thu, 20 Dec 2018 09:31:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545327080; cv=none; d=google.com; s=arc-20160816; b=Fc6xFNV4lAbA04/tP8Mxb9QgMcKRRFR56GMWyFDPNY3pKKvf+IojP7BH2dJ6Zh0BqI cscsYq3kwkDgrfE2alRLlHET9V/iZH1VeKzeDX1K1H89l5VClU9n4fqS/K+mn89SuBZE 9DFlOR1yCsUcgqLbdciJhGFcM3FfnjZTiLpffBdJnLu5GPlrYd3VDp/FNV7N7UyidRTy O7XWuHPAYYYyQZTPxhZIkpTIzPfoCas80TWpyVKrp+EqDO5f2C2B9phXTT9cA+44vog0 0CSg3A5G0XPBZYjhwf+kuHxoyaNDucztq4sCjjqiFt6Eki/VNh8gUN0ExfXCzU3vy9Qx DxsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=3nKILYX0TOas/yAcvQ8Q0GE29JbWRV2JLXJxBfGxcnc=; b=DlkuKwEyRg53kitLrTesXjs/cl0CYRwqH+bCOeEbmeQ5tWrf6gll3XX2wbLMRe36tj lb+5yEaBX3GkTdv6Sjjimk1QnxYhhAfzEVRVoofy19udh8RONm2/nlD1aMBxHj8L4iTX OKfWOQhZxW0Chskz1x7PfYfTUoeGp2c87SGPfmsPDGULPeqhucSJt0QA+v27maR/DYGv a/SQaZUUXiQZHTKh6MlFrgaobK8ExB0i9Dq+OLf+lM2SrSXznGpleVVxAskEkVOiFfOL kj0Pr+ZvSBWwBOB+weeNx8HwJoe2acTbWQ0MG3tmyn+1ZlopHyacN8jJ+murrXoJBKjW hnlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=N6beZDPe; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id cf17si19136081plb.52.2018.12.20.09.31.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Dec 2018 09:31:20 -0800 (PST) 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 header.s=google header.b=N6beZDPe; 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 sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 63232211A458F; Thu, 20 Dec 2018 09:31:16 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::344; helo=mail-wm1-x344.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (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 67B7921BADAB9 for ; Thu, 20 Dec 2018 09:31:14 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id f81so3090577wmd.4 for ; Thu, 20 Dec 2018 09:31:14 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=pm8gswzlUQTR/O3539Y+H/MbcDCFNio2Y9tnn/psWFM=; b=N6beZDPeIn9otF9ipY3qI3mcwyoDKNa10FZYVZlgCPC7h/uiatuUElioKOXKTZXkHG TTZv6SIJfbRevuub9xqTxG4hLf+esCOdP57MQUzolKILRm4uwJdXBobeIYfpm4zWayK5 aBbndMxetxf9oPsE8vHWZO9vHslmSUzOZVVkY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pm8gswzlUQTR/O3539Y+H/MbcDCFNio2Y9tnn/psWFM=; b=kU7G5CfYZQMPxTOSp9I4blw09XLj2bjF9xKEy6xcUu6PymtadeRrwfJd9WZ7lZNrzw vbdQ7F7KrN4p0F8rwy8kp1RIUT3+OXG6Lb4o4dz7ovI0zU+f5CP1DPjamFND+nSSbnG7 xu01WZQapzruRhmpAko6W9tdjBZE9Sd1CagjpJDlFvRzsuQ9ryopMfYeowyQvLSEpf/7 nn//oJhe+Van0KWLNuZpPwIrNU4/00zCj7K8ORHg+hl7cXv9vQas4Osfx9F5uOAmXu4c kP3K6q1tFflgbRfqGao04w36XN/6t/qqVd2nywUFl6Y6nN6oiQ/3jdlGsr46Tn8M+E21 quSg== X-Gm-Message-State: AA+aEWYL90oPtGzPkPwNM9npCEvT+ffJxwzsRWVFmVmGvthIT1pNOZ72 68XQRvdiQ9o0+GgQPVt52bnTrZ2McTwzSQ== X-Received: by 2002:a1c:544f:: with SMTP id p15mr12294668wmi.37.1545327072521; Thu, 20 Dec 2018 09:31:12 -0800 (PST) Received: from localhost.localdomain (aputeaux-683-1-2-211.w90-86.abo.wanadoo.fr. [90.86.101.211]) by smtp.gmail.com with ESMTPSA id x12sm6826131wrt.20.2018.12.20.09.31.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Dec 2018 09:31:11 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 20 Dec 2018 18:31:03 +0100 Message-Id: <20181220173104.11481-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181220173104.11481-1-ard.biesheuvel@linaro.org> References: <20181220173104.11481-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH 3/4] ArmPkg/DefaultExceptionHandlerLib: drop BASE variant X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lersek@redhat.com Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Drop the redundant BASE variant, which is no longer used anywhere now that DebugAgentSymbolsBaseLib no longer incorporates a vector table and exception handling. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPkg/ArmPkg.dsc | 1 - ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c | 35 --------------- ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf | 45 -------------------- ArmVirtPkg/ArmVirt.dsc.inc | 1 - 4 files changed, 82 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 5d83c18b143e..d9f9935d70b6 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -141,7 +141,6 @@ ArmPkg/Library/ArmGicArchSecLib/ArmGicArchSecLib.inf ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf - ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c deleted file mode 100644 index 4a54298b1189..000000000000 --- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerBase.c +++ /dev/null @@ -1,35 +0,0 @@ -/** @file - - Copyright (c) 2012, ARM Ltd. All rights reserved.
- - This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include - -/** - - @param FaultAddress Address to find PE/COFF image for. - @param ImageBase Return load address of found image - @param PeCoffSizeOfHeaders Return the size of the PE/COFF header for the image that was found - - @retval NULL FaultAddress not in a loaded PE/COFF image. - @retval Path and file name of PE/COFF image. - -**/ -CHAR8 * -GetImageName ( - IN UINTN FaultAddress, - OUT UINTN *ImageBase, - OUT UINTN *PeCoffSizeOfHeaders - ) -{ - return NULL; -} diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf deleted file mode 100644 index b53a5e89f507..000000000000 --- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf +++ /dev/null @@ -1,45 +0,0 @@ -#/** @file -# -# Copyright (c) 2012, ARM Ltd. All rights reserved.
-# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -# -#**/ - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = DefaultExceptionHandlerBaseLib - FILE_GUID = 3d5261d5-5eb7-4559-98e7-475aa9d0dc42 - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = DefaultExceptionHandlerLib - -[Sources.common] - DefaultExceptionHandlerBase.c - -[Sources.ARM] - Arm/DefaultExceptionHandler.c - -[Sources.AARCH64] - AArch64/DefaultExceptionHandler.c - -[Packages] - MdePkg/MdePkg.dec - ArmPkg/ArmPkg.dec - -[LibraryClasses] - BaseLib - PrintLib - DebugLib - PeCoffGetEntryPointLib - ArmDisassemblerLib - SerialPortLib - -[Guids] - gEfiDebugImageInfoTableGuid diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 89c2db074711..c47955be940c 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -174,7 +174,6 @@ BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf DebugAgentLib|ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf - DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf