Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BaseTools/ECC: Fix an identification issue of typedef function. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <hesheng.chen@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Hess Chen 2018-10-16 16:21:48 +08:00 committed by Yonghong Zhu
parent 33a211d009
commit 3a244b8db4
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BaseTools/Source/Python/Ecc/Check.py
View File

@ -646,13 +646,23 @@ class Check(object):
if EccGlobalData.gConfig.IncludeFileCheckData == '1' or EccGlobalData.gConfig.IncludeFileCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1': if EccGlobalData.gConfig.IncludeFileCheckData == '1' or EccGlobalData.gConfig.IncludeFileCheckAll == '1' or EccGlobalData.gConfig.CheckAll == '1':
EdkLogger.quiet("Checking header file data ...") EdkLogger.quiet("Checking header file data ...")
# Get all typedef functions
gAllTypedefFun = []
for IdentifierTable in EccGlobalData.gIdentifierTableList:
SqlCommand = """select Name from %s
where Model = %s """ % (IdentifierTable, MODEL_IDENTIFIER_TYPEDEF)
RecordSet = EccGlobalData.gDb.TblFile.Exec(SqlCommand)
for Record in RecordSet:
if Record[0].startswith('('):
gAllTypedefFun.append(Record[0])
# for Dirpath, Dirnames, Filenames in self.WalkTree(): # for Dirpath, Dirnames, Filenames in self.WalkTree():
# for F in Filenames: # for F in Filenames:
# if os.path.splitext(F)[1] in ('.h'): # if os.path.splitext(F)[1] in ('.h'):
# FullName = os.path.join(Dirpath, F) # FullName = os.path.join(Dirpath, F)
# MsgList = c.CheckHeaderFileData(FullName) # MsgList = c.CheckHeaderFileData(FullName)
for FullName in EccGlobalData.gHFileList: for FullName in EccGlobalData.gHFileList:
MsgList = c.CheckHeaderFileData(FullName) MsgList = c.CheckHeaderFileData(FullName, gAllTypedefFun)
# Doxygen document checking # Doxygen document checking
def DoxygenCheck(self): def DoxygenCheck(self):

8
BaseTools/Source/Python/Ecc/c.py
View File

@ -2144,7 +2144,7 @@ def CheckBooleanValueComparison(FullFileName):
PrintErrorMsg(ERROR_PREDICATE_EXPRESSION_CHECK_BOOLEAN_VALUE, 'Predicate Expression: %s' % Exp, FileTable, Str[2]) PrintErrorMsg(ERROR_PREDICATE_EXPRESSION_CHECK_BOOLEAN_VALUE, 'Predicate Expression: %s' % Exp, FileTable, Str[2])
def CheckHeaderFileData(FullFileName): def CheckHeaderFileData(FullFileName, AllTypedefFun=[]):
ErrorMsgList = [] ErrorMsgList = []
FileID = GetTableID(FullFileName, ErrorMsgList) FileID = GetTableID(FullFileName, ErrorMsgList)
@ -2160,7 +2160,11 @@ def CheckHeaderFileData(FullFileName):
ResultSet = Db.TblFile.Exec(SqlStatement) ResultSet = Db.TblFile.Exec(SqlStatement)
for Result in ResultSet: for Result in ResultSet:
if not Result[1].startswith('extern'): if not Result[1].startswith('extern'):
PrintErrorMsg(ERROR_INCLUDE_FILE_CHECK_DATA, 'Variable definition appears in header file', FileTable, Result[0]) for Item in AllTypedefFun:
if '(%s)' % Result[1] in Item:
break
else:
PrintErrorMsg(ERROR_INCLUDE_FILE_CHECK_DATA, 'Variable definition appears in header file', FileTable, Result[0])
SqlStatement = """ select ID SqlStatement = """ select ID
from Function from Function