From 09ba7c28dac95b0b13074e56747b722151aba366 Mon Sep 17 00:00:00 2001 From: Dolu1990 Date: Sun, 27 Aug 2017 15:21:44 +0200 Subject: [PATCH] Change some xx.input(REGFILE_WRITE_DATA) for xx.output(REGFILE_WRITE_DATA) --- src/main/scala/vexriscv/demo/SynthesisBench.scala | 2 +- src/main/scala/vexriscv/plugin/DBusCachedPlugin.scala | 2 +- src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala | 2 +- src/main/scala/vexriscv/plugin/DivPlugin.scala | 2 +- src/main/scala/vexriscv/plugin/MulPlugin.scala | 4 ++-- src/main/scala/vexriscv/plugin/RegFilePlugin.scala | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/scala/vexriscv/demo/SynthesisBench.scala b/src/main/scala/vexriscv/demo/SynthesisBench.scala index 1530d2a..1e7238e 100644 --- a/src/main/scala/vexriscv/demo/SynthesisBench.scala +++ b/src/main/scala/vexriscv/demo/SynthesisBench.scala @@ -84,7 +84,7 @@ object BrieySynthesisBench { // ) // // Bench(rtls, targets, "/eda/tmp/") - + val targets = XilinxStdTargets( vivadoArtix7Path = "E:\\Xilinx\\Vivado\\2016.3\\bin" ) ++ AlteraStdTargets( diff --git a/src/main/scala/vexriscv/plugin/DBusCachedPlugin.scala b/src/main/scala/vexriscv/plugin/DBusCachedPlugin.scala index 05125ec..9bf42b7 100644 --- a/src/main/scala/vexriscv/plugin/DBusCachedPlugin.scala +++ b/src/main/scala/vexriscv/plugin/DBusCachedPlugin.scala @@ -165,7 +165,7 @@ class DBusCachedPlugin(config : DataCacheConfig, memoryTranslatorPortConfig : An ) when(arbitration.isValid && input(MEMORY_ENABLE)) { - input(REGFILE_WRITE_DATA) := rspFormated + output(REGFILE_WRITE_DATA) := rspFormated } } } diff --git a/src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala b/src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala index c9a1945..b8f50bc 100644 --- a/src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala +++ b/src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala @@ -270,7 +270,7 @@ class DBusSimplePlugin(catchAddressMisaligned : Boolean, catchAccessFault : Bool ) when(arbitration.isValid && input(MEMORY_ENABLE)) { - input(REGFILE_WRITE_DATA) := rspFormated + output(REGFILE_WRITE_DATA) := rspFormated } if(!earlyInjection) diff --git a/src/main/scala/vexriscv/plugin/DivPlugin.scala b/src/main/scala/vexriscv/plugin/DivPlugin.scala index 1a22a32..814bc86 100644 --- a/src/main/scala/vexriscv/plugin/DivPlugin.scala +++ b/src/main/scala/vexriscv/plugin/DivPlugin.scala @@ -61,7 +61,7 @@ class DivPlugin extends Plugin[VexRiscv]{ when(arbitration.isValid && input(IS_DIV)) { arbitration.haltItself := !divider.io.rsp.valid - input(REGFILE_WRITE_DATA) := Mux(input(INSTRUCTION)(13), divider.io.rsp.remainder, divider.io.rsp.quotient).asBits + output(REGFILE_WRITE_DATA) := Mux(input(INSTRUCTION)(13), divider.io.rsp.remainder, divider.io.rsp.quotient).asBits } diff --git a/src/main/scala/vexriscv/plugin/MulPlugin.scala b/src/main/scala/vexriscv/plugin/MulPlugin.scala index 6975911..ab4d828 100644 --- a/src/main/scala/vexriscv/plugin/MulPlugin.scala +++ b/src/main/scala/vexriscv/plugin/MulPlugin.scala @@ -92,10 +92,10 @@ class MulPlugin extends Plugin[VexRiscv]{ when(arbitration.isValid && input(IS_MUL)){ switch(input(INSTRUCTION)(13 downto 12)){ is(B"00"){ - input(REGFILE_WRITE_DATA) := input(MUL_LOW)(31 downto 0).asBits + output(REGFILE_WRITE_DATA) := input(MUL_LOW)(31 downto 0).asBits } is(B"01",B"10",B"11"){ - input(REGFILE_WRITE_DATA) := result(63 downto 32).asBits + output(REGFILE_WRITE_DATA) := result(63 downto 32).asBits } } } diff --git a/src/main/scala/vexriscv/plugin/RegFilePlugin.scala b/src/main/scala/vexriscv/plugin/RegFilePlugin.scala index 4c481a0..8dcce97 100644 --- a/src/main/scala/vexriscv/plugin/RegFilePlugin.scala +++ b/src/main/scala/vexriscv/plugin/RegFilePlugin.scala @@ -63,9 +63,9 @@ class RegFilePlugin(regFileReadyKind : RegFileReadKind,zeroBoot : Boolean = fals import writeBack._ val regFileWrite = global.regFile.writePort.addAttribute(Verilator.public) - regFileWrite.valid := input(REGFILE_WRITE_VALID) && arbitration.isFiring - regFileWrite.address := input(INSTRUCTION)(rdRange).asUInt - regFileWrite.data := input(REGFILE_WRITE_DATA) + regFileWrite.valid := output(REGFILE_WRITE_VALID) && arbitration.isFiring + regFileWrite.address := output(INSTRUCTION)(rdRange).asUInt + regFileWrite.data := output(REGFILE_WRITE_DATA) //CPU will initialise constant register zero in the first cycle regFileWrite.valid setWhen(RegNext(False) init(True))