BaseTools: Fix generating array's size is incorrect in AutoGen.c

case example:
DSC:
 [PcdsFixedAtBuild]
  PcdToken.PcdName | "A"
 [Components]
 TestPkg/TestDriver.inf {
  PcdToken.PcdName | {0x41,0x42,0x43,0x44}
 }

Generating the size of array is incorrect in AutoGen.c
 GLOBAL_REMOVE_IF_UNREFERENCED const UINT8
 _gPcd_FixedAtBuild_PcdName[2] = {0x41,0x42,0x43,0x44};

Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=950
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index d06258888269b241b1d04ea38bcac8971658cf16..6192e86753c32129ae75aea9aa79bc7339b3cc2a 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -1057,7 +1057,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
                 if not Value.endswith('U'):\r
                     Value += 'U'\r
         if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES:\r
-            if Pcd.MaxDatumSize is None or Pcd.MaxDatumSize == '':\r
+            if not Pcd.MaxDatumSize:\r
                 EdkLogger.error("build", AUTOGEN_ERROR,\r
                                 "Unknown [MaxDatumSize] of PCD [%s.%s]" % (Pcd.TokenSpaceGuidCName, TokenCName),\r
                                 ExtraData="[%s]" % str(Info))\r
@@ -1065,11 +1065,13 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
             ArraySize = int(Pcd.MaxDatumSize, 0)\r
             if Value[0] == '{':\r
                 Type = '(VOID *)'\r
+                ValueSize = len(Value.split(','))\r
             else:\r
                 if Value[0] == 'L':\r
                     Unicode = True\r
                 Value = Value.lstrip('L')   #.strip('"')\r
                 Value = eval(Value)         # translate escape character\r
+                ValueSize = len(Value) + 1\r
                 NewValue = '{'\r
                 for Index in range(0,len(Value)):\r
                     if Unicode:\r
@@ -1077,18 +1079,17 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
                     else:\r
                         NewValue = NewValue + str(ord(Value[Index]) % 0x100) + ', '\r
                 if Unicode:\r
-                    ArraySize = ArraySize / 2;\r
-\r
-                if ArraySize < (len(Value) + 1):\r
-                    if Pcd.MaxSizeUserSet:\r
-                        EdkLogger.error("build", AUTOGEN_ERROR,\r
-                                    "The maximum size of VOID* type PCD '%s.%s' is less than its actual size occupied." % (Pcd.TokenSpaceGuidCName, TokenCName),\r
-                                    ExtraData="[%s]" % str(Info))\r
-                    else:\r
-                        ArraySize = Pcd.GetPcdSize()\r
-                        if Unicode:\r
-                            ArraySize = ArraySize / 2\r
+                    ArraySize = ArraySize / 2\r
                 Value = NewValue + '0 }'\r
+            if ArraySize < ValueSize:\r
+                if Pcd.MaxSizeUserSet:\r
+                    EdkLogger.error("build", AUTOGEN_ERROR,\r
+                                "The maximum size of VOID* type PCD '%s.%s' is less than its actual size occupied." % (Pcd.TokenSpaceGuidCName, TokenCName),\r
+                                ExtraData="[%s]" % str(Info))\r
+                else:\r
+                    ArraySize = Pcd.GetPcdSize()\r
+                    if Unicode:\r
+                        ArraySize = ArraySize / 2\r
             Array = '[%d]' % ArraySize\r
         #\r
         # skip casting for fixed at build since it breaks ARM assembly.\r