From: Fabian Stemmler <stemmler@in.tum.de>
Date: Tue, 17 Sep 2019 19:42:21 +0000 (+0200)
Subject: Merge branch 'development' of
X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=d094b43f1697af4586f135790919f866cc53a9a5

Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into
development

Conflicts:
	plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
---

d094b43f1697af4586f135790919f866cc53a9a5
diff --cc plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
index bcde112d,5683b8ea..86c60044
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
@@@ -14,24 -16,29 +16,29 @@@ import net.mograsim.machine.Machine
  import net.mograsim.machine.MachineDefinition;
  import net.mograsim.machine.MainMemory;
  import net.mograsim.machine.Register;
 +import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
+ import net.mograsim.machine.mi.MicroInstruction;
+ import net.mograsim.machine.mi.MicroInstructionDefinition;
 -import net.mograsim.machine.mi.MicroInstructionMemory;
  import net.mograsim.machine.mi.StandardMicroInstructionMemory;
+ import net.mograsim.machine.mi.parameters.MicroInstructionParameter;
+ import net.mograsim.machine.mi.parameters.ParameterClassification;
  import net.mograsim.machine.standard.memory.WordAddressableMemory;
  
  public class Am2900Machine implements Machine
  {
  	private Am2900MachineDefinition machineDefinition;
  	private LogicModelModifiable logicModel;
+ 	private ModelComponent am2900;
  	private Timeline timeline;
  	private MainMemory mainMemory;
 -	private MicroInstructionMemory instMemory;
 +	private AssignableMicroInstructionMemory instMemory;
  	private CoreClock clock;
  
- 	public Am2900Machine(Am2900MachineDefinition am2900MachineDefinition)
+ 	public Am2900Machine(LogicModelModifiable model, Am2900MachineDefinition am2900MachineDefinition)
  	{
  		this.machineDefinition = am2900MachineDefinition;
- 		logicModel = new LogicModelModifiable();
- 		IndirectModelComponentCreator.createComponent(logicModel,
+ 		this.logicModel = model;
+ 		this.am2900 = IndirectModelComponentCreator.createComponent(logicModel,
  				"resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json", "Am2900");
  		CoreModelParameters params = new CoreModelParameters();
  		params.gateProcessTime = 50;