1
0

Make compatible with scala 2.10. List.sort deprecated. Refactor constants into package object.

This commit is contained in:
Henry Cook
2013-07-23 20:26:17 -07:00
parent 5c00d0a030
commit 9abdf4e154
22 changed files with 22 additions and 60 deletions

View File

@ -1,8 +1,6 @@
package rocket
import Chisel._
import Node._
import Constants._
import uncore._
import Util._
@ -12,6 +10,9 @@ case class DCacheConfig(sets: Int, ways: Int, co: CoherencePolicy,
narrowRead: Boolean = true,
reqtagbits: Int = -1, databits: Int = -1)
{
require(OFFSET_BITS == log2Up(CACHE_DATA_SIZE_IN_BYTES))
require(OFFSET_BITS <= ACQUIRE_WRITE_MASK_BITS)
require(log2Up(OFFSET_BITS) <= ACQUIRE_SUBWORD_ADDR_BITS)
require(isPow2(sets))
require(isPow2(ways)) // TODO: relax this
def lines = sets*ways