improve misra analysis perf for misra_5_4, misra_5_5, misra_20_1 (#2329)
fix bad indent
This commit is contained in:
elfel19
Daniel Marjamäki
parent
d75d9c1866
commit
a288ea3c1f
|
|
@ -166,7 +166,8 @@ def getEssentialType(expr):
|
|||
return typeToken.str
|
||||
typeToken = typeToken.next
|
||||
|
||||
elif expr.astOperand1 and expr.astOperand2 and expr.str in ('+', '-', '*', '/', '%', '&', '|', '^', '>>', "<<", "?", ":"):
|
||||
elif expr.astOperand1 and expr.astOperand2 and expr.str in (
|
||||
'+', '-', '*', '/', '%', '&', '|', '^', '>>', "<<", "?", ":"):
|
||||
if expr.astOperand1.valueType and expr.astOperand1.valueType.pointer > 0:
|
||||
return None
|
||||
if expr.astOperand2.valueType and expr.astOperand2.valueType.pointer > 0:
|
||||
|
|
@ -600,7 +601,6 @@ class Define:
|
|||
)
|
||||
|
||||
|
||||
|
||||
def getAddonRules():
|
||||
"""Returns dict of MISRA rules handled by this addon."""
|
||||
addon_rules = []
|
||||
|
|
@ -964,56 +964,55 @@ class MisraChecker:
|
|||
macro = {}
|
||||
compile_name = re.compile(r'#define ([a-zA-Z0-9_]+)')
|
||||
compile_param = re.compile(r'#define ([a-zA-Z0-9_]+)[(]([a-zA-Z0-9_, ]+)[)]')
|
||||
short_names = {}
|
||||
macro_w_arg = []
|
||||
for dir in data.directives:
|
||||
res1 = compile_name.match(dir.str)
|
||||
if res1:
|
||||
if dir not in macro:
|
||||
macro.setdefault(dir, {})["name"] = []
|
||||
macro.setdefault(dir, {})["params"] = []
|
||||
macro[dir]["name"] = res1.group(1)
|
||||
full_name = res1.group(1)
|
||||
macro[dir]["name"] = full_name
|
||||
short_name = full_name[:num_sign_chars]
|
||||
if short_name in short_names:
|
||||
_dir = short_names[short_name]
|
||||
if full_name != macro[_dir]["name"]:
|
||||
self.reportError(dir, 5, 4)
|
||||
else:
|
||||
short_names[short_name] = dir
|
||||
res2 = compile_param.match(dir.str)
|
||||
if res2:
|
||||
res_gp2 = res2.group(2).split(",")
|
||||
res_gp2 = [macroname.replace(" ", "") for macroname in res_gp2]
|
||||
macro[dir]["params"].extend(res_gp2)
|
||||
for mvar in macro:
|
||||
if len(macro[mvar]["params"]) > 0:
|
||||
macro_w_arg.append(dir)
|
||||
for mvar in macro_w_arg:
|
||||
for i, macroparam1 in enumerate(macro[mvar]["params"]):
|
||||
for j, macroparam2 in enumerate(macro[mvar]["params"]):
|
||||
if j > i and macroparam1[:num_sign_chars] == macroparam2[:num_sign_chars]:
|
||||
self.reportError(mvar, 5, 4)
|
||||
|
||||
for x, m_var1 in enumerate(macro):
|
||||
for y, m_var2 in enumerate(macro):
|
||||
if x < y and macro[m_var1]["name"] != macro[m_var2]["name"] and \
|
||||
macro[m_var1]["name"][:num_sign_chars] == macro[m_var2]["name"][:num_sign_chars]:
|
||||
if m_var1.linenr > m_var2.linenr:
|
||||
param = macroparam1
|
||||
if param[:num_sign_chars] in short_names:
|
||||
m_var1 = short_names[param[:num_sign_chars]]
|
||||
if m_var1.linenr > mvar.linenr:
|
||||
self.reportError(m_var1, 5, 4)
|
||||
else:
|
||||
self.reportError(m_var2, 5, 4)
|
||||
for param in macro[m_var2]["params"]:
|
||||
if macro[m_var1]["name"][:num_sign_chars] == param[:num_sign_chars]:
|
||||
if m_var1.linenr > m_var2.linenr:
|
||||
self.reportError(m_var1, 5, 4)
|
||||
else:
|
||||
self.reportError(m_var2, 5, 4)
|
||||
self.reportError(mvar, 5, 4)
|
||||
|
||||
def misra_5_5(self, data):
|
||||
num_sign_chars = self.get_num_significant_naming_chars(data)
|
||||
macroNames = []
|
||||
macroNames = {}
|
||||
compiled = re.compile(r'#define ([A-Za-z0-9_]+)')
|
||||
for dir in data.directives:
|
||||
res = compiled.match(dir.str)
|
||||
if res:
|
||||
macroNames.append(res.group(1))
|
||||
macroNames[res.group(1)[:num_sign_chars]] = dir
|
||||
for var in data.variables:
|
||||
for macro in macroNames:
|
||||
if var.nameToken is not None:
|
||||
if var.nameToken.str[:num_sign_chars] == macro[:num_sign_chars]:
|
||||
if var.nameToken and var.nameToken.str[:num_sign_chars] in macroNames:
|
||||
self.reportError(var.nameToken, 5, 5)
|
||||
for scope in data.scopes:
|
||||
for macro in macroNames:
|
||||
if scope.className and scope.className[:num_sign_chars] == macro[:num_sign_chars]:
|
||||
if scope.className and scope.className[:num_sign_chars] in macroNames:
|
||||
self.reportError(scope.bodyStart, 5, 5)
|
||||
|
||||
def misra_7_1(self, rawTokens):
|
||||
|
|
@ -1230,7 +1229,8 @@ class MisraChecker:
|
|||
if vt1.pointer > 0 and vt1.type != 'void' and vt2.pointer == vt1.pointer and vt2.type == 'void':
|
||||
self.reportError(token, 11, 5)
|
||||
continue
|
||||
if token.astOperand1.astOperand1 and token.astOperand1.astOperand1.str in ('malloc', 'calloc', 'realloc', 'free'):
|
||||
if token.astOperand1.astOperand1 and token.astOperand1.astOperand1.str in (
|
||||
'malloc', 'calloc', 'realloc', 'free'):
|
||||
continue
|
||||
vt1 = token.valueType
|
||||
vt2 = token.astOperand1.valueType
|
||||
|
|
@ -1462,7 +1462,6 @@ class MisraChecker:
|
|||
if state == STATE_CHECK and tok.str == ',':
|
||||
self.reportError(tok, 12, 3)
|
||||
|
||||
|
||||
def misra_12_4(self, data):
|
||||
if typeBits['INT'] == 16:
|
||||
max_uint = 0xffff
|
||||
|
|
@ -1583,7 +1582,6 @@ class MisraChecker:
|
|||
self.reportError(tn, 14, 2)
|
||||
tn = tn.next
|
||||
|
||||
|
||||
def misra_14_4(self, data):
|
||||
for token in data.tokenlist:
|
||||
if token.str != '(':
|
||||
|
|
@ -1805,7 +1803,8 @@ class MisraChecker:
|
|||
|
||||
def misra_17_1(self, data):
|
||||
for token in data.tokenlist:
|
||||
if isFunctionCall(token) and token.astOperand1.str in ('va_list', 'va_arg', 'va_start', 'va_end', 'va_copy'):
|
||||
if isFunctionCall(token) and token.astOperand1.str in (
|
||||
'va_list', 'va_arg', 'va_start', 'va_end', 'va_copy'):
|
||||
self.reportError(token, 17, 1)
|
||||
elif token.str == 'va_list':
|
||||
self.reportError(token, 17, 1)
|
||||
|
|
@ -1953,15 +1952,20 @@ class MisraChecker:
|
|||
self.reportError(token, 19, 2)
|
||||
|
||||
def misra_20_1(self, data):
|
||||
token_in_file = {}
|
||||
for token in data.tokenlist:
|
||||
if token.file not in token_in_file:
|
||||
token_in_file[token.file] = int(token.linenr)
|
||||
else:
|
||||
token_in_file[token.file] = min(token_in_file[token.file], int(token.linenr))
|
||||
|
||||
for directive in data.directives:
|
||||
if not directive.str.startswith('#include'):
|
||||
continue
|
||||
for token in data.tokenlist:
|
||||
if token.file != directive.file:
|
||||
if directive.file not in token_in_file:
|
||||
continue
|
||||
if int(token.linenr) < int(directive.linenr):
|
||||
if token_in_file[directive.file] < int(directive.linenr):
|
||||
self.reportError(directive, 20, 1)
|
||||
break
|
||||
|
||||
def misra_20_2(self, data):
|
||||
for directive in data.directives:
|
||||
|
|
@ -2052,7 +2056,8 @@ class MisraChecker:
|
|||
# the size increases when there are inner #if directives.
|
||||
ifStack = []
|
||||
for directive in data.directives:
|
||||
if directive.str.startswith('#if ') or directive.str.startswith('#ifdef ') or directive.str.startswith('#ifndef '):
|
||||
if directive.str.startswith('#if ') or directive.str.startswith('#ifdef ') or directive.str.startswith(
|
||||
'#ifndef '):
|
||||
ifStack.append(directive)
|
||||
elif directive.str == '#else' or directive.str.startswith('#elif '):
|
||||
if len(ifStack) == 0:
|
||||
|
|
@ -2384,7 +2389,8 @@ class MisraChecker:
|
|||
else:
|
||||
item_str = str(item[0])
|
||||
|
||||
outlist.append("%s: %s: %s (%d locations suppressed)" % (float(ruleNum)/100, fname, item_str, self.suppressionStats.get(ruleNum, 0)))
|
||||
outlist.append("%s: %s: %s (%d locations suppressed)" % (
|
||||
float(ruleNum) / 100, fname, item_str, self.suppressionStats.get(ruleNum, 0)))
|
||||
|
||||
for line in sorted(outlist, reverse=True):
|
||||
print(" %s" % line)
|
||||
|
|
@ -2730,7 +2736,9 @@ def get_args():
|
|||
"""Generates list of command-line arguments acceptable by misra.py script."""
|
||||
parser = cppcheckdata.ArgumentParser()
|
||||
parser.add_argument("--rule-texts", type=str, help=RULE_TEXTS_HELP)
|
||||
parser.add_argument("--verify-rule-texts", help="Verify that all supported rules texts are present in given file and exit.", action="store_true")
|
||||
parser.add_argument("--verify-rule-texts",
|
||||
help="Verify that all supported rules texts are present in given file and exit.",
|
||||
action="store_true")
|
||||
parser.add_argument("--suppress-rules", type=str, help=SUPPRESS_RULES_HELP)
|
||||
parser.add_argument("--no-summary", help="Hide summary of violations", action="store_true")
|
||||
parser.add_argument("--show-suppressed-rules", help="Print rule suppression list", action="store_true")
|
||||
|
|
@ -2808,7 +2816,8 @@ def main():
|
|||
|
||||
if settings.show_summary:
|
||||
print("\nMISRA rules violations found:\n\t%s\n" % (
|
||||
"\n\t".join(["%s: %d" % (viol, len(checker.get_violations(viol))) for viol in checker.get_violation_types()])))
|
||||
"\n\t".join(["%s: %d" % (viol, len(checker.get_violations(viol))) for viol in
|
||||
checker.get_violation_types()])))
|
||||
|
||||
rules_violated = {}
|
||||
for severity, ids in checker.get_violations():
|
||||
|
|
|
|||
Loading…
Reference in New Issue