From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=zhichao.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 948C0211DE90F for ; Thu, 14 Mar 2019 22:18:30 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Mar 2019 22:18:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,481,1544515200"; d="scan'208";a="152540187" Received: from gaozhic-mobl.ccr.corp.intel.com ([10.239.196.107]) by fmsmga004.fm.intel.com with ESMTP; 14 Mar 2019 22:18:29 -0700 From: Zhichao Gao To: edk2-devel@lists.01.org Cc: Liming Gao , Sean Brogan , Michael Turner , Bret Barkelew Date: Fri, 15 Mar 2019 13:17:44 +0800 Message-Id: <20190315051749.6564-13-zhichao.gao@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20190315051749.6564-1-zhichao.gao@intel.com> References: <20190315051749.6564-1-zhichao.gao@intel.com> Subject: [PATCH V2 12/17] IntelFramworkModulePkg/PeiDxeDebugLibReportStatusCode: Add a new api 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: , X-List-Received-Date: Fri, 15 Mar 2019 05:18:30 -0000 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1395 Add a new api DebugVPrint implementation in the DebugLib instance. This api would expose a print routine with VaList parameter. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zhichao Gao Cc: Liming Gao Cc: Sean Brogan Cc: Michael Turner Cc: Bret Barkelew --- .../PeiDxeDebugLibReportStatusCode/DebugLib.c | 40 +++++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c index b0445115a9..2e4a41d2d8 100644 --- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c +++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c @@ -4,7 +4,7 @@ Note that if the debug message length is larger than the maximum allowable record length, then the debug message will be ignored directly. - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2019, Intel Corporation. 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 @@ -52,12 +52,43 @@ DebugPrint ( IN CONST CHAR8 *Format, ... ) +{ + VA_LIST Marker; + + VA_START (Marker, Format); + DebugVPrint (ErrorLevel, Format, Marker); + VA_END (Marker); +} + + +/** + Prints a debug message to the debug output device if the specified error level is enabled. + + If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function + GetDebugPrintErrorLevel (), then print the message specified by Format and the + associated variable argument list to the debug output device. + + If Format is NULL, then ASSERT(). + If the length of the message string specificed by Format is larger than the maximum allowable + record length, then directly return and not print it. + + @param ErrorLevel The error level of the debug message. + @param Format Format string for the debug message to print. + @param VaListMarker VA_LIST marker for the variable argument list. + +**/ +VOID +EFIAPI +DebugVPrint ( + IN UINTN ErrorLevel, + IN CONST CHAR8 *Format, + IN VA_LIST VaListMarker + ) { UINT64 Buffer[(EFI_STATUS_CODE_DATA_MAX_SIZE / sizeof (UINT64)) + 1]; EFI_DEBUG_INFO *DebugInfo; UINTN TotalSize; UINTN DestBufferSize; - VA_LIST VaListMarker; BASE_LIST BaseListMarker; CHAR8 *FormatString; BOOLEAN Long; @@ -129,7 +160,6 @@ DebugPrint ( // of format in DEBUG string, which is followed by the DEBUG format string. // Here we will process the variable arguments and pack them in this area. // - VA_START (VaListMarker, Format); for (; *Format != '\0'; Format++) { // // Only format with prefix % is processed. @@ -214,11 +244,9 @@ DebugPrint ( // If the converted BASE_LIST is larger than the 12 * sizeof (UINT64) allocated bytes, then return // if ((CHAR8 *)BaseListMarker > FormatString) { - VA_END (VaListMarker); return; } } - VA_END (VaListMarker); // // Send the DebugInfo record @@ -234,6 +262,7 @@ DebugPrint ( ); } + /** Prints an assert message containing a filename, line number, and description. This may be followed by a breakpoint or a dead loop. @@ -470,6 +499,7 @@ DebugClearMemoryEnabled ( return (BOOLEAN) ((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0); } + /** Returns TRUE if any one of the bit is set both in ErrorLevel and PcdFixedDebugPrintErrorLevel. -- 2.16.2.windows.1