1. Patchew
  2. EDK2
  3. View series

[edk2] [Patch] BaseTools: Fix Pcd value override issue caused by SKU inherit

BobCF posted 1 patch 6 years, 3 months ago
Failed in applying to current master (apply log)
BaseTools/Source/Python/Workspace/DscBuildData.py | 46 ++++++++++++++++++++++-
1 file changed, 44 insertions(+), 2 deletions(-)
[edk2] [Patch] BaseTools: Fix Pcd value override issue caused by SKU inherit
Posted by BobCF 6 years, 3 months ago 
Pcd default value in DEC should only be assigned once.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/Python/Workspace/DscBuildData.py | 46 ++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 054ad2c254..e4f3586654 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1300,13 +1300,32 @@ class DscBuildData(PlatformBuildClassObject):
             # the flexible array member.  The flexible array member must be the last field
             # in a structure.  The size formula for this case is:
             # OFFSET_OF(FlexbleArrayField) + sizeof(FlexibleArray[0]) * (HighestIndex + 1)
             #
             CApp = CApp + '  Size = sizeof(%s);\n' % (Pcd.DatumType)
+            for FieldList in [Pcd.DefaultValues]:
+                if not FieldList:
+                    continue
+                for FieldName in FieldList:
+                    FieldName = "." + FieldName
+                    IsArray = self.IsFieldValueAnArray(FieldList[FieldName.strip(".")][0])
+                    if IsArray:
+                        Value, ValueSize = ParseFieldValue (FieldList[FieldName.strip(".")][0])
+                        CApp = CApp + '  __FLEXIBLE_SIZE(Size, %s, %s, %d / __ARRAY_ELEMENT_SIZE(%s, %s) + ((%d %% __ARRAY_ELEMENT_SIZE(%s, %s)) ? 1 : 0));\n' % (Pcd.DatumType, FieldName.strip("."), ValueSize, Pcd.DatumType, FieldName.strip("."), ValueSize, Pcd.DatumType, FieldName.strip("."));
+                    else:
+                        NewFieldName = ''
+                        while '[' in  FieldName:
+                            NewFieldName = NewFieldName + FieldName.split('[', 1)[0] + '[0]'
+                            ArrayIndex = int(FieldName.split('[', 1)[1].split(']', 1)[0])
+                            FieldName = FieldName.split(']', 1)[1]
+                        FieldName = NewFieldName + FieldName
+                        while '[' in FieldName:
+                            FieldName = FieldName.rsplit('[', 1)[0]
+                            CApp = CApp + '  __FLEXIBLE_SIZE(Size, %s, %s, %d);\n' % (Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1)
             for skuname in self.SkuIdMgr.SkuOverrideOrder():
                 inherit_OverrideValues = Pcd.SkuOverrideValues[skuname]
-                for FieldList in [Pcd.DefaultValues, inherit_OverrideValues.get(DefaultStoreName)]:
+                for FieldList in [inherit_OverrideValues.get(DefaultStoreName)]:
                     if not FieldList:
                         continue
                     for FieldName in FieldList:
                         FieldName = "." + FieldName
                         IsArray = self.IsFieldValueAnArray(FieldList[FieldName.strip(".")][0])
@@ -1341,13 +1360,36 @@ class DscBuildData(PlatformBuildClassObject):
             CApp = CApp + '  memcpy (Pcd, OriginalPcd, OriginalSize);\n'
 
             #
             # Assign field values in PCD
             #
