diff --git a/src/main/scala/uk/ac/soton/ecs/can/core/DataMemory.scala b/src/main/scala/uk/ac/soton/ecs/can/core/DataMemory.scala index 50925df0d7b81ebe529af95315f0d73fbc5d21d5..8d726db7e810b0b5c37140cd099af4caf3adb8b2 100644 --- a/src/main/scala/uk/ac/soton/ecs/can/core/DataMemory.scala +++ b/src/main/scala/uk/ac/soton/ecs/can/core/DataMemory.scala @@ -5,8 +5,12 @@ package uk.ac.soton.ecs.can.core import chisel3._ -class DataMemory(addrWidth: Int, dataWidth: Int, size: Int) - extends MultiIOModule { +class DataMemory( + addrWidth: Int, + dataWidth: Int, + size: Int, + syncMem: Boolean = true +) extends MultiIOModule { val read = IO(new Bundle { val addr = Input(UInt(addrWidth.W)) val data = Output(UInt(dataWidth.W)) @@ -17,7 +21,9 @@ class DataMemory(addrWidth: Int, dataWidth: Int, size: Int) val data = Input(UInt(dataWidth.W)) }) - val mem = SyncReadMem(size, UInt(dataWidth.W)) + val mem = + if (syncMem) SyncReadMem(size, UInt(dataWidth.W)) + else Mem(size, UInt(dataWidth.W)) read.data := mem(read.addr) diff --git a/src/main/scala/uk/ac/soton/ecs/can/core/ProgramMemory.scala b/src/main/scala/uk/ac/soton/ecs/can/core/ProgramMemory.scala index c43f54cc843a03a62dc19cf8f74207c2b5f7a0e4..1575d7f5444ece5e90635752980f7dd2aff237d8 100644 --- a/src/main/scala/uk/ac/soton/ecs/can/core/ProgramMemory.scala +++ b/src/main/scala/uk/ac/soton/ecs/can/core/ProgramMemory.scala @@ -5,8 +5,12 @@ package uk.ac.soton.ecs.can.core import chisel3._ -class ProgramMemory(addrWidth: Int, cwWidth: Int, size: Int) - extends MultiIOModule { +class ProgramMemory( + addrWidth: Int, + cwWidth: Int, + size: Int, + syncMem: Boolean = true +) extends MultiIOModule { val br = IO(new Bundle { val abs = Input(Bool()) val rel = Input(Bool()) @@ -19,7 +23,9 @@ class ProgramMemory(addrWidth: Int, cwWidth: Int, size: Int) val data = Input(UInt(cwWidth.W)) }) - val mem = SyncReadMem(size, UInt(cwWidth.W)) + val mem = + if (syncMem) SyncReadMem(size, UInt(cwWidth.W)) + else Mem(size, UInt(cwWidth.W)) val pc = RegInit(0.U(addrWidth.W)) when(write.en) { diff --git a/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala b/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala index 50025d822773cd5f1266141b72f2fcf94cf75ea7..0ac5312126b0212c743b473ef70aefea71f3466b 100644 --- a/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala +++ b/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala @@ -60,6 +60,19 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester { c.clock.step() } } + + test(new ProgramMemory(addrWidth, cwWidth, size, false)) { c => + c.br.abs.poke(false.B) + c.br.rel.poke(false.B) + c.br.addr.poke(0.U(addrWidth.W)) + + initMemory(c) + + memMap.foreach { m => + c.cw.expect(m._2) + c.clock.step() + } + } } it should "do relative branching correctly" in {