IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2041
[PATCH v2] Update commit message for more detail description
When running with Python 3.x and relying on GenCfgOpt.py to
automatically assign UPD offsets,
the script crashed because some float type variable not compatible with
the operations.
Convert those float variable to int to fix these issues.
Cc: Amy Chan <amy.chan@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Ching JenX Cheng <ching.jenx.cheng@intel.com>
---
IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py b/IntelFsp2Pkg/Tools/GenCfgOpt.py
index a42717caae..2fa7582d85 100644
--- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
+++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
@@ -715,7 +715,7 @@ EndList
if (ConfigDict['embed'].find(':END') != -1):
Remainder = Offset % (MaxAlign/8) # MaxAlign is either 32 or 64
if Remainder:
- Diff = (MaxAlign/8) - Remainder
+ Diff = int((MaxAlign/8) - Remainder)
Offset = Offset + Diff
ItemOffset = ItemOffset + Diff
MaxAlign = 32 # Reset to default 32 align when struct end
@@ -727,7 +727,7 @@ EndList
Remainder = Offset % max(ItemLength/8, 4, SizeAlign)
Offset = Offset + ItemLength
if Remainder:
- Diff = max(ItemLength/8, 4, SizeAlign) - Remainder
+ Diff = int(max(ItemLength/8, 4, SizeAlign) - Remainder)
ItemOffset = ItemOffset + Diff
ConfigDict['offset'] = ItemOffset
@@ -1416,7 +1416,7 @@ EndList
if BitsRemain:
BsfFd.write(" Skip %d bits\n" % BitsRemain)
BitsGap -= BitsRemain
- BytesRemain = BitsGap / 8
+ BytesRemain = int(BitsGap / 8)
if BytesRemain:
BsfFd.write(" Skip %d bytes\n" % BytesRemain)
NextOffset = Item['offset'] + Item['length']
--
2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#44792): https://edk2.groups.io/g/devel/message/44792
Mute This Topic: https://groups.io/mt/32677724/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Patch submitted: 5e4ebd9ea5d72c1a2824d23a5dc92c7b50694719 Thanks! Chasel > -----Original Message----- > From: Cheng, Ching JenX > Sent: Thursday, August 1, 2019 6:07 PM > To: devel@edk2.groups.io > Cc: Chan, Amy <amy.chan@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; > Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star > <star.zeng@intel.com> > Subject: [PATCH v2] * IntelFsp2Pkg: Improve FSP Python scripts to support 3.x. > > BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2041 > > [PATCH v2] Update commit message for more detail description > > When running with Python 3.x and relying on GenCfgOpt.py to automatically > assign UPD offsets, the script crashed because some float type variable not > compatible with the operations. > Convert those float variable to int to fix these issues. > > Cc: Amy Chan <amy.chan@intel.com> > Cc: Chasel Chiu <chasel.chiu@intel.com> > Cc: Nate DeSimone <nathaniel.l.desimone@intel.com> > Cc: Star Zeng <star.zeng@intel.com> > Signed-off-by: Ching JenX Cheng <ching.jenx.cheng@intel.com> > --- > IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py > b/IntelFsp2Pkg/Tools/GenCfgOpt.py index a42717caae..2fa7582d85 100644 > --- a/IntelFsp2Pkg/Tools/GenCfgOpt.py > +++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py > @@ -715,7 +715,7 @@ EndList > if (ConfigDict['embed'].find(':END') != -1): > Remainder = Offset % (MaxAlign/8) # MaxAlign is either > 32 or 64 > if Remainder: > - Diff = (MaxAlign/8) - Remainder > + Diff = int((MaxAlign/8) - Remainder) > Offset = Offset + Diff > ItemOffset = ItemOffset + Diff > MaxAlign = 32 # Reset to default 32 > align when struct end > @@ -727,7 +727,7 @@ EndList > Remainder = Offset % max(ItemLength/8, 4, SizeAlign) > Offset = Offset + ItemLength > if Remainder: > - Diff = max(ItemLength/8, 4, SizeAlign) - Remainder > + Diff = int(max(ItemLength/8, 4, > + SizeAlign) - Remainder) > ItemOffset = ItemOffset + Diff > ConfigDict['offset'] = ItemOffset > > @@ -1416,7 +1416,7 @@ EndList > if BitsRemain: > BsfFd.write(" Skip %d bits\n" % BitsRemain) > BitsGap -= BitsRemain > - BytesRemain = BitsGap / 8 > + BytesRemain = int(BitsGap / 8) > if BytesRemain: > BsfFd.write(" Skip %d bytes\n" % BytesRemain) > NextOffset = Item['offset'] + Item['length'] > -- > 2.21.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44851): https://edk2.groups.io/g/devel/message/44851 Mute This Topic: https://groups.io/mt/32677724/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com> > -----Original Message----- > From: Cheng, Ching JenX > Sent: Thursday, August 1, 2019 6:07 PM > To: devel@edk2.groups.io > Cc: Chan, Amy <amy.chan@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; > Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star > <star.zeng@intel.com> > Subject: [PATCH v2] * IntelFsp2Pkg: Improve FSP Python scripts to support 3.x. > > BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2041 > > [PATCH v2] Update commit message for more detail description > > When running with Python 3.x and relying on GenCfgOpt.py to automatically > assign UPD offsets, the script crashed because some float type variable not > compatible with the operations. > Convert those float variable to int to fix these issues. > > Cc: Amy Chan <amy.chan@intel.com> > Cc: Chasel Chiu <chasel.chiu@intel.com> > Cc: Nate DeSimone <nathaniel.l.desimone@intel.com> > Cc: Star Zeng <star.zeng@intel.com> > Signed-off-by: Ching JenX Cheng <ching.jenx.cheng@intel.com> > --- > IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py > b/IntelFsp2Pkg/Tools/GenCfgOpt.py index a42717caae..2fa7582d85 100644 > --- a/IntelFsp2Pkg/Tools/GenCfgOpt.py > +++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py > @@ -715,7 +715,7 @@ EndList > if (ConfigDict['embed'].find(':END') != -1): > Remainder = Offset % (MaxAlign/8) # MaxAlign is either > 32 or 64 > if Remainder: > - Diff = (MaxAlign/8) - Remainder > + Diff = int((MaxAlign/8) - Remainder) > Offset = Offset + Diff > ItemOffset = ItemOffset + Diff > MaxAlign = 32 # Reset to default 32 > align when struct end > @@ -727,7 +727,7 @@ EndList > Remainder = Offset % max(ItemLength/8, 4, SizeAlign) > Offset = Offset + ItemLength > if Remainder: > - Diff = max(ItemLength/8, 4, SizeAlign) - Remainder > + Diff = int(max(ItemLength/8, 4, > + SizeAlign) - Remainder) > ItemOffset = ItemOffset + Diff > ConfigDict['offset'] = ItemOffset > > @@ -1416,7 +1416,7 @@ EndList > if BitsRemain: > BsfFd.write(" Skip %d bits\n" % BitsRemain) > BitsGap -= BitsRemain > - BytesRemain = BitsGap / 8 > + BytesRemain = int(BitsGap / 8) > if BytesRemain: > BsfFd.write(" Skip %d bytes\n" % BytesRemain) > NextOffset = Item['offset'] + Item['length'] > -- > 2.21.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44847): https://edk2.groups.io/g/devel/message/44847 Mute This Topic: https://groups.io/mt/32677724/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.