projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Am2910: Changed communication between reg and instrdecode
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model.am2900
/
src
/
net
/
mograsim
/
logic
/
model
/
am2900
/
machine
/
AbstractAm2900MachineDefinition.java
diff --git
a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java
b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java
index
3469b2d
..
7096cd7
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java
+++ b/
plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java
@@
-4,7
+4,12
@@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Collections;
import java.util.List;
+import net.mograsim.logic.model.am2900.machine.registers.InstrRegister;
+import net.mograsim.logic.model.am2900.machine.registers.PCRegister;
+import net.mograsim.logic.model.am2900.machine.registers.muInstrRegister;
import net.mograsim.logic.model.am2900.machine.registers.am2901.Am2901RegisterGroup;
import net.mograsim.logic.model.am2900.machine.registers.am2901.Am2901RegisterGroup;
+import net.mograsim.logic.model.am2900.machine.registers.am2904.Am2904RegisterGroup;
+import net.mograsim.logic.model.am2900.machine.registers.am2910.Am2910RegisterGroup;
import net.mograsim.logic.model.model.LogicModelModifiable;
import net.mograsim.machine.ISASchema;
import net.mograsim.machine.MachineDefinition;
import net.mograsim.logic.model.model.LogicModelModifiable;
import net.mograsim.machine.ISASchema;
import net.mograsim.machine.MachineDefinition;
@@
-24,11
+29,14
@@
public class AbstractAm2900MachineDefinition implements MachineDefinition
static
{
List<Register> unsortedRegistersModifiable = new ArrayList<>();
static
{
List<Register> unsortedRegistersModifiable = new ArrayList<>();
- // TODO MIR, IR, PC/BZ...
+ unsortedRegistersModifiable.add(muInstrRegister.instance);
+ unsortedRegistersModifiable.add(InstrRegister.instance);
+ unsortedRegistersModifiable.add(PCRegister.instance);
unsortedRegisters = Collections.unmodifiableList(unsortedRegistersModifiable);
List<RegisterGroup> registerGroupsModifiable = new ArrayList<>();
registerGroupsModifiable.add(Am2901RegisterGroup.instance);
unsortedRegisters = Collections.unmodifiableList(unsortedRegistersModifiable);
List<RegisterGroup> registerGroupsModifiable = new ArrayList<>();
registerGroupsModifiable.add(Am2901RegisterGroup.instance);
- // TODO Am2904, Am2910
+ registerGroupsModifiable.add(Am2904RegisterGroup.instance);
+ registerGroupsModifiable.add(Am2910RegisterGroup.instance);
registerGroups = Collections.unmodifiableList(registerGroupsModifiable);
}
registerGroups = Collections.unmodifiableList(registerGroupsModifiable);
}