projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
[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
dc544da
..
0849b8a
100644
(file)
--- 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;
package net.mograsim.machine;
-import net.mograsim.logic.core.components.Clock;
+import net.mograsim.logic.core.components.C
oreC
lock;
import net.mograsim.logic.core.timeline.Timeline;
import net.mograsim.logic.core.types.BitVector;
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();
public interface Machine {
MachineDefinition getDefinition();
void reset();
-
View
Model getModel();
+
Logic
Model getModel();
- Clock getClock();
+ C
oreC
lock getClock();
BitVector getRegister(Register r);
void setRegister(Register r, BitVector value);
Timeline getTimeline();
BitVector getRegister(Register r);
void setRegister(Register r, BitVector value);
Timeline getTimeline();
+
+ MainMemory getMainMemory();
+
+ MicroInstructionMemory getMicroInstructionMemory();
+
}
}