X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2FMachine.java;h=0849b8a61539b6c981b0ea0b25c9100be2c58684;hb=7b8035a065c7b64f38850907d519f9a7dfb67e24;hp=dc544da6d201fda5bffb551e58d4c77852d9dfbb;hpb=c3f6c48944beecd51a41a6e9c123b73d8b630dfb;p=Mograsim.git

diff --git a/net.mograsim.machine/src/net/mograsim/machine/Machine.java b/net.mograsim.machine/src/net/mograsim/machine/Machine.java
index dc544da6..0849b8a6 100644
--- a/net.mograsim.machine/src/net/mograsim/machine/Machine.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/Machine.java
@@ -1,22 +1,28 @@
 package net.mograsim.machine;
 
-import net.mograsim.logic.core.components.Clock;
+import net.mograsim.logic.core.components.CoreClock;
 import net.mograsim.logic.core.timeline.Timeline;
 import net.mograsim.logic.core.types.BitVector;
-import net.mograsim.logic.model.model.ViewModel;
+import net.mograsim.machine.mi.MicroInstructionMemory;
+import net.mograsim.logic.model.model.LogicModel;
 
 public interface Machine {
 	MachineDefinition getDefinition();
 	
 	void reset();
 	
-	ViewModel getModel();
+	LogicModel getModel();
 	
-	Clock getClock();
+	CoreClock getClock();
 	
 	BitVector getRegister(Register r);
 	
 	void setRegister(Register r, BitVector value);
 
 	Timeline getTimeline();
+	
+	MainMemory getMainMemory();
+	
+	MicroInstructionMemory getMicroInstructionMemory();
+	
 }