From e9bbbb3965bf97a50d499c87c774f0ff9c886c32 Mon Sep 17 00:00:00 2001 From: Tom Verbeure Date: Sun, 3 Jun 2018 07:40:11 +0000 Subject: [PATCH] BarrielShifter -> BarrelShifter --- src/main/scala/vexriscv/TestsWorkspace.scala | 6 +++--- src/main/scala/vexriscv/demo/Briey.scala | 4 ++-- src/main/scala/vexriscv/demo/FormalSimple.scala | 2 +- src/main/scala/vexriscv/demo/GenCustomCsr.scala | 2 +- src/main/scala/vexriscv/demo/GenCustomSimdAdd.scala | 2 +- src/main/scala/vexriscv/demo/GenDeterministicVex.scala | 2 +- src/main/scala/vexriscv/demo/GenFull.scala | 2 +- src/main/scala/vexriscv/demo/GenFullNoMmu.scala | 2 +- src/main/scala/vexriscv/demo/GenFullNoMmuMaxPerf.scala | 2 +- src/main/scala/vexriscv/demo/GenFullNoMmuNoCache.scala | 2 +- src/main/scala/vexriscv/demo/GenNoCacheNoMmuMaxPerf.scala | 2 +- src/main/scala/vexriscv/demo/Murax.scala | 4 ++-- src/main/scala/vexriscv/demo/VexRiscvAvalonForSim.scala | 4 ++-- .../vexriscv/demo/VexRiscvAvalonWithIntegratedJtag.scala | 4 ++-- .../vexriscv/demo/VexRiscvAxi4WithIntegratedJtag.scala | 4 ++-- .../scala/vexriscv/demo/VexRiscvCachedWishboneForSim.scala | 4 ++-- src/main/scala/vexriscv/plugin/ShiftPlugins.scala | 4 ++-- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/scala/vexriscv/TestsWorkspace.scala b/src/main/scala/vexriscv/TestsWorkspace.scala index 6c49b5e..0cd1098 100644 --- a/src/main/scala/vexriscv/TestsWorkspace.scala +++ b/src/main/scala/vexriscv/TestsWorkspace.scala @@ -100,7 +100,7 @@ object TestsWorkspace { new SrcPlugin( separatedAddSub = false ), - new FullBarrielShifterPlugin(earlyInjection = true), + new FullBarrelShifterPlugin(earlyInjection = true), // new LightShifterPlugin, new HazardSimplePlugin( bypassExecute = true, @@ -157,7 +157,7 @@ object TestsWorkspace { new SrcPlugin( separatedAddSub = false ), - // new FullBarrielShifterPlugin, + // new FullBarrelShifterPlugin, new LightShifterPlugin, // new HazardSimplePlugin(true, true, true, true), // new HazardSimplePlugin(false, true, false, true), @@ -208,7 +208,7 @@ object TestsWorkspace { new SrcPlugin( separatedAddSub = false ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, // new LightShifterPlugin, // new HazardSimplePlugin(true, true, true, true), // new HazardSimplePlugin(false, true, false, true), diff --git a/src/main/scala/vexriscv/demo/Briey.scala b/src/main/scala/vexriscv/demo/Briey.scala index 0a6c8ee..dd0119b 100644 --- a/src/main/scala/vexriscv/demo/Briey.scala +++ b/src/main/scala/vexriscv/demo/Briey.scala @@ -108,7 +108,7 @@ object BrieyConfig{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new MulPlugin, new DivPlugin, new HazardSimplePlugin( @@ -435,4 +435,4 @@ object BrieyDe0Nano{ toplevel }) } -} \ No newline at end of file +} diff --git a/src/main/scala/vexriscv/demo/FormalSimple.scala b/src/main/scala/vexriscv/demo/FormalSimple.scala index 0442790..d83bb28 100644 --- a/src/main/scala/vexriscv/demo/FormalSimple.scala +++ b/src/main/scala/vexriscv/demo/FormalSimple.scala @@ -38,7 +38,7 @@ object FormalSimple extends App{ separatedAddSub = false, executeInsertion = false ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new HazardSimplePlugin( bypassExecute = false, bypassMemory = false, diff --git a/src/main/scala/vexriscv/demo/GenCustomCsr.scala b/src/main/scala/vexriscv/demo/GenCustomCsr.scala index d0f0463..31e3e1f 100644 --- a/src/main/scala/vexriscv/demo/GenCustomCsr.scala +++ b/src/main/scala/vexriscv/demo/GenCustomCsr.scala @@ -40,7 +40,7 @@ object GenCustomCsr extends App{ separatedAddSub = false, executeInsertion = false ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new HazardSimplePlugin( bypassExecute = true, bypassMemory = true, diff --git a/src/main/scala/vexriscv/demo/GenCustomSimdAdd.scala b/src/main/scala/vexriscv/demo/GenCustomSimdAdd.scala index ba19991..fea911e 100644 --- a/src/main/scala/vexriscv/demo/GenCustomSimdAdd.scala +++ b/src/main/scala/vexriscv/demo/GenCustomSimdAdd.scala @@ -36,7 +36,7 @@ object GenCustomSimdAdd extends App{ separatedAddSub = false, executeInsertion = false ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new HazardSimplePlugin( bypassExecute = true, bypassMemory = true, diff --git a/src/main/scala/vexriscv/demo/GenDeterministicVex.scala b/src/main/scala/vexriscv/demo/GenDeterministicVex.scala index f194092..fba127f 100644 --- a/src/main/scala/vexriscv/demo/GenDeterministicVex.scala +++ b/src/main/scala/vexriscv/demo/GenDeterministicVex.scala @@ -39,7 +39,7 @@ object GenDeterministicVex extends App{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin(earlyInjection = true), + new FullBarrelShifterPlugin(earlyInjection = true), new HazardSimplePlugin( bypassExecute = true, bypassMemory = true, diff --git a/src/main/scala/vexriscv/demo/GenFull.scala b/src/main/scala/vexriscv/demo/GenFull.scala index 820ea67..45063f9 100644 --- a/src/main/scala/vexriscv/demo/GenFull.scala +++ b/src/main/scala/vexriscv/demo/GenFull.scala @@ -68,7 +68,7 @@ object GenFull extends App{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new HazardSimplePlugin( bypassExecute = true, bypassMemory = true, diff --git a/src/main/scala/vexriscv/demo/GenFullNoMmu.scala b/src/main/scala/vexriscv/demo/GenFullNoMmu.scala index 30636e9..1225d91 100644 --- a/src/main/scala/vexriscv/demo/GenFullNoMmu.scala +++ b/src/main/scala/vexriscv/demo/GenFullNoMmu.scala @@ -60,7 +60,7 @@ object GenFullNoMmu extends App{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new HazardSimplePlugin( bypassExecute = true, bypassMemory = true, diff --git a/src/main/scala/vexriscv/demo/GenFullNoMmuMaxPerf.scala b/src/main/scala/vexriscv/demo/GenFullNoMmuMaxPerf.scala index 007223c..f676dd8 100644 --- a/src/main/scala/vexriscv/demo/GenFullNoMmuMaxPerf.scala +++ b/src/main/scala/vexriscv/demo/GenFullNoMmuMaxPerf.scala @@ -60,7 +60,7 @@ object GenFullNoMmuMaxPerf extends App{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin(earlyInjection = true), + new FullBarrelShifterPlugin(earlyInjection = true), new HazardSimplePlugin( bypassExecute = true, bypassMemory = true, diff --git a/src/main/scala/vexriscv/demo/GenFullNoMmuNoCache.scala b/src/main/scala/vexriscv/demo/GenFullNoMmuNoCache.scala index 923540b..2fb5dc3 100644 --- a/src/main/scala/vexriscv/demo/GenFullNoMmuNoCache.scala +++ b/src/main/scala/vexriscv/demo/GenFullNoMmuNoCache.scala @@ -36,7 +36,7 @@ object GenFullNoMmuNoCache extends App{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new HazardSimplePlugin( bypassExecute = true, bypassMemory = true, diff --git a/src/main/scala/vexriscv/demo/GenNoCacheNoMmuMaxPerf.scala b/src/main/scala/vexriscv/demo/GenNoCacheNoMmuMaxPerf.scala index 1171710..8e3d2f5 100644 --- a/src/main/scala/vexriscv/demo/GenNoCacheNoMmuMaxPerf.scala +++ b/src/main/scala/vexriscv/demo/GenNoCacheNoMmuMaxPerf.scala @@ -40,7 +40,7 @@ object GenNoCacheNoMmuMaxPerf extends App{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin(earlyInjection = true), + new FullBarrelShifterPlugin(earlyInjection = true), new HazardSimplePlugin( bypassExecute = true, bypassMemory = true, diff --git a/src/main/scala/vexriscv/demo/Murax.scala b/src/main/scala/vexriscv/demo/Murax.scala index d63806e..db8751b 100644 --- a/src/main/scala/vexriscv/demo/Murax.scala +++ b/src/main/scala/vexriscv/demo/Murax.scala @@ -127,7 +127,7 @@ object MuraxConfig{ bypassWriteBack = true, bypassWriteBackBuffer = true ) -// config.cpuPlugins(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin])) = new FullBarrielShifterPlugin() +// config.cpuPlugins(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin])) = new FullBarrelShifterPlugin() config } @@ -314,7 +314,7 @@ object MuraxDhrystoneReadyMulDivStatic{ prediction = STATIC ) config.cpuPlugins.remove(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin])) - config.cpuPlugins += new FullBarrielShifterPlugin + config.cpuPlugins += new FullBarrelShifterPlugin Murax(config) }) } diff --git a/src/main/scala/vexriscv/demo/VexRiscvAvalonForSim.scala b/src/main/scala/vexriscv/demo/VexRiscvAvalonForSim.scala index cf98c60..2c92b18 100644 --- a/src/main/scala/vexriscv/demo/VexRiscvAvalonForSim.scala +++ b/src/main/scala/vexriscv/demo/VexRiscvAvalonForSim.scala @@ -87,7 +87,7 @@ object VexRiscvAvalonForSim{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new MulPlugin, new DivPlugin, new HazardSimplePlugin( @@ -191,4 +191,4 @@ object VexRiscvAvalonForSim{ //Generate the QSys TCL script to integrate the CPU QSysify(report.toplevel) } -} \ No newline at end of file +} diff --git a/src/main/scala/vexriscv/demo/VexRiscvAvalonWithIntegratedJtag.scala b/src/main/scala/vexriscv/demo/VexRiscvAvalonWithIntegratedJtag.scala index 5bc58c1..d25f47a 100644 --- a/src/main/scala/vexriscv/demo/VexRiscvAvalonWithIntegratedJtag.scala +++ b/src/main/scala/vexriscv/demo/VexRiscvAvalonWithIntegratedJtag.scala @@ -85,7 +85,7 @@ object VexRiscvAvalonWithIntegratedJtag{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new MulPlugin, new DivPlugin, new HazardSimplePlugin( @@ -188,4 +188,4 @@ object VexRiscvAvalonWithIntegratedJtag{ //Generate the QSys TCL script to integrate the CPU QSysify(report.toplevel) } -} \ No newline at end of file +} diff --git a/src/main/scala/vexriscv/demo/VexRiscvAxi4WithIntegratedJtag.scala b/src/main/scala/vexriscv/demo/VexRiscvAxi4WithIntegratedJtag.scala index c12c131..3097c48 100644 --- a/src/main/scala/vexriscv/demo/VexRiscvAxi4WithIntegratedJtag.scala +++ b/src/main/scala/vexriscv/demo/VexRiscvAxi4WithIntegratedJtag.scala @@ -86,7 +86,7 @@ object VexRiscvAxi4WithIntegratedJtag{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new MulPlugin, new DivPlugin, new HazardSimplePlugin( @@ -186,4 +186,4 @@ object VexRiscvAxi4WithIntegratedJtag{ cpu } } -} \ No newline at end of file +} diff --git a/src/main/scala/vexriscv/demo/VexRiscvCachedWishboneForSim.scala b/src/main/scala/vexriscv/demo/VexRiscvCachedWishboneForSim.scala index 08faa6d..ca9e9dc 100644 --- a/src/main/scala/vexriscv/demo/VexRiscvCachedWishboneForSim.scala +++ b/src/main/scala/vexriscv/demo/VexRiscvCachedWishboneForSim.scala @@ -85,7 +85,7 @@ object VexRiscvCachedWishboneForSim{ separatedAddSub = false, executeInsertion = true ), - new FullBarrielShifterPlugin, + new FullBarrelShifterPlugin, new MulPlugin, new DivPlugin, new HazardSimplePlugin( @@ -156,4 +156,4 @@ object VexRiscvCachedWishboneForSim{ //Generate the QSys TCL script to integrate the CPU QSysify(report.toplevel) } -} \ No newline at end of file +} diff --git a/src/main/scala/vexriscv/plugin/ShiftPlugins.scala b/src/main/scala/vexriscv/plugin/ShiftPlugins.scala index 1e28dba..4f34847 100644 --- a/src/main/scala/vexriscv/plugin/ShiftPlugins.scala +++ b/src/main/scala/vexriscv/plugin/ShiftPlugins.scala @@ -6,7 +6,7 @@ import spinal.lib.Reverse -class FullBarrielShifterPlugin(earlyInjection : Boolean = false) extends Plugin[VexRiscv]{ +class FullBarrelShifterPlugin(earlyInjection : Boolean = false) extends Plugin[VexRiscv]{ object ShiftCtrlEnum extends SpinalEnum(binarySequential){ val DISABLE, SLL, SRL, SRA = newElement() } @@ -178,4 +178,4 @@ class LightShifterPlugin extends Plugin[VexRiscv]{ } } } -} \ No newline at end of file +}