projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed core components to have the common prefix Core
[Mograsim.git]
/
net.mograsim.machine
/
test
/
net
/
mograsim
/
machine
/
standard
/
memory
/
WordAddressableMemoryTest.java
diff --git
a/net.mograsim.machine/test/net/mograsim/machine/standard/memory/WordAddressableMemoryTest.java
b/net.mograsim.machine/test/net/mograsim/machine/standard/memory/WordAddressableMemoryTest.java
index
1fb59d0
..
e3566e3
100644
(file)
--- a/
net.mograsim.machine/test/net/mograsim/machine/standard/memory/WordAddressableMemoryTest.java
+++ b/
net.mograsim.machine/test/net/mograsim/machine/standard/memory/WordAddressableMemoryTest.java
@@
-10,9
+10,9
@@
import org.junit.jupiter.api.Test;
import net.mograsim.logic.core.timeline.Timeline;
import net.mograsim.logic.core.types.Bit;
import net.mograsim.logic.core.types.BitVector;
import net.mograsim.logic.core.timeline.Timeline;
import net.mograsim.logic.core.types.Bit;
import net.mograsim.logic.core.types.BitVector;
-import net.mograsim.logic.core.wires.Wire;
-import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
-import net.mograsim.machine.
Default
MainMemoryDefinition;
+import net.mograsim.logic.core.wires.
Core
Wire;
+import net.mograsim.logic.core.wires.
Core
Wire.ReadWriteEnd;
+import net.mograsim.machine.MainMemoryDefinition;
class WordAddressableMemoryTest {
class WordAddressableMemoryTest {
@@
-21,14
+21,15
@@
class WordAddressableMemoryTest {
@Test
public void wordAddressableMemoryLargeTest()
{
@Test
public void wordAddressableMemoryLargeTest()
{
-
Wire rW = new
Wire(t, 1, 2);
-
Wire data = new
Wire(t, 16, 2);
-
Wire address = new
Wire(t, 64, 2);
+
CoreWire rW = new Core
Wire(t, 1, 2);
+
CoreWire data = new Core
Wire(t, 16, 2);
+
CoreWire address = new Core
Wire(t, 64, 2);
ReadWriteEnd rWI = rW.createReadWriteEnd();
ReadWriteEnd dataI = data.createReadWriteEnd();
ReadWriteEnd addressI = address.createReadWriteEnd();
ReadWriteEnd rWI = rW.createReadWriteEnd();
ReadWriteEnd dataI = data.createReadWriteEnd();
ReadWriteEnd addressI = address.createReadWriteEnd();
- WordAddressableMemoryComponent memory = new WordAddressableMemoryComponent(t, 4, new DefaultMainMemoryDefinition(64, 16, 4096L, Long.MAX_VALUE), data.createReadWriteEnd(),
+ @SuppressWarnings("unused")
+ WordAddressableMemoryComponent memory = new WordAddressableMemoryComponent(t, 4, MainMemoryDefinition.create(64, 16, 4096L, Long.MAX_VALUE), data.createReadWriteEnd(),
rW.createReadOnlyEnd(), address.createReadOnlyEnd());
Random r = new Random();
rW.createReadOnlyEnd(), address.createReadOnlyEnd());
Random r = new Random();