diff options
| author | Andrew Waterman | 2016-01-28 12:19:33 -0800 |
|---|---|---|
| committer | Andrew Waterman | 2016-01-28 12:19:33 -0800 |
| commit | d7998e4f86a417a9f07ee02f65ef7c508b00809d (patch) | |
| tree | 767a04718b16750b33dd4e2d629d3e836bb7f637 /src/test/scala/chiselTests/Risc.scala | |
| parent | 41674d5e130f64d7489fdb8583b8f4ad88b64aeb (diff) | |
| parent | 7eff2b0a16e1ca982c227bd498720981c883686b (diff) | |
Merge branch 'scalastyle'
Diffstat (limited to 'src/test/scala/chiselTests/Risc.scala')
| -rw-r--r-- | src/test/scala/chiselTests/Risc.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/scala/chiselTests/Risc.scala b/src/test/scala/chiselTests/Risc.scala index b33b896b..ad5cf762 100644 --- a/src/test/scala/chiselTests/Risc.scala +++ b/src/test/scala/chiselTests/Risc.scala @@ -15,7 +15,7 @@ class Risc extends Module { val file = Mem(Bits(width = 32), 256) val code = Mem(Bits(width = 32), 256) val pc = Reg(init=UInt(0, 8)) - + val add_op :: imm_op :: Nil = Enum(Bits(width = 8), 2) val inst = code(pc) @@ -72,7 +72,7 @@ class RiscTester(c: Risc) extends Tester(c) { def I (op: UInt, rc: Int, ra: Int, rb: Int) = { // val cr = Cat(op, UInt(rc, 8), UInt(ra, 8), UInt(rb, 8)).litValue() val cr = op.litValue() << 24 | rc << 16 | ra << 8 | rb - println("I = " + cr) + println("I = " + cr) // scalastyle:ignore regex cr } @@ -81,10 +81,10 @@ class RiscTester(c: Risc) extends Tester(c) { I(c.add_op, 1, 1, 1), // r1 <- r1 + r1 I(c.add_op, 255, 1, 0)) // rh <- r1 wr(0, 0) // skip reset - for (addr <- 0 until app.length) + for (addr <- 0 until app.length) wr(addr, app(addr)) def dump(k: Int) { - println("K = " + k) + println("K = " + k) // scalastyle:ignore regex peek(c.ra) peek(c.rb) peek(c.rc) @@ -110,7 +110,7 @@ class RiscTester(c: Risc) extends Tester(c) { */ class RiscSpec extends ChiselPropSpec { - + property("Risc should elaborate") { elaborate { new Risc } } |
