From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (EUR03-DB5-obe.outbound.protection.outlook.com [40.107.4.47]) by mx.groups.io with SMTP id smtpd.web11.141.1600785799024316301 for ; Tue, 22 Sep 2020 07:43:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=nskAjFeK; spf=pass (domain: arm.com, ip: 40.107.4.47, mailfrom: sami.mujawar@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rx3DVtP9hkCesDfPl394VNQM5QymaU0YBgjCCojdOMU=; b=nskAjFeKc0TU6rCSof2R1dgOB1QKW60es3rehI770XR2hfcdT7uU2UUqAbufTVP60xtets/x4FIVRutfZUTZq4CPnXkU5E/cIsZ+UngNwEPGWXsb+ADlRj1cmA7Bp/YXyZDd9kSH48GEgsnNGTcUyWi9tdS/XeDec3u1PCHtliU= Received: from DB6PR07CA0104.eurprd07.prod.outlook.com (2603:10a6:6:2c::18) by DB7PR08MB3641.eurprd08.prod.outlook.com (2603:10a6:10:4e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.19; Tue, 22 Sep 2020 14:43:16 +0000 Received: from DB5EUR03FT006.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:2c:cafe::f9) by DB6PR07CA0104.outlook.office365.com (2603:10a6:6:2c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.9 via Frontend Transport; Tue, 22 Sep 2020 14:43:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT006.mail.protection.outlook.com (10.152.20.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.15 via Frontend Transport; Tue, 22 Sep 2020 14:43:16 +0000 Received: ("Tessian outbound 7a6fb63c1e64:v64"); Tue, 22 Sep 2020 14:43:16 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: be53d787b3ab46db X-CR-MTA-TID: 64aa7808 Received: from 31d1669ad0e6.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 007B440A-70A7-4FC9-8269-150791E2C372.1; Tue, 22 Sep 2020 14:42:49 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 31d1669ad0e6.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 22 Sep 2020 14:42:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h+cu9z4FVvMJx6Ixy7kxyGHLYhpBPalijXhDY7NlQMoPeZEUD2sVRJGk60o/kXrNoDyNhuCV4taxumEC27UVrUmp5GqogNCeYQ0Qo9jzTu6/xOl0UYa0Ws9UMo0S4kNhYEmVWzRhq2lz4RARJiRy8p3o5EscTEjF7yzk82demVZIvdb3fsgcdImTSY0cCVqHWc/Sx389gfxGKm6430Yayk2YkbTWneiw6zV+x9LQl5XgeH6KmW/1QLyLU+GuOd7UuQRZl/8r3AzdmhbaHWhvLUt4Ovmp8YTDoQFkrmim6iEzIQZ/L0tSZF2Uanlek6zVpArsGfBn+kI7x3ZXL8ruSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rx3DVtP9hkCesDfPl394VNQM5QymaU0YBgjCCojdOMU=; b=Rq2F4iF5fa5krLM+uUI/peivYbwiCKPlylSKb8c+HKVCZPOFFr59s8UhM2nVYgCzdlPuTd6xx6ZHa1gQGfrEswKJnO2shbyYAcy5zGKELYAlNruXvLF+Bg57x57dm4a0X+6VFsEnkpZg0/IAQYRal1xCN91V57nxtMrLlVR4pqDtLk+nL1Du6R2r0dJE7hbvus1K47G+59GYpqyDAzP8NQxS1BLWugZTvtPllVbz7j+hL0MAME7CwTJ9I9sOfniPs8u1xYF8KPF3IbGFMqa41tSoE+KL16xD8rRa8mKw49yBzBP/g1EIAfLS+t9Y5WMYFl6ybT3GOg3vxKCPG9wqwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rx3DVtP9hkCesDfPl394VNQM5QymaU0YBgjCCojdOMU=; b=nskAjFeKc0TU6rCSof2R1dgOB1QKW60es3rehI770XR2hfcdT7uU2UUqAbufTVP60xtets/x4FIVRutfZUTZq4CPnXkU5E/cIsZ+UngNwEPGWXsb+ADlRj1cmA7Bp/YXyZDd9kSH48GEgsnNGTcUyWi9tdS/XeDec3u1PCHtliU= Received: from DB6PR0202CA0007.eurprd02.prod.outlook.com (2603:10a6:4:29::17) by AM0PR08MB4532.eurprd08.prod.outlook.com (2603:10a6:208:145::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.19; Tue, 22 Sep 2020 14:42:47 +0000 Received: from DB5EUR03FT042.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:29:cafe::5f) by DB6PR0202CA0007.outlook.office365.com (2603:10a6:4:29::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.13 via Frontend Transport; Tue, 22 Sep 2020 14:42:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT042.mail.protection.outlook.com (10.152.21.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3391.15 via Frontend Transport; Tue, 22 Sep 2020 14:42:47 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2044.4; Tue, 22 Sep 2020 14:42:38 +0000 Received: from E107187.Arm.com (10.57.47.90) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Tue, 22 Sep 2020 14:42:38 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , Subject: [PATCH v1 5/7] DynamicTablesPkg: AmlLib\AmlDbgPrint fix ECC error Date: Tue, 22 Sep 2020 15:42:33 +0100 Message-ID: <20200922144235.76292-6-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20200922144235.76292-1-sami.mujawar@arm.com> References: <20200922144235.76292-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aefc40be-3e7c-460d-c4a8-08d85f05d74f X-MS-TrafficTypeDiagnostic: AM0PR08MB4532:|DB7PR08MB3641: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: PBMxqXXJDwqPRZW8CJptI9w+pyuAvamUizc422GSLGHWATvr7TebSQ1ROpXKTLwdVrNWQkx0b2o+yqV0nrm2Gf0cfWXApjIZaS8bNUsPrqINSkhZH+INo+7fPJ91Qrqa0ByxKG9rDjqlRS46LPVwt7F3Z7Ti3vGYMx5/y1mkV/m3EY6U3UXMhsdDBZuCGhkIHV0Fl1S95TZi0fVAGde2EmbAliQBpzLHC8lWVaqgoeLSfq6CLUDT+fizeVZhHkqOsElaL/nbu3sv+IxhUG3RN1O1YuAHOpddoSEG1O1zSj+3HA14X1B1L/3V522JYMHvt0NBgYxadgFFPrUfY8Q8NjLImNS8Sg2hgaaGT4bB6uXdNhRN0MxmusB02gcuS45VVcDqvHp3QQWCSl6jlZTR2u+/04unf+8SClXKfG7QMT88hALKVQKNcTRo9JOAfutF X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(396003)(136003)(39840400004)(346002)(376002)(46966005)(2906002)(6666004)(70206006)(86362001)(7696005)(36756003)(82310400003)(30864003)(4326008)(70586007)(54906003)(5660300002)(26005)(8936002)(2616005)(336012)(83380400001)(426003)(8676002)(356005)(47076004)(6916009)(186003)(478600001)(81166007)(1076003)(316002)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4532 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT006.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: d0ded04a-482a-4b7d-da55-08d85f05c61a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ck6F/2S7twtPjRpR3avK7V1jjsKsyntMoPiWcCFYpjGE9z+yfyajjQ0ydK9fVBoyQYxfJOLVvii+teR57TzckKii+QQNC18s3JF0NRTB08C43liG8aXNDADpZDxQZmUzsqHYs0Jsa5z5o5Td4HJi9s0myHlBFD2OC9i9WQIHg+kAepsIRdRi02oq3n2MRLoKlTO30bNoHOqv7Id3NbA6uJGv5X6oc5GXXHxMLSHIpFsHOIDyO/jcZDcMzQQx7NByMsBx1A/E4KidmEJ6g7tSqipiRKV/t31D+rEcBanmE3xjlbUbT67GO9MN7+vqH8FkBVO+ySPcKS64gnST7ciZIEgrv931Rd0QpHXSXKMlavRt7Wfa9CcKhzafp7uuaSBvYToODdlwPolwBQtoDnT7SQ== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(396003)(39840400004)(346002)(376002)(136003)(46966005)(336012)(2906002)(4326008)(316002)(47076004)(36756003)(186003)(426003)(82310400003)(44832011)(6916009)(1076003)(8936002)(8676002)(478600001)(86362001)(26005)(83380400001)(6666004)(81166007)(54906003)(30864003)(7696005)(70206006)(70586007)(5660300002)(2616005);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2020 14:43:16.4659 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aefc40be-3e7c-460d-c4a8-08d85f05d74f X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT006.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3641 Content-Type: text/plain Fix ECC error 8001 reported errors in AmlDbgPrint. [8001] Only capital letters are allowed to be used for #define declarations. Signed-off-by: Sami Mujawar --- DynamicTablesPkg/DynamicTablesPkg.ci.yaml | 1 + DynamicTablesPkg/Library/Common/AmlLib/AmlDbgPrint/AmlDbgPrint.c | 10 ++--- DynamicTablesPkg/Library/Common/AmlLib/AmlDbgPrint/AmlDbgPrint.h | 40 ++++++++++++++++---- DynamicTablesPkg/Library/Common/AmlLib/NameSpace/AmlNameSpace.c | 4 +- DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlFieldListParser.c | 4 +- DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlMethodParser.c | 10 ++--- DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c | 14 +++---- DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlResourceDataParser.c | 2 +- 8 files changed, 55 insertions(+), 30 deletions(-) diff --git a/DynamicTablesPkg/DynamicTablesPkg.ci.yaml b/DynamicTablesPkg/DynamicTablesPkg.ci.yaml index c0d09e79fdf7f6003b5bbda45abc82a0caf4e53f..ecb05f06fb2b0b8c79c359294de3f91f3e46a5e1 100644 --- a/DynamicTablesPkg/DynamicTablesPkg.ci.yaml +++ b/DynamicTablesPkg/DynamicTablesPkg.ci.yaml @@ -71,6 +71,7 @@ "ExtendWords": [ "ARMHB", # ARMHB000 "ARMLTD", + "AMLDBG", "EISAID", "CCIDX", "CCSIDR", diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlDbgPrint/AmlDbgPrint.c b/DynamicTablesPkg/Library/Common/AmlLib/AmlDbgPrint/AmlDbgPrint.c index 7b11cc8e994903b3a9d2dcfd1241b8a447759717..00a61a2fe63a1ac060cd1bd2ed3f438ca66177ee 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/AmlDbgPrint/AmlDbgPrint.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/AmlDbgPrint/AmlDbgPrint.c @@ -163,11 +163,11 @@ AmlDbgPrintNameString ( } if (SegCount != 0) { - AmlDbgPrintNameSeg (Buffer); + AMLDBG_PRINT_NAMESEG (Buffer); Buffer += AML_NAME_SEG_SIZE; for (Index = 0; Index < SegCount - 1; Index++) { DEBUG ((DEBUG_INFO, ".")); - AmlDbgPrintNameSeg (Buffer); + AMLDBG_PRINT_NAMESEG (Buffer); Buffer += AML_NAME_SEG_SIZE; } } @@ -232,7 +232,7 @@ AmlDbgPrintDataNode ( if ((DataNode->DataType == EAmlNodeDataTypeNameString) || (DataNode->DataType == EAmlNodeDataTypeString)) { - AmlDbgPrintChars ( + AMLDBG_PRINT_CHARS ( DEBUG_INFO, (CONST CHAR8*)DataNode->Buffer, DataNode->Size @@ -316,7 +316,7 @@ AmlDbgPrintObjectNode ( DEBUG ((DEBUG_INFO, "0x%08x | ", ObjectNode->AmlByteEncoding->Attribute)); DEBUG ((DEBUG_INFO, "0x%04x | ", ObjectNode->PkgLen)); if (AmlNodeHasAttribute (ObjectNode, AML_IN_NAMESPACE)) { - AmlDbgPrintNameString ( + AMLDBG_PRINT_NAMESTR ( AmlNodeGetName ((CONST AML_OBJECT_NODE*)ObjectNode), FALSE ); @@ -488,7 +488,7 @@ AmlDbgPrintTree ( **/ VOID EFIAPI -DumpRaw ( +AmlDbgDumpRaw ( IN CONST UINT8 * Ptr, IN UINT32 Length ) diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlDbgPrint/AmlDbgPrint.h b/DynamicTablesPkg/Library/Common/AmlLib/AmlDbgPrint/AmlDbgPrint.h index 68f4c7416948a20484b6d5448c231add3f1186dd..e0d527262eb2c6fbd8111f29e958b022443ffdc1 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/AmlDbgPrint/AmlDbgPrint.h +++ b/DynamicTablesPkg/Library/Common/AmlLib/AmlDbgPrint/AmlDbgPrint.h @@ -45,7 +45,7 @@ **/ VOID EFIAPI -DumpRaw ( +AmlDbgDumpRaw ( IN CONST UINT8 * Ptr, IN UINT32 Length ); @@ -133,21 +133,45 @@ AmlDbgPrintNameSpace ( IN AML_ROOT_NODE_HANDLE RootNode ); +/* Macros to encapsulate Aml Debug Print APIs. +*/ + +#define AMLDBG_DUMP_RAW(Ptr, Length) \ + AmlDbgDumpRaw (Ptr, Length) + +#define AMLDBG_PRINT_CHARS(ErrorLevel, Buffer, Size) \ + AmlDbgPrintChars (ErrorLevel, Buffer, Size) + +#define AMLDBG_PRINT_NAMESEG(Buffer) \ + AmlDbgPrintNameSeg (Buffer) + +#define AMLDBG_PRINT_NAMESTR(Buffer,NewLine) \ + AmlDbgPrintNameString (Buffer,NewLine) + +#define AMLDBG_PRINT_NODE(Node) \ + AmlDbgPrintNode (Node) + +#define AMLDBG_PRINT_TREE(Node) \ + AmlDbgPrintTree (Node) + +#define AMLDBG_PRINT_NAMESPACE(RootNode) \ + AmlDbgPrintNameSpace (RootNode) + #else -#define DumpRaw(Ptr, Length) +#define AMLDBG_DUMP_RAW(Ptr, Length) -#define AmlDbgPrintChars(ErrorLevel, Buffer, Size) +#define AMLDBG_PRINT_CHARS(ErrorLevel, Buffer, Size) -#define AmlDbgPrintNameSeg(Buffer) +#define AMLDBG_PRINT_NAMESEG(Buffer) -#define AmlDbgPrintNameString(Buffer,NewLine) +#define AMLDBG_PRINT_NAMESTR(Buffer,NewLine) -#define AmlDbgPrintNode(Node) +#define AMLDBG_PRINT_NODE(Node) -#define AmlDbgPrintTree(Node) +#define AMLDBG_PRINT_TREE(Node) -#define AmlDbgPrintNameSpace(RootNode) +#define AMLDBG_PRINT_NAMESPACE(RootNode) #endif // MDEPKG_NDEBUG diff --git a/DynamicTablesPkg/Library/Common/AmlLib/NameSpace/AmlNameSpace.c b/DynamicTablesPkg/Library/Common/AmlLib/NameSpace/AmlNameSpace.c index 30d31572d379028a28d532c17092bef585959a50..2d055e9fb9645766a2f769b4aa304e91c2602107 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/NameSpace/AmlNameSpace.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/NameSpace/AmlNameSpace.c @@ -1140,13 +1140,13 @@ AmlEnumeratePathCallback ( "Comparing search path with current node path.\n" )); DEBUG ((DEBUG_VERBOSE, "Search path:")); - AmlDbgPrintChars ( + AMLDBG_PRINT_CHARS ( DEBUG_VERBOSE, (CHAR8*)AmlStreamGetCurrPos (SearchPathBStream), AmlStreamGetIndex (SearchPathBStream) ); DEBUG ((DEBUG_VERBOSE, "\nPath of the current node: ")); - AmlDbgPrintChars ( + AMLDBG_PRINT_CHARS ( DEBUG_VERBOSE, (CHAR8*)AmlStreamGetCurrPos (CurrNodePathBStream), AmlStreamGetIndex (CurrNodePathBStream) diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlFieldListParser.c b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlFieldListParser.c index b9403efe3ca6f44712c91203c27410ec15eb3011..24460f9c8007a900a77f42ba8f718fd8fd5fbeab 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlFieldListParser.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlFieldListParser.c @@ -82,7 +82,7 @@ AmlParseFieldElement ( } // Skip the field opcode (1 byte) as it is already in the FieldByteEncoding. - DumpRaw (CurrPos, 1); + AMLDBG_DUMP_RAW (CurrPos, 1); Status = AmlStreamProgress (FStream, 1); if (EFI_ERROR (Status)) { ASSERT (0); @@ -106,7 +106,7 @@ AmlParseFieldElement ( } // Move stream forward as the PkgLen has been read. - DumpRaw (CurrPos, PkgLenOffset); + AMLDBG_DUMP_RAW (CurrPos, PkgLenOffset); Status = AmlStreamProgress (FStream, PkgLenOffset); if (EFI_ERROR (Status)) { ASSERT (0); diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlMethodParser.c b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlMethodParser.c index 4797fa11edebc35628ef9c07a1feffff6b14a204..53e91dd6278bcfb5d0be9ff2c9a04db6d39ab57c 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlMethodParser.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlMethodParser.c @@ -173,7 +173,7 @@ AmlDbgPrintNameSpaceRefList ( while (CurrLink != NameSpaceRefList) { CurrNameSpaceNode = (AML_NAMESPACE_REF_NODE*)CurrLink; - AmlDbgPrintChars ( + AMLDBG_PRINT_CHARS ( DEBUG_INFO, CurrNameSpaceNode->RawAbsolutePath, CurrNameSpaceNode->RawAbsolutePathSize @@ -749,7 +749,7 @@ AmlFindMethodDefinition ( } DEBUG ((DEBUG_VERBOSE, "AmlMethodParser: Checking absolute name: ")); - AmlDbgPrintChars ( + AMLDBG_PRINT_CHARS ( DEBUG_VERBOSE, (CONST CHAR8*)AmlStreamGetCurrPos (RawAbsolutePathFStream), AmlStreamGetMaxBufferSize (RawAbsolutePathFStream) @@ -768,7 +768,7 @@ AmlFindMethodDefinition ( ProbedNameSpaceRefNode = (AML_NAMESPACE_REF_NODE*)NextLink; // Print the raw absolute path of the probed node. - AmlDbgPrintChars ( + AMLDBG_PRINT_CHARS ( DEBUG_VERBOSE, ProbedNameSpaceRefNode->RawAbsolutePath, ProbedNameSpaceRefNode->RawAbsolutePathSize @@ -1067,7 +1067,7 @@ AmlIsMethodInvocation ( DEBUG_VERBOSE, "AmlMethodParser: Corresponding method definition: " )); - AmlDbgPrintChars ( + AMLDBG_PRINT_CHARS ( DEBUG_VERBOSE, NameSpaceRefNode->RawAbsolutePath, NameSpaceRefNode->RawAbsolutePathSize @@ -1230,7 +1230,7 @@ AmlAddNameSpaceReference ( DEBUG_VERBOSE, "AmlMethodParser: Adding namespace reference with name:\n" )); - AmlDbgPrintChars ( + AMLDBG_PRINT_CHARS ( DEBUG_VERBOSE, (CONST CHAR8*)AmlStreamGetCurrPos (&RawAbsolutePathBStream), AmlStreamGetIndex (&RawAbsolutePathBStream) diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c index 4f6623de02d519e5345955603d0ce3f1056e4f17..e3b9f249058fee10a14a40a731159cb3c878957c 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c @@ -182,7 +182,7 @@ AmlParseUIntX ( return Status; } - DumpRaw (AmlStreamGetCurrPos (FStream), UIntXSize); + AMLDBG_DUMP_RAW (AmlStreamGetCurrPos (FStream), UIntXSize); // Move stream forward by the size of UIntX. Status = AmlStreamProgress (FStream, UIntXSize); @@ -266,7 +266,7 @@ AmlParseNameString ( return Status; } - DumpRaw (AmlStreamGetCurrPos (FStream), StrSize); + AMLDBG_DUMP_RAW (AmlStreamGetCurrPos (FStream), StrSize); // Move the stream forward by StrSize. Status = AmlStreamProgress (FStream, StrSize); @@ -335,7 +335,7 @@ AmlParseString ( StrSize++; } while (Byte != '\0'); - DumpRaw (Buffer, StrSize); + AMLDBG_DUMP_RAW (Buffer, StrSize); Status = AmlCreateDataNode ( AmlTypeToNodeDataType (ExpectedFormat), @@ -441,7 +441,7 @@ AmlParseObject ( } // Print the opcode. - DumpRaw (Buffer, OpCodeSize); + AMLDBG_DUMP_RAW (Buffer, OpCodeSize); if (!IS_END_OF_STREAM (FStream)) { // 3. Parse the PkgLength field, if present. @@ -454,7 +454,7 @@ AmlParseObject ( } // Print the package length. - DumpRaw (Buffer, PkgOffset); + AMLDBG_DUMP_RAW (Buffer, PkgOffset); // Adjust the size of the stream if it is valid package length. FreeSpace = AmlStreamGetFreeSpace (FStream); @@ -559,7 +559,7 @@ AmlParseFieldPkgLen ( return Status; } - DumpRaw (Buffer, PkgOffset); + AMLDBG_DUMP_RAW (Buffer, PkgOffset); Status = AmlStreamProgress (FStream, PkgOffset); if (EFI_ERROR (Status)) { @@ -844,7 +844,7 @@ AmlParseByteList ( return Status; } - DumpRaw (Buffer, BufferSize); + AMLDBG_DUMP_RAW (Buffer, BufferSize); // Move the stream forward as we have consumed the Buffer. Status = AmlStreamProgress (FStream, BufferSize); diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlResourceDataParser.c b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlResourceDataParser.c index 0f41c68b283794a577c551b0320afc5b6dcf55d7..7f78ed51bf2ef2acdd1c2448b2af8b9facfdf5a7 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlResourceDataParser.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlResourceDataParser.c @@ -310,7 +310,7 @@ AmlParseResourceData ( return Status; } - DumpRaw (CurrRdElement, CurrRdElementSize); + AMLDBG_DUMP_RAW (CurrRdElement, CurrRdElementSize); // Exit the loop when finding the resource data end tag. if (AmlRdCompareDescId ( -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'