projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
161ecd3
)
Introduced Machine.getCoreModelParameters
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 7 Oct 2020 20:36:05 +0000
(22:36 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 7 Oct 2020 20:36:05 +0000
(22:36 +0200)
plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
patch
|
blob
|
history
plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java
patch
|
blob
|
history
diff --git
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
index
3d486f4
..
4abe8dc
100644
(file)
--- 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
@@
-40,6
+40,7
@@
public class Am2900Machine implements Machine
private LogicModelModifiable logicModel;
private ModelComponent am2900;
private Timeline timeline;
private LogicModelModifiable logicModel;
private ModelComponent am2900;
private Timeline timeline;
+ private CoreModelParameters params;
private AssignableMainMemory mainMemory;
private AssignableMicroInstructionMemory instMemory;
private AssignableMPROM mprom;
private AssignableMainMemory mainMemory;
private AssignableMicroInstructionMemory instMemory;
private AssignableMPROM mprom;
@@
-60,7
+61,7
@@
public class Am2900Machine implements Machine
paramsBuilder.gateProcessTime = 50;
paramsBuilder.hardcodedComponentProcessTime = paramsBuilder.gateProcessTime * 5;
paramsBuilder.wireTravelTime = 10;
paramsBuilder.gateProcessTime = 50;
paramsBuilder.hardcodedComponentProcessTime = paramsBuilder.gateProcessTime * 5;
paramsBuilder.wireTravelTime = 10;
-
CoreModelParameters
params = paramsBuilder.build();
+ params = paramsBuilder.build();
mainMemory = new AssignableMainMemory(new StandardMainMemory(am2900MachineDefinition.getMainMemoryDefinition()));
instMemory = new AssignableMicroInstructionMemory(
mainMemory = new AssignableMainMemory(new StandardMainMemory(am2900MachineDefinition.getMainMemoryDefinition()));
instMemory = new AssignableMicroInstructionMemory(
@@
-136,6
+137,12
@@
public class Am2900Machine implements Machine
return timeline;
}
return timeline;
}
+ @Override
+ public CoreModelParameters getCoreModelParameters()
+ {
+ return params;
+ }
+
@Override
public CoreClock getClock()
{
@Override
public CoreClock getClock()
{
diff --git
a/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java
b/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java
index
115973f
..
6c3c9cc
100644
(file)
--- a/
plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java
+++ b/
plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java
@@
-6,6
+6,7
@@
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.LogicModel;
import net.mograsim.logic.core.timeline.Timeline;
import net.mograsim.logic.core.types.BitVector;
import net.mograsim.logic.model.model.LogicModel;
+import net.mograsim.logic.model.modeladapter.CoreModelParameters;
import net.mograsim.machine.mi.AssignableMPROM;
import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
import net.mograsim.machine.registers.Register;
import net.mograsim.machine.mi.AssignableMPROM;
import net.mograsim.machine.mi.AssignableMicroInstructionMemory;
import net.mograsim.machine.registers.Register;
@@
-31,6
+32,8
@@
public interface Machine
Timeline getTimeline();
Timeline getTimeline();
+ public CoreModelParameters getCoreModelParameters();
+
AssignableMainMemory getMainMemory();
AssignableMicroInstructionMemory getMicroInstructionMemory();
AssignableMainMemory getMainMemory();
AssignableMicroInstructionMemory getMicroInstructionMemory();