+            for FieldList in [Pcd.DefaultValues]:
+                if not FieldList:
+                    continue
+                for FieldName in FieldList:
+                    IsArray = self.IsFieldValueAnArray(FieldList[FieldName][0])
+                    try:
+                        Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])
+                    except Exception:
+                        print FieldList[FieldName][0]
+                    if isinstance(Value, str):
+                        CApp = CApp + '  Pcd->%s = %s; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])
+                    elif IsArray:
+                    #
+                    # Use memcpy() to copy value into field
+                    #
+                        CApp = CApp + '  FieldSize = __FIELD_SIZE(%s, %s);\n' % (Pcd.DatumType, FieldName)
+                        CApp = CApp + '  Value     = %s; // From %s Line %d Value %s\n' % (self.IntToCString(Value, ValueSize), FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])
+                        CApp = CApp + '  memcpy (&Pcd->%s[0], Value, (FieldSize > 0 && FieldSize < %d) ? FieldSize : %d);\n' % (FieldName, ValueSize, ValueSize)
+                    else:
+                        if ValueSize > 4:
+                            CApp = CApp + '  Pcd->%s = %dULL; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])
+                        else:
+                            CApp = CApp + '  Pcd->%s = %d; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])
             for skuname in self.SkuIdMgr.SkuOverrideOrder():
                 inherit_OverrideValues = Pcd.SkuOverrideValues[skuname]
-                for FieldList in [Pcd.DefaultValues, Pcd.DefaultFromDSC,inherit_OverrideValues.get(DefaultStoreName)]:
+                for FieldList in [Pcd.DefaultFromDSC,inherit_OverrideValues.get(DefaultStoreName)]:
                     if not FieldList:
                         continue
                     if Pcd.DefaultFromDSC and FieldList == Pcd.DefaultFromDSC:
                         IsArray = self.IsFieldValueAnArray(FieldList)
                         Value, ValueSize = ParseFieldValue (FieldList)
