Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.machine / src / net / mograsim / machine / Machine.java

diff --git a/net.mograsim.machine/src/net/mograsim/machine/Machine.java b/net.mograsim.machine/src/net/mograsim/machine/Machine.java
index 621af8e..6ff074d 100644 (file)
--- a/net.mograsim.machine/src/net/mograsim/machine/Machine.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/Machine.java
@@ -1,28 +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();
-       
+
 }