Re: [edk2] [Patch] BaseTools: Fix bug about *M value not display decimal and hexadecimal

2018-07-25 Thread Zhu, Yonghong 
Reviewed-by: Yonghong Zhu  

Best Regards,
Zhu Yonghong


-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Yonghong 
Zhu
Sent: Wednesday, July 25, 2018 8:47 AM
To: edk2-devel@lists.01.org
Cc: Gao, Liming 
Subject: [edk2] [Patch] BaseTools: Fix bug about *M value not display decimal 
and hexadecimal

From: Yunhua Feng 

V2: Add the check for Pcd DatumType

report format like as below:
 *M Shell.inf = 0xFF (255)

Cc: Liming Gao 
Cc: Yonghong Zhu 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng 
---
 BaseTools/Source/Python/build/BuildReport.py | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/build/BuildReport.py 
b/BaseTools/Source/Python/build/BuildReport.py
index 176a390..dd5d1c0 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1117,11 +1117,17 @@ class PcdReport(object):
 if IsByteArray:
 FileWrite(File, ' *M %-*s = %s' % 
(self.MaxLen + 15, ModulePath, '{'))
 for Array in ArrayList:
 FileWrite(File, Array)
 else:
-FileWrite(File, ' *M %-*s = %s' % 
(self.MaxLen + 15, ModulePath, ModuleDefault.strip()))
+Value =  ModuleDefault.strip()
+if Pcd.DatumType in 
TAB_PCD_CLEAN_NUMERIC_TYPES:
+if Value.startswith(('0x', '0X')):
+Value = '{} ({:d})'.format(Value, 
int(Value, 0))
+else:
+Value = "0x{:X} 
({})".format(int(Value, 0), Value)
+FileWrite(File, ' *M %-*s = %s' % 
(self.MaxLen + 15, ModulePath, Value))
 
 if ModulePcdSet is None:
 FileWrite(File, gSectionEnd)
 else:
 if not ReportSubType and ModulePcdSet:
-- 
2.6.1.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [Patch] BaseTools: Fix bug about *M value not display decimal and hexadecimal

2018-07-24 Thread Yonghong Zhu 
From: Yunhua Feng 

V2: Add the check for Pcd DatumType

report format like as below:
 *M Shell.inf = 0xFF (255)

Cc: Liming Gao 
Cc: Yonghong Zhu 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng 
---
 BaseTools/Source/Python/build/BuildReport.py | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/build/BuildReport.py 
b/BaseTools/Source/Python/build/BuildReport.py
index 176a390..dd5d1c0 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1117,11 +1117,17 @@ class PcdReport(object):
 if IsByteArray:
 FileWrite(File, ' *M %-*s = %s' % 
(self.MaxLen + 15, ModulePath, '{'))
 for Array in ArrayList:
 FileWrite(File, Array)
 else:
-FileWrite(File, ' *M %-*s = %s' % 
(self.MaxLen + 15, ModulePath, ModuleDefault.strip()))
+Value =  ModuleDefault.strip()
+if Pcd.DatumType in 
TAB_PCD_CLEAN_NUMERIC_TYPES:
+if Value.startswith(('0x', '0X')):
+Value = '{} ({:d})'.format(Value, 
int(Value, 0))
+else:
+Value = "0x{:X} 
({})".format(int(Value, 0), Value)
+FileWrite(File, ' *M %-*s = %s' % 
(self.MaxLen + 15, ModulePath, Value))
 
 if ModulePcdSet is None:
 FileWrite(File, gSectionEnd)
 else:
 if not ReportSubType and ModulePcdSet:
-- 
2.6.1.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [Patch] BaseTools: Fix bug about *M value not display decimal and hexadecimal

2018-07-24 Thread Yonghong Zhu 
From: Yunhua Feng 

report format like as below:
 *M Shell.inf = 0xFF (255)

Cc: Liming Gao 
Cc: Yonghong Zhu 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng 
---
 BaseTools/Source/Python/build/BuildReport.py | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/build/BuildReport.py 
b/BaseTools/Source/Python/build/BuildReport.py
index 176a390..178d340 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1117,11 +1117,16 @@ class PcdReport(object):
 if IsByteArray:
 FileWrite(File, ' *M %-*s = %s' % 
(self.MaxLen + 15, ModulePath, '{'))
 for Array in ArrayList:
 FileWrite(File, Array)
 else:
-FileWrite(File, ' *M %-*s = %s' % 
(self.MaxLen + 15, ModulePath, ModuleDefault.strip()))
+Value =  ModuleDefault.strip()
+if Value.startswith(('0x', '0X')):
+Value = '{} ({:d})'.format(Value, 
int(Value, 0))
+else:
+Value = "0x{:X} ({})".format(int(Value, 
0), Value)
+FileWrite(File, ' *M %-*s = %s' % 
(self.MaxLen + 15, ModulePath, Value))
 
 if ModulePcdSet is None:
 FileWrite(File, gSectionEnd)
 else:
 if not ReportSubType and ModulePcdSet:
-- 
2.6.1.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel