Merge Develop

m2isar/backends/coverage/coverage_dbg.py

@@ -14,12 +14,12 @@
 
 from tqdm import tqdm
 
-from ...metamodel import M2_METAMODEL_VERSION, M2Model, arch, patch_model
+from ...metamodel import M2_METAMODEL_VERSION, M2Model, arch
 from ...metamodel.code_info import FunctionInfo, LineInfo
 from ...metamodel.utils.expr_preprocessor import (process_attributes,
                                                   process_functions,
                                                   process_instructions)
-from . import id_transform
+from .id_transform import IdTransformVisitor
 from .utils import IdMatcherContext
 
 logger = logging.getLogger("coverage_lcov")
@@ -66,7 +66,7 @@ def main():
 		process_attributes(core_obj)
 
 
-	patch_model(id_transform)
+	id_transform_visitor = IdTransformVisitor()
 
 	ctx = IdMatcherContext()
 
@@ -77,12 +77,12 @@ def main():
 			if fn_obj.function_info is not None:
 				ctx.id_to_obj_map[core_name][fn_obj.function_info.id] = fn_obj
 
-			fn_obj.operation.generate(ctx)
+			id_transform_visitor.generate(fn_obj.operation, ctx)
 
 		for instr_name, instr_obj in core_obj.instructions.items():
 			ctx.id_to_obj_map[core_name][instr_obj.function_info.id] = instr_obj
 
-			instr_obj.operation.generate(ctx)
+			id_transform_visitor.generate(instr_obj.operation, ctx)
 
 	id_to_obj_map = {}
 

m2isar/backends/coverage/coverage_lcov.py

@@ -16,13 +16,13 @@
 
 from tqdm.contrib.concurrent import process_map
 
-from ...metamodel import M2_METAMODEL_VERSION, M2Model, patch_model
+from ...metamodel import M2_METAMODEL_VERSION, M2Model
 from ...metamodel.code_info import (BranchInfo, CodeInfoBase, FunctionInfo,
                                     LineInfo)
 from ...metamodel.utils.expr_preprocessor import (process_attributes,
                                                   process_functions,
                                                   process_instructions)
-from . import id_transform
+from .id_transform import IdTransformVisitor
 from .utils import IdMatcherContext
 
 logger = logging.getLogger("coverage_lcov")
@@ -137,7 +137,7 @@ def main():
 
 	logger.info("building model-specific coverage database")
 
-	patch_model(id_transform)
+	id_transform_visitor = IdTransformVisitor()
 
 	ctx = IdMatcherContext()
 
@@ -148,12 +148,12 @@ def main():
 			if fn_obj.function_info is not None:
 				ctx.id_to_obj_map[core_name][fn_obj.function_info.id] = fn_obj
 
-			fn_obj.operation.generate(ctx)
+			id_transform_visitor.generate(fn_obj.operation, ctx)
 
 		for instr_name, instr_obj in core_obj.instructions.items():
 			ctx.id_to_obj_map[core_name][instr_obj.function_info.id] = instr_obj
 
-			instr_obj.operation.generate(ctx)
+			id_transform_visitor.generate(instr_obj.operation, ctx)
 
 
 	logger.info("initializing coverage counters")

m2isar/backends/coverage/id_transform.py

@@ -6,138 +6,138 @@
 # Chair of Electrical Design Automation
 # Technical University of Munich
 
+"""Visitor for mapping line/function IDs to model objects for coverage backends."""
 
 from ...metamodel import behav
+from ...metamodel.utils.ExprVisitor import ExprVisitor
 from .utils import IdMatcherContext