-- 
2.14.3.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] BaseTools: Fix Pcd value override issue caused by SKU inherit
Posted by Gao, Liming 6 years, 3 months ago 
Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Feng, Bob C
>Sent: Tuesday, December 26, 2017 6:20 PM
>To: edk2-devel@lists.01.org
>Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
>Subject: [Patch] BaseTools: Fix Pcd value override issue caused by SKU inherit
>
>Pcd default value in DEC should only be assigned once.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>Cc: Liming Gao <liming.gao@intel.com>
>---
> BaseTools/Source/Python/Workspace/DscBuildData.py | 46
>++++++++++++++++++++++-
> 1 file changed, 44 insertions(+), 2 deletions(-)
>
>diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
>b/BaseTools/Source/Python/Workspace/DscBuildData.py
>index 054ad2c254..e4f3586654 100644
>--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
>+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
>@@ -1300,13 +1300,32 @@ class DscBuildData(PlatformBuildClassObject):
>             # the flexible array member.  The flexible array member must be the
>last field
>             # in a structure.  The size formula for this case is:
>             # OFFSET_OF(FlexbleArrayField) + sizeof(FlexibleArray[0]) *
>(HighestIndex + 1)
>             #
>             CApp = CApp + '  Size = sizeof(%s);\n' % (Pcd.DatumType)
>+            for FieldList in [Pcd.DefaultValues]:
>+                if not FieldList:
>+                    continue
>+                for FieldName in FieldList:
>+                    FieldName = "." + FieldName
>+                    IsArray =
>self.IsFieldValueAnArray(FieldList[FieldName.strip(".")][0])
>+                    if IsArray:
>+                        Value, ValueSize = ParseFieldValue
>(FieldList[FieldName.strip(".")][0])
>+                        CApp = CApp + '  __FLEXIBLE_SIZE(Size, %s, %s, %d /
>__ARRAY_ELEMENT_SIZE(%s, %s) + ((%d %%
>__ARRAY_ELEMENT_SIZE(%s, %s)) ? 1 : 0));\n' % (Pcd.DatumType,
>FieldName.strip("."), ValueSize, Pcd.DatumType, FieldName.strip("."),
>ValueSize, Pcd.DatumType, FieldName.strip("."));
>+                    else:
>+                        NewFieldName = ''
>+                        while '[' in  FieldName:
>+                            NewFieldName = NewFieldName + FieldName.split('[', 1)[0] +
>'[0]'
>+                            ArrayIndex = int(FieldName.split('[', 1)[1].split(']', 1)[0])
>+                            FieldName = FieldName.split(']', 1)[1]
>+                        FieldName = NewFieldName + FieldName
>+                        while '[' in FieldName:
>+                            FieldName = FieldName.rsplit('[', 1)[0]
>+                            CApp = CApp + '  __FLEXIBLE_SIZE(Size, %s, %s, %d);\n' %
>(Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1)
>             for skuname in self.SkuIdMgr.SkuOverrideOrder():
>                 inherit_OverrideValues = Pcd.SkuOverrideValues[skuname]
>-                for FieldList in [Pcd.DefaultValues,
>inherit_OverrideValues.get(DefaultStoreName)]:
>+                for FieldList in [inherit_OverrideValues.get(DefaultStoreName)]:
>                     if not FieldList:
>                         continue
>                     for FieldName in FieldList:
>                         FieldName = "." + FieldName
>                         IsArray =
>self.IsFieldValueAnArray(FieldList[FieldName.strip(".")][0])
>@@ -1341,13 +1360,36 @@ class DscBuildData(PlatformBuildClassObject):
>             CApp = CApp + '  memcpy (Pcd, OriginalPcd, OriginalSize);\n'
>
>             #
>             # Assign field values in PCD
>             #
>+            for FieldList in [Pcd.DefaultValues]:
>+                if not FieldList:
>+                    continue
>+                for FieldName in FieldList:
>+                    IsArray = self.IsFieldValueAnArray(FieldList[FieldName][0])
>+                    try:
>+                        Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])
>+                    except Exception:
>+                        print FieldList[FieldName][0]
>+                    if isinstance(Value, str):
>+                        CApp = CApp + '  Pcd->%s = %s; // From %s Line %d Value %s\n' %
>(FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2],
>FieldList[FieldName][0])
>+                    elif IsArray:
>+                    #
>+                    # Use memcpy() to copy value into field
>+                    #
>+                        CApp = CApp + '  FieldSize = __FIELD_SIZE(%s, %s);\n' %
>(Pcd.DatumType, FieldName)
>+                        CApp = CApp + '  Value     = %s; // From %s Line %d Value %s\n' %
>(self.IntToCString(Value, ValueSize), FieldList[FieldName][1],
>FieldList[FieldName][2], FieldList[FieldName][0])
>+                        CApp = CApp + '  memcpy (&Pcd->%s[0], Value, (FieldSize > 0 &&
>FieldSize < %d) ? FieldSize : %d);\n' % (FieldName, ValueSize, ValueSize)
>+                    else:
>+                        if ValueSize > 4:
>+                            CApp = CApp + '  Pcd->%s = %dULL; // From %s Line %d
>Value %s\n' % (FieldName, Value, FieldList[FieldName][1],
>FieldList[FieldName][2], FieldList[FieldName][0])
>+                        else:
>+                            CApp = CApp + '  Pcd->%s = %d; // From %s Line %d
>Value %s\n' % (FieldName, Value, FieldList[FieldName][1],
>FieldList[FieldName][2], FieldList[FieldName][0])
>             for skuname in self.SkuIdMgr.SkuOverrideOrder():
>                 inherit_OverrideValues = Pcd.SkuOverrideValues[skuname]
>-                for FieldList in [Pcd.DefaultValues,
>Pcd.DefaultFromDSC,inherit_OverrideValues.get(DefaultStoreName)]:
>+                for FieldList in
>[Pcd.DefaultFromDSC,inherit_OverrideValues.get(DefaultStoreName)]:
>                     if not FieldList:
>                         continue
>                     if Pcd.DefaultFromDSC and FieldList == Pcd.DefaultFromDSC:
>                         IsArray = self.IsFieldValueAnArray(FieldList)
>                         Value, ValueSize = ParseFieldValue (FieldList)
>--
>2.14.3.windows.1

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

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.