mirror of
				https://github.com/acidanthera/audk.git
				synced 2025-10-30 18:53:45 +01:00 
			
		
		
		
	BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1858 for Dict={},There are pitfalls in the way this default parameter is set and Dict is not used in functions, other functions have these two cases, I will change some incorrect parameter defaults This patch is going to fix this issue Cc: Liming Gao <liming.gao@intel.com> Cc: Bob Feng <bob.c.feng@intel.com> Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
		
			
				
	
	
		
			97 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			97 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| ## @file
 | |
| # process compress section generation
 | |
| #
 | |
| #  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
 | |
| #
 | |
| #  SPDX-License-Identifier: BSD-2-Clause-Patent
 | |
| #
 | |
| 
 | |
| ##
 | |
| # Import Modules
 | |
| #
 | |
| from __future__ import absolute_import
 | |
| from .Ffs import SectionSuffix
 | |
| from . import Section
 | |
| import subprocess
 | |
| import Common.LongFilePathOs as os
 | |
| from .GenFdsGlobalVariable import GenFdsGlobalVariable
 | |
| from CommonDataClass.FdfClass import CompressSectionClassObject
 | |
| from Common.DataType import *
 | |
| 
 | |
| ## generate compress section
 | |
| #
 | |
| #
 | |
| class CompressSection (CompressSectionClassObject) :
 | |
| 
 | |
|     ## compress types: PI standard and non PI standard
 | |
|     CompTypeDict = {
 | |
|         'PI_STD'  : 'PI_STD',
 | |
|         'PI_NONE' : 'PI_NONE'
 | |
|     }
 | |
| 
 | |
|     ## The constructor
 | |
|     #
 | |
|     #   @param  self        The object pointer
 | |
|     #
 | |
|     def __init__(self):
 | |
|         CompressSectionClassObject.__init__(self)
 | |
| 
 | |
|     ## GenSection() method
 | |
|     #
 | |
|     #   Generate compressed section
 | |
|     #
 | |
|     #   @param  self        The object pointer
 | |
|     #   @param  OutputPath  Where to place output file
 | |
|     #   @param  ModuleName  Which module this section belongs to
 | |
|     #   @param  SecNum      Index of section
 | |
|     #   @param  KeyStringList  Filter for inputs of section generation
 | |
|     #   @param  FfsInf      FfsInfStatement object that contains this section data
 | |
|     #   @param  Dict        dictionary contains macro and its value
 | |
|     #   @retval tuple       (Generated file name, section alignment)
 | |
|     #
 | |
|     def GenSection(self, OutputPath, ModuleName, SecNum, KeyStringList, FfsInf = None, Dict = None, IsMakefile = False):
 | |
| 
 | |
|         if FfsInf is not None:
 | |
|             self.CompType = FfsInf.__ExtendMacro__(self.CompType)
 | |
|             self.Alignment = FfsInf.__ExtendMacro__(self.Alignment)
 | |
| 
 | |
|         SectFiles = tuple()
 | |
|         SectAlign = []
 | |
|         Index = 0
 | |
|         MaxAlign = None
 | |
|         if Dict is None:
 | |
|             Dict = {}
 | |
|         for Sect in self.SectionList:
 | |
|             Index = Index + 1
 | |
|             SecIndex = '%s.%d' %(SecNum, Index)
 | |
|             ReturnSectList, AlignValue = Sect.GenSection(OutputPath, ModuleName, SecIndex, KeyStringList, FfsInf, Dict, IsMakefile=IsMakefile)
 | |
|             if AlignValue is not None:
 | |
|                 if MaxAlign is None:
 | |
|                     MaxAlign = AlignValue
 | |
|                 if GenFdsGlobalVariable.GetAlignment (AlignValue) > GenFdsGlobalVariable.GetAlignment (MaxAlign):
 | |
|                     MaxAlign = AlignValue
 | |
|             if ReturnSectList != []:
 | |
|                 if AlignValue is None:
 | |
|                     AlignValue = "1"
 | |
|                 for FileData in ReturnSectList:
 | |
|                     SectFiles += (FileData,)
 | |
|                     SectAlign.append(AlignValue)
 | |
| 
 | |
|         OutputFile = OutputPath + \
 | |
|                      os.sep     + \
 | |
|                      ModuleName + \
 | |
|                      SUP_MODULE_SEC      + \
 | |
|                      SecNum     + \
 | |
|                      SectionSuffix['COMPRESS']
 | |
|         OutputFile = os.path.normpath(OutputFile)
 | |
|         DummyFile = OutputFile + '.dummy'
 | |
|         GenFdsGlobalVariable.GenerateSection(DummyFile, SectFiles, InputAlign=SectAlign, IsMakefile=IsMakefile)
 | |
| 
 | |
|         GenFdsGlobalVariable.GenerateSection(OutputFile, [DummyFile], Section.Section.SectionType['COMPRESS'],
 | |
|                                              CompressionType=self.CompTypeDict[self.CompType], IsMakefile=IsMakefile)
 | |
|         OutputFileList = []
 | |
|         OutputFileList.append(OutputFile)
 | |
|         return OutputFileList, self.Alignment
 | |
| 
 | |
| 
 |