-
-
-def operation(self: behav.Operation, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	for stmt in self.statements:
-		stmt.generate(context)
-
-def block(self: behav.Block, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	for stmt in self.statements:
-		stmt.generate(context)
-
-def binary_operation(self: behav.BinaryOperation, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	self.left.generate(context)
-	self.right.generate(context)
-
-def slice_operation(self: behav.SliceOperation, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	self.expr.generate(context)
-	self.left.generate(context)
-	self.right.generate(context)
-
-def concat_operation(self: behav.ConcatOperation, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	self.left.generate(context)
-	self.right.generate(context)
-
-def number_literal(self: behav.IntLiteral, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-def int_literal(self: behav.IntLiteral, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-def scalar_definition(self: behav.ScalarDefinition, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-def break_(self: behav.Break, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-def assignment(self: behav.Assignment, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	self.target.generate(context)
-	self.expr.generate(context)
-
-def conditional(self: behav.Conditional, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	for cond in self.conds:
-		cond.generate(context)
-
-	for stmt in self.stmts:
-		#
-		#for stmt in op:
-			stmt.generate(context)
-		#
-
-def loop(self: behav.Loop, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	self.cond.generate(context)
-
-	for stmt in self.stmts:
-		stmt.generate(context)
-
-def ternary(self: behav.Ternary, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	self.cond.generate(context)
-	self.then_expr.generate(context)
-	self.else_expr.generate(context)
-
-def return_(self: behav.Return, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	if self.expr is not None:
-		self.expr.generate(context)
-
-def unary_operation(self: behav.UnaryOperation, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	self.right.generate(context)
-
-def named_reference(self: behav.NamedReference, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-def indexed_reference(self: behav.IndexedReference, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	self.index.generate(context)
-
-def type_conv(self: behav.TypeConv, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	self.expr.generate(context)
-
-def callable_(self: behav.Callable, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	for arg, arg_descr in zip(self.args, self.ref_or_name.args):
-		arg.generate(context)
-
-def group(self: behav.Group, context: "IdMatcherContext"):
-	if self.line_info is not None:
-		context.id_to_obj_map[context.arch_name][self.line_info.id] = self
-
-	self.expr.generate(context)
+from functools import singledispatchmethod
+
+
+class IdTransformVisitor(ExprVisitor):
+	"""Visitor that builds a mapping from code info IDs to behavior objects."""
+
+	@singledispatchmethod
+	def generate(self, expr: behav.BaseNode, context=None):
+		raise NotImplementedError(f"No visit method implemented for type {type(expr).__name__} in {type(expr).__name__}")
+
+	def _store_id(self, expr: behav.BaseNode, context: "IdMatcherContext"):
+		if expr.line_info is not None:
+			context.id_to_obj_map[context.arch_name][expr.line_info.id] = expr
+
+	@generate.register
+	def _(self, expr: behav.Operation, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		for stmt in expr.statements:
+			self.generate(stmt, context)
+
+	@generate.register
+	def _(self, expr: behav.Block, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		for stmt in expr.statements:
+			self.generate(stmt, context)
+
+	@generate.register
+	def _(self, expr: behav.BinaryOperation, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		self.generate(expr.left, context)
+		self.generate(expr.right, context)
+
+	@generate.register
+	def _(self, expr: behav.SliceOperation, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		self.generate(expr.expr, context)
+		self.generate(expr.left, context)
+		self.generate(expr.right, context)
+
+	@generate.register
+	def _(self, expr: behav.ConcatOperation, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		self.generate(expr.left, context)
+		self.generate(expr.right, context)
+
+	@generate.register
+	def _(self, expr: behav.NumberLiteral, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+
+	@generate.register
+	def _(self, expr: behav.IntLiteral, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+
+	@generate.register
+	def _(self, expr: behav.ScalarDefinition, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+
+	@generate.register
+	def _(self, expr: behav.Break, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+
+	@generate.register
+	def _(self, expr: behav.Assignment, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		self.generate(expr.target, context)
+		self.generate(expr.expr, context)
+
+	@generate.register
+	def _(self, expr: behav.Conditional, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		for cond in expr.conds:
+			self.generate(cond, context)
+		for stmt in expr.stmts:
+			self.generate(stmt, context)
+
+	@generate.register
+	def _(self, expr: behav.Loop, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		self.generate(expr.cond, context)
+		for stmt in expr.stmts:
+			self.generate(stmt, context)
+
+	@generate.register
+	def _(self, expr: behav.Ternary, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		self.generate(expr.cond, context)
+		self.generate(expr.then_expr, context)
+		self.generate(expr.else_expr, context)
+
+	@generate.register
+	def _(self, expr: behav.Return, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		if expr.expr is not None:
+			self.generate(expr.expr, context)
+
+	@generate.register
+	def _(self, expr: behav.UnaryOperation, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		self.generate(expr.right, context)
+
+	@generate.register
+	def _(self, expr: behav.NamedReference, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+
+	@generate.register
+	def _(self, expr: behav.IndexedReference, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		self.generate(expr.index, context)
+
+	@generate.register
+	def _(self, expr: behav.TypeConv, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		self.generate(expr.expr, context)
+
+	@generate.register
+	def _(self, expr: behav.Callable, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		for arg in expr.args:
+			self.generate(arg, context)
+
+	@generate.register
+	def _(self, expr: behav.ProcedureCall, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		for arg in expr.args:
+			self.generate(arg, context)
+
+	@generate.register
+	def _(self, expr: behav.Group, context: "IdMatcherContext"):
+		self._store_id(expr, context)
+		self.generate(expr.expr, context)