X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2FMachine.java;h=6ff074d0921a622c8f339845cf49807d22dad193;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=dc544da6d201fda5bffb551e58d4c77852d9dfbb;hpb=45942cbbb4b10a99cef716c56fe14642f7c45722;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..6ff074d0 100644
--- a/net.mograsim.machine/src/net/mograsim/machine/Machine.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/Machine.java
@@ -1,22 +1,29 @@
 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 {
+public interface Machine
+{
 	MachineDefinition getDefinition();
-	
+
 	void reset();
-	
-	ViewModel getModel();
-	
-	Clock getClock();
-	
+
+	LogicModel getModel();
+
+	CoreClock getClock();
+
 	BitVector getRegister(Register r);
-	
+
 	void setRegister(Register r, BitVector value);
 
 	Timeline getTimeline();
+
+	MainMemory getMainMemory();
+
+	MicroInstructionMemory getMicroInstructionMemory();
+
 }