riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

Merge pull request #66 from ucb-bar/rocc-ptw-refactoring

Browse Source 
RoCC PTW refactoring
This commit is contained in:
Andrew Waterman 2016-02-25 18:01:01 -08:00
commit 640204b221
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rocket

@ -1 +1 @@
Subproject commit 6c0e1caaf535ab8cf24368e0d023ef36c35a3ccd Subproject commit abda4649cf353a8dca1fdd2cc536cb015a6237b3

5
src/main/scala/Configs.scala
View File

@ -153,6 +153,7 @@ class DefaultConfig extends Config (
} }
case BuildRoCC => Nil case BuildRoCC => Nil
case RoccNMemChannels => site(BuildRoCC).map(_.nMemChannels).foldLeft(0)(_ + _) case RoccNMemChannels => site(BuildRoCC).map(_.nMemChannels).foldLeft(0)(_ + _)
case RoccNPTWPorts => site(BuildRoCC).map(_.nPTWPorts).foldLeft(0)(_ + _)
case RoccNCSRs => site(BuildRoCC).map(_.csrs.size).foldLeft(0)(_ + _) case RoccNCSRs => site(BuildRoCC).map(_.csrs.size).foldLeft(0)(_ + _)
case UseDma => false case UseDma => false
case UseStreamLoopback => false case UseStreamLoopback => false
@ -396,7 +397,8 @@ class WithRoccExample extends Config(
generator = (p: Parameters) => Module(new AccumulatorExample()(p))), generator = (p: Parameters) => Module(new AccumulatorExample()(p))),
RoccParameters( RoccParameters(
opcodes = OpcodeSet.custom1, opcodes = OpcodeSet.custom1,
generator = (p: Parameters) => Module(new TranslatorExample()(p))), generator = (p: Parameters) => Module(new TranslatorExample()(p)),
nPTWPorts = 1),
RoccParameters( RoccParameters(
opcodes = OpcodeSet.custom2, opcodes = OpcodeSet.custom2,
generator = (p: Parameters) => Module(new CharacterCountExample()(p)))) generator = (p: Parameters) => Module(new CharacterCountExample()(p))))
@ -413,6 +415,7 @@ class WithDmaController extends Config(
RoccParameters( RoccParameters(
opcodes = OpcodeSet.custom2, opcodes = OpcodeSet.custom2,
generator = (p: Parameters) => Module(new DmaController()(p)), generator = (p: Parameters) => Module(new DmaController()(p)),
nPTWPorts = 1,
csrs = Seq.range( csrs = Seq.range(
DmaCtrlRegNumbers.CSR_BASE, DmaCtrlRegNumbers.CSR_BASE,
DmaCtrlRegNumbers.CSR_END))) DmaCtrlRegNumbers.CSR_END)))