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 75C84211D9178 for ; Thu, 14 Mar 2019 22:18:24 -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:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,481,1544515200"; d="scan'208";a="152540163" Received: from gaozhic-mobl.ccr.corp.intel.com ([10.239.196.107]) by fmsmga004.fm.intel.com with ESMTP; 14 Mar 2019 22:18:22 -0700 From: Zhichao Gao To: edk2-devel@lists.01.org Cc: Leif Lindholm , Ard Biesheuvel , Liming Gao , Sean Brogan , Michael Turner , Bret Barkelew Date: Fri, 15 Mar 2019 13:17:40 +0800 Message-Id: <20190315051749.6564-9-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 08/17] ArmPkg/SemiHostingDebugLib: Add a new api DebugVPrint 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:24 -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: Leif Lindholm Cc: Ard Biesheuvel Cc: Liming Gao Cc: Sean Brogan Cc: Michael Turner Cc: Bret Barkelew --- ArmPkg/Library/SemiHostingDebugLib/DebugLib.c | 38 ++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/ArmPkg/Library/SemiHostingDebugLib/DebugLib.c b/ArmPkg/Library/SemiHostingDebugLib/DebugLib.c index ec03edb774..b3455fa21c 100644 --- a/ArmPkg/Library/SemiHostingDebugLib/DebugLib.c +++ b/ArmPkg/Library/SemiHostingDebugLib/DebugLib.c @@ -1,7 +1,7 @@ /** @file UEFI Debug Library that uses PrintLib to send messages to STDERR. - Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -28,7 +28,6 @@ #define MAX_DEBUG_MESSAGE_LENGTH 0x100 /** - 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 PcdDebugPrintErrorLevel, then print @@ -48,9 +47,38 @@ 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(). + + @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 + ) { CHAR8 AsciiBuffer[MAX_DEBUG_MESSAGE_LENGTH]; - VA_LIST Marker; // // If Format is NULL, then ASSERT(). @@ -67,9 +95,7 @@ DebugPrint ( // // Convert the DEBUG() message to a Unicode String // - VA_START (Marker, Format); - AsciiVSPrint (AsciiBuffer, sizeof (AsciiBuffer), Format, Marker); - VA_END (Marker); + AsciiVSPrint (AsciiBuffer, sizeof (AsciiBuffer), Format, VaListMarker); SemihostWriteString (AsciiBuffer); } -- 2.16.2.windows.1