BaseTools: Fixed the PcdValue trailing zero issue.

1. Not append trailing zero for PcdValue
2. make sure the point to Variable Name in PCD
DataBase 2 bytes aligned.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index 2176bbefeb52afdaf4e887b98db56c61a95e909c..5b260cd515df1b30eef0db438dea07898a87ddea 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -1184,6 +1184,12 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
                 # and calculate the VariableHeadStringIndex\r
 \r
                 VariableNameStructure = StringToArray(Sku.VariableName)\r
+\r
+                #  Make pointer of VaraibleName(HII PCD) 2 bytes aligned\r
+                VariableNameStructureBytes = VariableNameStructure.lstrip("{").rstrip("}").split(",")\r
+                if len(VariableNameStructureBytes) % 2:\r
+                    VariableNameStructure = "{%s,0x00}" % ",".join(VariableNameStructureBytes)\r
+\r
                 if VariableNameStructure not in Dict['STRING_TABLE_VALUE']:\r
                     Dict['STRING_TABLE_CNAME'].append(CName)\r
                     Dict['STRING_TABLE_GUID'].append(TokenSpaceGuid)\r

diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Source/Python/Common/StringUtils.py
index da2949dbadef0848596e7da12db48ed5a84cd4f7..d5afde7a95a5c1ad9edf317fc195dbd387bf03de 100644 (file)
--- a/BaseTools/Source/Python/Common/StringUtils.py
+++ b/BaseTools/Source/Python/Common/StringUtils.py
@@ -835,12 +835,7 @@ def StringToArray(String):
             else:\r
                 return "{%s,0x00,0x00}" % ",".join("0x%02x" % ord(C) for C in String[1:-1])\r
     elif String.startswith('{'):\r
-        StringLen = len(String.split(","))\r
-        if StringLen % 2:\r
-            return "{%s,0x00}" % ",".join(C.strip() for C in String[1:-1].split(','))\r
-        else:\r
-            return "{%s}" % ",".join(C.strip() for C in String[1:-1].split(','))\r
-\r
+        return "{%s}" % ",".join(C.strip() for C in String[1:-1].split(','))\r
     else:\r
         if len(String.split()) % 2:\r
             return '{%s,0}' % ','.join(String.split())\r