[WIP] Support Combines syntax

m2isar/frontends/coredsl2/CoreDSL2.g4

@@ -19,7 +19,7 @@ import_file
 	;
 
 isa
-	: 'InstructionSet' name=IDENTIFIER ('extends' extension+=IDENTIFIER (',' extension+=IDENTIFIER)*)? '{' sections+=section* '}' # instruction_set
+	: ('InstructionSet' name=IDENTIFIER (('extends' extension+=IDENTIFIER (',' extension+=IDENTIFIER)*)? '{' sections+=section* '}') | (('combines' combines+=IDENTIFIER (',' combines+=IDENTIFIER)*) ';')) # instruction_set
 	| 'Core' name=IDENTIFIER ('provides' contributing_types+=IDENTIFIER (',' contributing_types+=IDENTIFIER)*)? '{' sections+=section* '}' # core_def
 	;
 

m2isar/frontends/coredsl2/architecture_model_builder.py

@@ -76,8 +76,18 @@ def visitInstruction_set(self, ctx: CoreDSL2Parser.Instruction_setContext):
 		name = ctx.name.text
 		extension = []
 		if ctx.extension:
+			if len(ctx.extension) > 1:
+				logger.warning("Extending more than one InstrSet is not CoreDSL2 compiliant!")
 			extension = [obj.text for obj in ctx.extension]
 
+		combines = []
+		if ctx.combines:
+			combines = [obj.text for obj in ctx.combines]
+			assert len(ctx.sections) == 0
+			sections = []
+		else:
+			sections = ctx.sections
+
 		# generate flat list of instruction set contents
 		contents = flatten([self.visit(obj) for obj in ctx.sections])
 
@@ -104,7 +114,10 @@ def visitInstruction_set(self, ctx: CoreDSL2Parser.Instruction_setContext):
 				raise M2ValueError("unexpected item encountered")
 
 		# instantiate M2-ISA-R object
-		i = arch.InstructionSet(name, extension, constants, memories, functions, instructions)
+		if ctx.combines:
+			i = arch.InstructionSetGroup(name, combines)
+		else:
+			i = arch.InstructionSet(name, extension, constants, memories, functions, instructions)
 
 		if name in self._instruction_sets:
 			raise M2DuplicateError(f"instruction set \"{name}\" already defined")

m2isar/frontends/coredsl2/load_order.py

@@ -36,11 +36,19 @@ def extend_ins_set(self, ins_set_name):
 			raise M2NameError(f"instruction set {ins_set_name} is unknown")
 
 		extensions = [e.text for e in self.instruction_sets[ins_set_name].extension]
+		combines = [e.text for e in self.instruction_sets[ins_set_name].combines]
 		if extensions:
+			assert len(combines) == 0
 			ret = [ins_set_name]
 			for extension in extensions:
 				ret = self.extend_ins_set(extension) + ret
 			return ret
+		elif combines:
+			assert len(extensions) == 0
+			ret = [ins_set_name]
+			for combine in combines:
+				ret = self.extend_ins_set(combines) + ret
+			return ret
 		else:
 			return [ins_set_name]