Merge branch 'master' of ucb-bar/rocket into rocc-fpu-port for priv1.7
This commit is contained in:
Colin Schmidt
@@ -40,6 +40,7 @@ abstract trait CoreParameters extends UsesParameters {
|
||||
val coreDataBytes = coreDataBits/8
|
||||
val coreDCacheReqTagBits = params(CoreDCacheReqTagBits)
|
||||
val coreMaxAddrBits = math.max(ppnBits,vpnBits+1) + pgIdxBits
|
||||
val vaddrBitsExtended = vaddrBits + (vaddrBits < xLen).toInt
|
||||
|
||||
if(params(FastLoadByte)) require(params(FastLoadWord))
|
||||
}
|
||||
|
||||
@@ -11,20 +11,13 @@ import scala.math._
|
||||
|
||||
class MStatus extends Bundle {
|
||||
val sd = Bool()
|
||||
val zero4 = UInt(width = 19)
|
||||
val ha = UInt(width = 4)
|
||||
val sa = UInt(width = 4)
|
||||
val ua = UInt(width = 4)
|
||||
val zero2 = UInt(width = 31)
|
||||
val sd_rv32 = UInt(width = 1)
|
||||
val zero1 = UInt(width = 9)
|
||||
val vm = UInt(width = 5)
|
||||
val mprv = Bool()
|
||||
val xs = UInt(width = 2)
|
||||
val fs = UInt(width = 2)
|
||||
val mtie = Bool()
|
||||
val htie = Bool()
|
||||
val stie = Bool()
|
||||
val zero3 = UInt(width = 1)
|
||||
val vm = UInt(width = 4)
|
||||
val zero2 = UInt(width = 1)
|
||||
val mprv = UInt(width = 2)
|
||||
val prv3 = UInt(width = 2)
|
||||
val ie3 = Bool()
|
||||
val prv2 = UInt(width = 2)
|
||||
@@ -33,30 +26,32 @@ class MStatus extends Bundle {
|
||||
val ie1 = Bool()
|
||||
val prv = UInt(width = 2)
|
||||
val ie = Bool()
|
||||
val msip = Bool()
|
||||
val hsip = Bool()
|
||||
val ssip = Bool()
|
||||
val zero1 = UInt(width = 1)
|
||||
}
|
||||
|
||||
class SStatus extends Bundle {
|
||||
val sd = Bool()
|
||||
val zero6 = UInt(width = 32)
|
||||
val zero4 = UInt(width = 31)
|
||||
val sd_rv32 = UInt(width = 1)
|
||||
val zero3 = UInt(width = 14)
|
||||
val mprv = Bool()
|
||||
val xs = UInt(width = 2)
|
||||
val fs = UInt(width = 2)
|
||||
val tip = Bool()
|
||||
val zero5 = UInt(width = 1)
|
||||
val tie = Bool()
|
||||
val zero4 = UInt(width = 4)
|
||||
val ua = UInt(width = 4)
|
||||
val zero3 = UInt(width = 7)
|
||||
val zero2 = UInt(width = 7)
|
||||
val ps = Bool()
|
||||
val pie = UInt(width = 1)
|
||||
val zero2 = UInt(width = 2)
|
||||
val ie = Bool()
|
||||
val pie = Bool()
|
||||
val zero1 = UInt(width = 2)
|
||||
val sip = Bool()
|
||||
val zero0 = UInt(width = 1)
|
||||
val ie = Bool()
|
||||
}
|
||||
|
||||
class MIP extends Bundle {
|
||||
val mtip = Bool()
|
||||
val htip = Bool()
|
||||
val stip = Bool()
|
||||
val utip = Bool()
|
||||
val msip = Bool()
|
||||
val hsip = Bool()
|
||||
val ssip = Bool()
|
||||
val usip = Bool()
|
||||
}
|
||||
|
||||
object CSR
|
||||
@@ -82,18 +77,19 @@ class CSRFileIO extends CoreBundle {
|
||||
}
|
||||
|
||||
val csr_replay = Bool(OUTPUT)
|
||||
val csr_stall = Bool(OUTPUT)
|
||||
val csr_xcpt = Bool(OUTPUT)
|
||||
val eret = Bool(OUTPUT)
|
||||
|
||||
val status = new MStatus().asOutput
|
||||
val ptbr = UInt(OUTPUT, paddrBits)
|
||||
val evec = UInt(OUTPUT, vaddrBits+1)
|
||||
val evec = UInt(OUTPUT, vaddrBitsExtended)
|
||||
val exception = Bool(INPUT)
|
||||
val retire = UInt(INPUT, log2Up(1+retireWidth))
|
||||
val uarch_counters = Vec.fill(16)(UInt(INPUT, log2Up(1+retireWidth)))
|
||||
val custom_mrw_csrs = Vec.fill(params(NCustomMRWCSRs))(UInt(INPUT, xLen))
|
||||
val cause = UInt(INPUT, xLen)
|
||||
val pc = SInt(INPUT, vaddrBits+1)
|
||||
val pc = UInt(INPUT, vaddrBitsExtended)
|
||||
val fatc = Bool(OUTPUT)
|
||||
val time = UInt(OUTPUT, xLen)
|
||||
val fcsr_rm = Bits(OUTPUT, FPConstants.RM_SZ)
|
||||
@@ -106,20 +102,23 @@ class CSRFileIO extends CoreBundle {
|
||||
class CSRFile extends CoreModule
|
||||
{
|
||||
val io = new CSRFileIO
|
||||
|
||||
|
||||
val reg_mstatus = Reg(new MStatus)
|
||||
val reg_mepc = Reg(SInt(width = vaddrBits+1))
|
||||
val reg_mie = Reg(init=new MIP().fromBits(0))
|
||||
val reg_mip = Reg(init=new MIP().fromBits(0))
|
||||
val reg_mepc = Reg(UInt(width = vaddrBitsExtended))
|
||||
val reg_mcause = Reg(Bits(width = xLen))
|
||||
val reg_mbadaddr = Reg(SInt(width = vaddrBits+1))
|
||||
val reg_mbadaddr = Reg(UInt(width = vaddrBitsExtended))
|
||||
val reg_mscratch = Reg(Bits(width = xLen))
|
||||
|
||||
val reg_sepc = Reg(SInt(width = vaddrBits+1))
|
||||
val reg_sepc = Reg(UInt(width = vaddrBitsExtended))
|
||||
val reg_scause = Reg(Bits(width = xLen))
|
||||
val reg_sbadaddr = Reg(SInt(width = vaddrBits+1))
|
||||
val reg_sbadaddr = Reg(UInt(width = vaddrBitsExtended))
|
||||
val reg_sscratch = Reg(Bits(width = xLen))
|
||||
val reg_stvec = Reg(SInt(width = vaddrBits))
|
||||
val reg_stvec = Reg(UInt(width = vaddrBits))
|
||||
val reg_stimecmp = Reg(Bits(width = 32))
|
||||
val reg_sptbr = Reg(UInt(width = paddrBits))
|
||||
val reg_wfi = Reg(init=Bool(false))
|
||||
|
||||
val reg_tohost = Reg(init=Bits(0, xLen))
|
||||
val reg_fromhost = Reg(init=Bits(0, xLen))
|
||||
@@ -130,20 +129,23 @@ class CSRFile extends CoreModule
|
||||
val reg_fflags = Reg(UInt(width = 5))
|
||||
val reg_frm = Reg(UInt(width = 3))
|
||||
|
||||
val r_irq_timer = Reg(init=Bool(false))
|
||||
val irq_rocc = Bool(!params(BuildRoCC).isEmpty) && io.rocc.interrupt
|
||||
|
||||
io.interrupt_cause := 0
|
||||
io.interrupt := io.interrupt_cause(xLen-1)
|
||||
val some_interrupt_pending = Bool(); some_interrupt_pending := false
|
||||
def checkInterrupt(max_priv: UInt, cond: Bool, num: Int) = {
|
||||
when (cond && (reg_mstatus.prv < max_priv || reg_mstatus.prv === max_priv && reg_mstatus.ie)) {
|
||||
io.interrupt_cause := UInt((BigInt(1) << (xLen-1)) + num)
|
||||
}
|
||||
when (cond && reg_mstatus.prv <= max_priv) {
|
||||
some_interrupt_pending := true
|
||||
}
|
||||
}
|
||||
|
||||
checkInterrupt(PRV_S, reg_mstatus.stie && r_irq_timer, 0)
|
||||
checkInterrupt(PRV_S, reg_mstatus.ssip, 1)
|
||||
checkInterrupt(PRV_M, reg_mstatus.msip, 1)
|
||||
checkInterrupt(PRV_S, reg_mie.ssip && reg_mip.ssip, 0)
|
||||
checkInterrupt(PRV_M, reg_mie.msip && reg_mip.msip, 0)
|
||||
checkInterrupt(PRV_S, reg_mie.stip && reg_mip.stip, 1)
|
||||
checkInterrupt(PRV_M, reg_fromhost != 0, 2)
|
||||
checkInterrupt(PRV_M, irq_rocc, 3)
|
||||
|
||||
@@ -171,48 +173,72 @@ class CSRFile extends CoreModule
|
||||
io.host.debug_stats_pcr := reg_stats // direct export up the hierarchy
|
||||
|
||||
val read_mstatus = io.status.toBits
|
||||
val read_sstatus = new SStatus
|
||||
read_sstatus := new SStatus().fromBits(read_mstatus) // sstatus mostly overlaps mstatus
|
||||
read_sstatus.zero0 := 0
|
||||
read_sstatus.zero1 := 0
|
||||
read_sstatus.zero2 := 0
|
||||
read_sstatus.zero3 := 0
|
||||
read_sstatus.zero4 := 0
|
||||
read_sstatus.zero5 := 0
|
||||
read_sstatus.ua := io.status.ua
|
||||
read_sstatus.tip := r_irq_timer
|
||||
val isa_string = "IMA" +
|
||||
(if (params(UseVM)) "S" else "") +
|
||||
(if (!params(BuildFPU).isEmpty) "FD" else "") +
|
||||
(if (!params(BuildRoCC).isEmpty) "X" else "")
|
||||
val cpuid = ((if (xLen == 32) BigInt(0) else BigInt(2)) << (xLen-2)) |
|
||||
isa_string.map(x => 1 << (x - 'A')).reduce(_|_)
|
||||
val impid = 1
|
||||
|
||||
val read_mapping = collection.mutable.LinkedHashMap[Int,Bits](
|
||||
CSRs.fflags -> (if (!params(BuildFPU).isEmpty) reg_fflags else UInt(0)),
|
||||
CSRs.frm -> (if (!params(BuildFPU).isEmpty) reg_frm else UInt(0)),
|
||||
CSRs.fcsr -> (if (!params(BuildFPU).isEmpty) Cat(reg_frm, reg_fflags) else UInt(0)),
|
||||
CSRs.cycle -> reg_time,
|
||||
CSRs.scycle -> reg_time,
|
||||
CSRs.time -> reg_time,
|
||||
CSRs.stime -> reg_time,
|
||||
CSRs.cyclew -> reg_time,
|
||||
CSRs.instret -> reg_instret,
|
||||
CSRs.sinstret -> reg_instret,
|
||||
CSRs.instretw -> reg_instret,
|
||||
CSRs.time -> reg_time,
|
||||
CSRs.timew -> reg_time,
|
||||
CSRs.stime -> reg_time,
|
||||
CSRs.stimew -> reg_time,
|
||||
CSRs.mcpuid -> UInt(cpuid),
|
||||
CSRs.mimpid -> UInt(impid),
|
||||
CSRs.mstatus -> read_mstatus,
|
||||
CSRs.mtdeleg -> UInt(0),
|
||||
CSRs.mtvec -> UInt(MTVEC),
|
||||
CSRs.mip -> reg_mip.toBits,
|
||||
CSRs.mie -> reg_mie.toBits,
|
||||
CSRs.mscratch -> reg_mscratch,
|
||||
CSRs.mepc -> reg_mepc,
|
||||
CSRs.mbadaddr -> reg_mbadaddr,
|
||||
CSRs.mepc -> reg_mepc.sextTo(xLen),
|
||||
CSRs.mbadaddr -> reg_mbadaddr.sextTo(xLen),
|
||||
CSRs.mcause -> reg_mcause,
|
||||
CSRs.stimecmp -> reg_stimecmp,
|
||||
CSRs.hartid -> io.host.id,
|
||||
CSRs.mhartid -> io.host.id,
|
||||
CSRs.send_ipi -> io.host.id, /* don't care */
|
||||
CSRs.stats -> reg_stats,
|
||||
CSRs.tohost -> reg_tohost,
|
||||
CSRs.fromhost -> reg_fromhost)
|
||||
CSRs.mtohost -> reg_tohost,
|
||||
CSRs.mfromhost -> reg_fromhost)
|
||||
|
||||
if (params(UseVM)) {
|
||||
val read_sstatus = new SStatus
|
||||
read_sstatus := new SStatus().fromBits(read_mstatus) // sstatus mostly overlaps mstatus
|
||||
read_sstatus.zero1 := 0
|
||||
read_sstatus.zero2 := 0
|
||||
read_sstatus.zero3 := 0
|
||||
read_sstatus.zero4 := 0
|
||||
|
||||
val read_sip = new MIP
|
||||
read_sip := new MIP().fromBits(0)
|
||||
read_sip.ssip := reg_mip.ssip
|
||||
read_sip.stip := reg_mip.stip
|
||||
|
||||
val read_sie = new MIP
|
||||
read_sie := new MIP().fromBits(0)
|
||||
read_sie.ssip := reg_mie.ssip
|
||||
read_sie.stip := reg_mie.stip
|
||||
|
||||
read_mapping += CSRs.sstatus -> read_sstatus.toBits
|
||||
read_mapping += CSRs.sip -> read_sip.toBits
|
||||
read_mapping += CSRs.sie -> read_sie.toBits
|
||||
read_mapping += CSRs.sscratch -> reg_sscratch
|
||||
read_mapping += CSRs.scause -> reg_scause
|
||||
read_mapping += CSRs.sbadaddr -> reg_sbadaddr
|
||||
read_mapping += CSRs.sbadaddr -> reg_sbadaddr.sextTo(xLen)
|
||||
read_mapping += CSRs.sptbr -> reg_sptbr
|
||||
read_mapping += CSRs.sasid -> UInt(0)
|
||||
read_mapping += CSRs.sepc -> reg_sepc
|
||||
read_mapping += CSRs.stvec -> reg_stvec
|
||||
read_mapping += CSRs.sepc -> reg_sepc.sextTo(xLen)
|
||||
read_mapping += CSRs.stvec -> reg_stvec.sextTo(xLen)
|
||||
}
|
||||
|
||||
for (i <- 0 until reg_uarch_counters.size)
|
||||
@@ -241,22 +267,26 @@ class CSRFile extends CoreModule
|
||||
host_pcr_bits.data)))
|
||||
|
||||
val opcode = io.rw.addr
|
||||
val insn_call = !opcode(8) && !opcode(0) && system_insn && priv_sufficient
|
||||
val insn_break = !opcode(8) && opcode(0) && system_insn && priv_sufficient
|
||||
val insn_ret = opcode(8) && !opcode(0) && system_insn && priv_sufficient
|
||||
val insn_sfence_vm = opcode(8) && opcode(0) && system_insn && priv_sufficient
|
||||
val insn_redirect_trap = opcode(2) && system_insn && priv_sufficient
|
||||
val insn_call = !opcode(8) && !opcode(0) && system_insn
|
||||
val insn_break = !opcode(8) && opcode(0) && system_insn
|
||||
val insn_ret = opcode(8) && !opcode(1) && !opcode(0) && system_insn && priv_sufficient
|
||||
val insn_sfence_vm = opcode(8) && !opcode(1) && opcode(0) && system_insn && priv_sufficient
|
||||
val maybe_insn_redirect_trap = opcode(2) && system_insn
|
||||
val insn_redirect_trap = maybe_insn_redirect_trap && priv_sufficient
|
||||
val insn_wfi = opcode(8) && opcode(1) && !opcode(0) && system_insn && priv_sufficient
|
||||
|
||||
val csr_xcpt = (cpu_wen && read_only) ||
|
||||
(cpu_ren && (!priv_sufficient || !addr_valid || fp_csr && !io.status.fs.orR)) ||
|
||||
(system_insn && !priv_sufficient) ||
|
||||
insn_call || insn_break
|
||||
|
||||
val mtvec = reg_mstatus.prv << 6
|
||||
when (insn_wfi) { reg_wfi := true }
|
||||
when (some_interrupt_pending) { reg_wfi := false }
|
||||
|
||||
io.fatc := insn_sfence_vm
|
||||
io.evec := Mux(io.exception || csr_xcpt, mtvec.zext,
|
||||
Mux(insn_redirect_trap, reg_stvec,
|
||||
Mux(reg_mstatus.prv(1), reg_mepc, reg_sepc))).toUInt
|
||||
io.evec := Mux(io.exception || csr_xcpt, (reg_mstatus.prv << 6) + MTVEC,
|
||||
Mux(maybe_insn_redirect_trap, reg_stvec.sextTo(vaddrBitsExtended),
|
||||
Mux(reg_mstatus.prv(1), reg_mepc, reg_sepc)))
|
||||
io.ptbr := reg_sptbr
|
||||
io.csr_xcpt := csr_xcpt
|
||||
io.eret := insn_ret || insn_redirect_trap
|
||||
@@ -270,7 +300,7 @@ class CSRFile extends CoreModule
|
||||
when (io.exception || csr_xcpt) {
|
||||
reg_mstatus.ie := false
|
||||
reg_mstatus.prv := PRV_M
|
||||
reg_mstatus.mprv := PRV_M
|
||||
reg_mstatus.mprv := false
|
||||
reg_mstatus.prv1 := reg_mstatus.prv
|
||||
reg_mstatus.ie1 := reg_mstatus.ie
|
||||
reg_mstatus.prv2 := reg_mstatus.prv1
|
||||
@@ -281,16 +311,15 @@ class CSRFile extends CoreModule
|
||||
when (csr_xcpt) {
|
||||
reg_mcause := Causes.illegal_instruction
|
||||
when (insn_break) { reg_mcause := Causes.breakpoint }
|
||||
when (insn_call) { reg_mcause := Causes.ecall }
|
||||
when (insn_call) { reg_mcause := reg_mstatus.prv + Causes.user_ecall }
|
||||
}
|
||||
|
||||
reg_mbadaddr := io.pc
|
||||
when (io.cause === Causes.fault_load || io.cause === Causes.misaligned_load ||
|
||||
io.cause === Causes.fault_store || io.cause === Causes.misaligned_store) {
|
||||
val wdata = io.rw.wdata
|
||||
val (upper, lower) = Split(wdata, vaddrBits)
|
||||
io.cause === Causes.fault_store || io.cause === Causes.misaligned_store) {
|
||||
val (upper, lower) = Split(io.rw.wdata, vaddrBits)
|
||||
val sign = Mux(lower.toSInt < SInt(0), upper.andR, upper.orR)
|
||||
reg_mbadaddr := Cat(sign, lower).toSInt
|
||||
reg_mbadaddr := Cat(sign, lower)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -313,15 +342,16 @@ class CSRFile extends CoreModule
|
||||
assert(PopCount(insn_ret :: insn_redirect_trap :: io.exception :: csr_xcpt :: io.csr_replay :: Nil) <= 1, "these conditions must be mutually exclusive")
|
||||
|
||||
when (reg_time(reg_stimecmp.getWidth-1,0) === reg_stimecmp) {
|
||||
r_irq_timer := true
|
||||
reg_mip.stip := true
|
||||
}
|
||||
|
||||
io.time := reg_time
|
||||
io.host.ipi_req.valid := cpu_wen && decoded_addr(CSRs.send_ipi)
|
||||
io.host.ipi_req.bits := io.rw.wdata
|
||||
io.csr_replay := io.host.ipi_req.valid && !io.host.ipi_req.ready
|
||||
io.csr_stall := reg_wfi
|
||||
|
||||
when (host_pcr_req_fire && !host_pcr_bits.rw && decoded_addr(CSRs.tohost)) { reg_tohost := UInt(0) }
|
||||
when (host_pcr_req_fire && !host_pcr_bits.rw && decoded_addr(CSRs.mtohost)) { reg_tohost := UInt(0) }
|
||||
|
||||
io.rw.rdata := Mux1H(for ((k, v) <- read_mapping) yield decoded_addr(k) -> v)
|
||||
|
||||
@@ -333,89 +363,103 @@ class CSRFile extends CoreModule
|
||||
when (wen) {
|
||||
when (decoded_addr(CSRs.mstatus)) {
|
||||
val new_mstatus = new MStatus().fromBits(wdata)
|
||||
reg_mstatus.ssip := new_mstatus.ssip
|
||||
reg_mstatus.msip := new_mstatus.msip
|
||||
reg_mstatus.stie := new_mstatus.stie
|
||||
reg_mstatus.ie := new_mstatus.ie
|
||||
reg_mstatus.ie1 := new_mstatus.ie1
|
||||
|
||||
val supportedModes = Vec((PRV_M :: PRV_U :: (if (params(UseVM)) List(PRV_S) else Nil)).map(UInt(_)))
|
||||
if (supportedModes.size > 1) {
|
||||
when (supportedModes contains new_mstatus.mprv) { reg_mstatus.mprv := new_mstatus.mprv }
|
||||
reg_mstatus.mprv := new_mstatus.mprv
|
||||
when (supportedModes contains new_mstatus.prv) { reg_mstatus.prv := new_mstatus.prv }
|
||||
when (supportedModes contains new_mstatus.prv1) { reg_mstatus.prv1 := new_mstatus.prv1 }
|
||||
reg_mstatus.ie1 := new_mstatus.ie1
|
||||
if (supportedModes.size > 2) {
|
||||
when (supportedModes contains new_mstatus.prv2) { reg_mstatus.prv2 := new_mstatus.prv2 }
|
||||
reg_mstatus.ie2 := new_mstatus.ie2
|
||||
}
|
||||
}
|
||||
|
||||
if (params(UseVM)) when (new_mstatus.vm === 0 || new_mstatus.vm === 5) { reg_mstatus.vm := new_mstatus.vm }
|
||||
if (params(UseVM)) {
|
||||
val vm_on = if (xLen == 32) 8 else 9
|
||||
when (new_mstatus.vm === 0) { reg_mstatus.vm := 0 }
|
||||
when (new_mstatus.vm === vm_on) { reg_mstatus.vm := vm_on }
|
||||
}
|
||||
if (params(UseVM) || !params(BuildFPU).isEmpty) reg_mstatus.fs := new_mstatus.fs
|
||||
if (!params(BuildRoCC).isEmpty) reg_mstatus.xs := new_mstatus.xs
|
||||
}
|
||||
when (decoded_addr(CSRs.mip)) {
|
||||
val new_mip = new MIP().fromBits(wdata)
|
||||
if (params(UseVM))
|
||||
reg_mip.ssip := new_mip.ssip
|
||||
reg_mip.msip := new_mip.msip
|
||||
}
|
||||
when (decoded_addr(CSRs.mie)) {
|
||||
val new_mie = new MIP().fromBits(wdata)
|
||||
if (params(UseVM)) {
|
||||
reg_mie.ssip := new_mie.ssip
|
||||
reg_mie.stip := new_mie.stip
|
||||
}
|
||||
reg_mie.msip := new_mie.msip
|
||||
reg_mie.mtip := new_mie.mtip
|
||||
}
|
||||
when (decoded_addr(CSRs.fflags)) { reg_fflags := wdata }
|
||||
when (decoded_addr(CSRs.frm)) { reg_frm := wdata }
|
||||
when (decoded_addr(CSRs.fcsr)) { reg_fflags := wdata; reg_frm := wdata >> reg_fflags.getWidth }
|
||||
when (decoded_addr(CSRs.mepc)) { reg_mepc := wdata(vaddrBits,0).toSInt & SInt(-coreInstBytes) }
|
||||
when (decoded_addr(CSRs.mepc)) { reg_mepc := wdata(vaddrBitsExtended-1,0).toSInt & SInt(-coreInstBytes) }
|
||||
when (decoded_addr(CSRs.mscratch)) { reg_mscratch := wdata }
|
||||
when (decoded_addr(CSRs.mcause)) { reg_mcause := wdata & UInt((BigInt(1) << (xLen-1)) + 31) /* only implement 5 LSBs and MSB */ }
|
||||
when (decoded_addr(CSRs.mbadaddr)) { reg_mbadaddr := wdata }
|
||||
when (decoded_addr(CSRs.scycle)) { reg_time := wdata.toUInt }
|
||||
when (decoded_addr(CSRs.stime)) { reg_time := wdata.toUInt }
|
||||
when (decoded_addr(CSRs.sinstret)) { reg_instret := wdata.toUInt }
|
||||
when (decoded_addr(CSRs.stimecmp)) { reg_stimecmp := wdata(31,0).toUInt; r_irq_timer := Bool(false) }
|
||||
when (decoded_addr(CSRs.fromhost)) { when (reg_fromhost === UInt(0) || !host_pcr_req_fire) { reg_fromhost := wdata } }
|
||||
when (decoded_addr(CSRs.tohost)) { when (reg_tohost === UInt(0) || host_pcr_req_fire) { reg_tohost := wdata } }
|
||||
when (decoded_addr(CSRs.mbadaddr)) { reg_mbadaddr := wdata(vaddrBitsExtended-1,0) }
|
||||
when (decoded_addr(CSRs.cyclew)) { reg_time := wdata }
|
||||
when (decoded_addr(CSRs.instretw)) { reg_instret := wdata }
|
||||
when (decoded_addr(CSRs.timew)) { reg_time := wdata }
|
||||
when (decoded_addr(CSRs.stimew)) { reg_time := wdata }
|
||||
when (decoded_addr(CSRs.stimecmp)) { reg_stimecmp := wdata(31,0); reg_mip.stip := false }
|
||||
when (decoded_addr(CSRs.mfromhost)){ when (reg_fromhost === UInt(0) || !host_pcr_req_fire) { reg_fromhost := wdata } }
|
||||
when (decoded_addr(CSRs.mtohost)) { when (reg_tohost === UInt(0) || host_pcr_req_fire) { reg_tohost := wdata } }
|
||||
when (decoded_addr(CSRs.stats)) { reg_stats := wdata(0) }
|
||||
if (params(UseVM)) {
|
||||
when (decoded_addr(CSRs.sstatus)) {
|
||||
val new_sstatus = new SStatus().fromBits(wdata)
|
||||
reg_mstatus.ssip := new_sstatus.sip
|
||||
reg_mstatus.stie := new_sstatus.tie
|
||||
reg_mstatus.ie := new_sstatus.ie
|
||||
reg_mstatus.ie1 := new_sstatus.pie
|
||||
reg_mstatus.prv1 := Mux(new_sstatus.ps, PRV_S, PRV_U)
|
||||
reg_mstatus.mprv := new_sstatus.mprv
|
||||
reg_mstatus.fs := new_sstatus.fs // even without an FPU
|
||||
if (!params(BuildRoCC).isEmpty) reg_mstatus.xs := new_sstatus.xs
|
||||
}
|
||||
when (decoded_addr(CSRs.sip)) {
|
||||
val new_sip = new MIP().fromBits(wdata)
|
||||
reg_mip.ssip := new_sip.ssip
|
||||
}
|
||||
when (decoded_addr(CSRs.sie)) {
|
||||
val new_sie = new MIP().fromBits(wdata)
|
||||
reg_mie.ssip := new_sie.ssip
|
||||
reg_mie.stip := new_sie.stip
|
||||
}
|
||||
when (decoded_addr(CSRs.sscratch)) { reg_sscratch := wdata }
|
||||
when (decoded_addr(CSRs.sptbr)) { reg_sptbr := Cat(wdata(paddrBits-1, pgIdxBits), Bits(0, pgIdxBits)).toUInt }
|
||||
when (decoded_addr(CSRs.sepc)) { reg_sepc := wdata(vaddrBits,0).toSInt & SInt(-coreInstBytes) }
|
||||
when (decoded_addr(CSRs.sptbr)) { reg_sptbr := Cat(wdata(paddrBits-1, pgIdxBits), Bits(0, pgIdxBits)) }
|
||||
when (decoded_addr(CSRs.sepc)) { reg_sepc := wdata(vaddrBitsExtended-1,0).toSInt & SInt(-coreInstBytes) }
|
||||
when (decoded_addr(CSRs.stvec)) { reg_stvec := wdata(vaddrBits-1,0).toSInt & SInt(-coreInstBytes) }
|
||||
}
|
||||
}
|
||||
|
||||
io.host.ipi_rep.ready := true
|
||||
when (io.host.ipi_rep.valid) { reg_mstatus.msip := true }
|
||||
when (io.host.ipi_rep.valid) { reg_mip.msip := true }
|
||||
|
||||
when(this.reset) {
|
||||
reg_mstatus.zero1 := 0
|
||||
reg_mstatus.ssip := false
|
||||
reg_mstatus.hsip := false
|
||||
reg_mstatus.msip := false
|
||||
reg_mstatus.zero2 := 0
|
||||
reg_mstatus.ie := false
|
||||
reg_mstatus.prv := PRV_M
|
||||
reg_mstatus.ie1 := false
|
||||
reg_mstatus.prv1 := PRV_U /* hard-wired to 0 when missing user mode */
|
||||
reg_mstatus.ie2 := false
|
||||
reg_mstatus.prv1 := PRV_M /* hard-wired to M when missing user mode */
|
||||
reg_mstatus.ie2 := false /* hard-wired to 0 when missing supervisor mode */
|
||||
reg_mstatus.prv2 := PRV_U /* hard-wired to 0 when missing supervisor mode */
|
||||
reg_mstatus.ie3 := false
|
||||
reg_mstatus.ie3 := false /* hard-wired to 0 when missing hypervisor mode */
|
||||
reg_mstatus.prv3 := PRV_U /* hard-wired to 0 when missing hypervisor mode */
|
||||
reg_mstatus.mprv := PRV_M
|
||||
reg_mstatus.zero2 := 0
|
||||
reg_mstatus.mprv := false
|
||||
reg_mstatus.vm := 0
|
||||
reg_mstatus.zero3 := 0
|
||||
reg_mstatus.stie := false
|
||||
reg_mstatus.htie := false
|
||||
reg_mstatus.mtie := false
|
||||
reg_mstatus.fs := 0
|
||||
reg_mstatus.xs := 0
|
||||
reg_mstatus.sd_rv32 := false
|
||||
reg_mstatus.ua := 4
|
||||
reg_mstatus.sa := 4
|
||||
reg_mstatus.ha := 0
|
||||
reg_mstatus.zero4 := 0
|
||||
reg_mstatus.sd := false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,6 +44,7 @@ class CtrlDpathIO extends CoreBundle
|
||||
val fp_sboard_clra = UInt(INPUT, 5)
|
||||
// inputs from csr file
|
||||
val csr_replay = Bool(INPUT)
|
||||
val csr_stall = Bool(INPUT)
|
||||
val csr_xcpt = Bool(INPUT)
|
||||
val eret = Bool(INPUT)
|
||||
val interrupt = Bool(INPUT)
|
||||
@@ -212,11 +213,12 @@ object XDecode extends DecodeConstants
|
||||
FENCE-> List(Y, N,N,N,N,N,N,N,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.N,N,Y,N),
|
||||
FENCE_I-> List(Y, N,N,N,N,N,N,N,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.N,Y,N,N),
|
||||
|
||||
SFENCE_VM-> List(Y, N,N,N,N,N,N,N,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
SCALL-> List(Y, N,N,N,N,N,N,N,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
SBREAK-> List(Y, N,N,N,N,N,N,N,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
SRET-> List(Y, N,N,N,N,N,N,N,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
MRTS-> List(Y, N,N,N,N,N,N,N,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
SFENCE_VM-> List(Y, N,N,N,N,N,N,X,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
SCALL-> List(Y, N,N,N,N,N,N,X,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
SBREAK-> List(Y, N,N,N,N,N,N,X,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
SRET-> List(Y, N,N,N,N,N,N,X,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
MRTS-> List(Y, N,N,N,N,N,N,X,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
WFI-> List(Y, N,N,N,N,N,N,X,A2_X, A1_X, IMM_X, DW_X, FN_X, N,M_X, MT_X, N,N,N,N,N,N,CSR.I,N,N,N),
|
||||
CSRRW-> List(Y, N,N,N,N,N,N,Y,A2_ZERO,A1_RS1, IMM_X, DW_XPR,FN_ADD, N,M_X, MT_X, N,N,N,N,N,Y,CSR.W,N,N,N),
|
||||
CSRRS-> List(Y, N,N,N,N,N,N,Y,A2_ZERO,A1_RS1, IMM_X, DW_XPR,FN_ADD, N,M_X, MT_X, N,N,N,N,N,Y,CSR.S,N,N,N),
|
||||
CSRRC-> List(Y, N,N,N,N,N,N,Y,A2_ZERO,A1_RS1, IMM_X, DW_XPR,FN_ADD, N,M_X, MT_X, N,N,N,N,N,Y,CSR.C,N,N,N),
|
||||
@@ -646,7 +648,8 @@ class Control extends CoreModule
|
||||
id_ctrl.fp && id_stall_fpu ||
|
||||
id_ctrl.mem && !io.dmem.req.ready ||
|
||||
Bool(!params(BuildRoCC).isEmpty) && wb_reg_rocc_pending && id_ctrl.rocc && !io.rocc.cmd.ready ||
|
||||
id_do_fence
|
||||
id_do_fence ||
|
||||
io.dpath.csr_stall
|
||||
val ctrl_draind = io.dpath.interrupt
|
||||
ctrl_killd := !io.imem.resp.valid || take_pc || ctrl_stalld || ctrl_draind
|
||||
|
||||
|
||||
@@ -16,17 +16,17 @@ abstract class FrontendBundle extends Bundle with FrontendParameters
|
||||
abstract class FrontendModule extends Module with FrontendParameters
|
||||
|
||||
class FrontendReq extends CoreBundle {
|
||||
val pc = UInt(width = vaddrBits+1)
|
||||
val pc = UInt(width = vaddrBitsExtended)
|
||||
}
|
||||
|
||||
class FrontendResp extends CoreBundle {
|
||||
val pc = UInt(width = vaddrBits+1) // ID stage PC
|
||||
val pc = UInt(width = vaddrBitsExtended) // ID stage PC
|
||||
val data = Vec.fill(coreFetchWidth) (Bits(width = coreInstBits))
|
||||
val mask = Bits(width = coreFetchWidth)
|
||||
val xcpt_if = Bool()
|
||||
}
|
||||
|
||||
class CPUFrontendIO extends Bundle {
|
||||
class CPUFrontendIO extends CoreBundle {
|
||||
val req = Valid(new FrontendReq)
|
||||
val resp = Decoupled(new FrontendResp).flip
|
||||
val btb_resp = Valid(new BTBResp).flip
|
||||
@@ -34,6 +34,7 @@ class CPUFrontendIO extends Bundle {
|
||||
val bht_update = Valid(new BHTUpdate)
|
||||
val ras_update = Valid(new RASUpdate)
|
||||
val invalidate = Bool(OUTPUT)
|
||||
val npc = UInt(INPUT, width = vaddrBitsExtended)
|
||||
}
|
||||
|
||||
class Frontend(btb_updates_out_of_order: Boolean = false) extends FrontendModule
|
||||
@@ -103,13 +104,14 @@ class Frontend(btb_updates_out_of_order: Boolean = false) extends FrontendModule
|
||||
|
||||
icache.io.mem <> io.mem
|
||||
icache.io.req.valid := !stall && !s0_same_block
|
||||
icache.io.req.bits.idx := Mux(io.cpu.req.valid, io.cpu.req.bits.pc, npc)
|
||||
icache.io.req.bits.idx := io.cpu.npc
|
||||
icache.io.invalidate := io.cpu.invalidate
|
||||
icache.io.req.bits.ppn := tlb.io.resp.ppn
|
||||
icache.io.req.bits.kill := io.cpu.req.valid || tlb.io.resp.miss || icmiss || io.ptw.invalidate
|
||||
|
||||
io.cpu.resp.valid := s2_valid && (s2_xcpt_if || icbuf.io.deq.valid)
|
||||
io.cpu.resp.bits.pc := s2_pc
|
||||
io.cpu.npc := Mux(io.cpu.req.valid, io.cpu.req.bits.pc, npc)
|
||||
|
||||
icbuf.io.enq <> icache.io.resp
|
||||
icbuf.io.deq.ready := !stall && !s1_same_block
|
||||
|
||||
@@ -97,7 +97,10 @@ object Instructions {
|
||||
def SBREAK = Bits("b00000000000100000000000001110011")
|
||||
def SRET = Bits("b00010000000000000000000001110011")
|
||||
def SFENCE_VM = Bits("b000100000001?????000000001110011")
|
||||
def WFI = Bits("b00010000001000000000000001110011")
|
||||
def MRTH = Bits("b00110000011000000000000001110011")
|
||||
def MRTS = Bits("b00110000010100000000000001110011")
|
||||
def HRTS = Bits("b00100000010100000000000001110011")
|
||||
def CSRRW = Bits("b?????????????????001?????1110011")
|
||||
def CSRRS = Bits("b?????????????????010?????1110011")
|
||||
def CSRRC = Bits("b?????????????????011?????1110011")
|
||||
@@ -195,23 +198,29 @@ object Causes {
|
||||
val misaligned_fetch = 0x0
|
||||
val fault_fetch = 0x1
|
||||
val illegal_instruction = 0x2
|
||||
val breakpoint = 0x3
|
||||
val misaligned_load = 0x4
|
||||
val fault_load = 0x5
|
||||
val misaligned_store = 0x6
|
||||
val fault_store = 0x7
|
||||
val ecall = 0x8
|
||||
val breakpoint = 0x9
|
||||
val user_ecall = 0x8
|
||||
val supervisor_ecall = 0x9
|
||||
val hypervisor_ecall = 0xa
|
||||
val machine_ecall = 0xb
|
||||
val all = {
|
||||
val res = collection.mutable.ArrayBuffer[Int]()
|
||||
res += misaligned_fetch
|
||||
res += fault_fetch
|
||||
res += illegal_instruction
|
||||
res += breakpoint
|
||||
res += misaligned_load
|
||||
res += fault_load
|
||||
res += misaligned_store
|
||||
res += fault_store
|
||||
res += ecall
|
||||
res += breakpoint
|
||||
res += user_ecall
|
||||
res += supervisor_ecall
|
||||
res += hypervisor_ecall
|
||||
res += machine_ecall
|
||||
res.toArray
|
||||
}
|
||||
}
|
||||
@@ -241,32 +250,47 @@ object CSRs {
|
||||
val uarch15 = 0xccf
|
||||
val sstatus = 0x100
|
||||
val stvec = 0x101
|
||||
val sie = 0x104
|
||||
val stimecmp = 0x121
|
||||
val sscratch = 0x140
|
||||
val sepc = 0x141
|
||||
val sptbr = 0x188
|
||||
val sasid = 0x189
|
||||
val scycle = 0x900
|
||||
val stime = 0x901
|
||||
val sinstret = 0x902
|
||||
val scause = 0xd40
|
||||
val sbadaddr = 0xd41
|
||||
val sip = 0x144
|
||||
val sptbr = 0x180
|
||||
val sasid = 0x181
|
||||
val cyclew = 0x900
|
||||
val timew = 0x901
|
||||
val instretw = 0x902
|
||||
val stime = 0xd01
|
||||
val scause = 0xd42
|
||||
val sbadaddr = 0xd43
|
||||
val stimew = 0xa01
|
||||
val mstatus = 0x300
|
||||
val mtvec = 0x301
|
||||
val mtdeleg = 0x302
|
||||
val mie = 0x304
|
||||
val mtimecmp = 0x321
|
||||
val mscratch = 0x340
|
||||
val mepc = 0x341
|
||||
val mcause = 0x342
|
||||
val mbadaddr = 0x343
|
||||
val reset = 0x780
|
||||
val tohost = 0x781
|
||||
val fromhost = 0x782
|
||||
val mip = 0x344
|
||||
val mtime = 0x701
|
||||
val mcpuid = 0xf00
|
||||
val mimpid = 0xf01
|
||||
val mhartid = 0xf10
|
||||
val mtohost = 0x780
|
||||
val mfromhost = 0x781
|
||||
val mreset = 0x782
|
||||
val send_ipi = 0x783
|
||||
val hartid = 0xfc0
|
||||
val cycleh = 0xc80
|
||||
val timeh = 0xc81
|
||||
val instreth = 0xc82
|
||||
val scycleh = 0x980
|
||||
val stimeh = 0x981
|
||||
val sinstreth = 0x982
|
||||
val cyclehw = 0x980
|
||||
val timehw = 0x981
|
||||
val instrethw = 0x982
|
||||
val stimeh = 0xd81
|
||||
val stimehw = 0xa81
|
||||
val mtimeh = 0x741
|
||||
val all = {
|
||||
val res = collection.mutable.ArrayBuffer[Int]()
|
||||
res += fflags
|
||||
@@ -294,26 +318,38 @@ object CSRs {
|
||||
res += uarch15
|
||||
res += sstatus
|
||||
res += stvec
|
||||
res += sie
|
||||
res += stimecmp
|
||||
res += sscratch
|
||||
res += sepc
|
||||
res += sip
|
||||
res += sptbr
|
||||
res += sasid
|
||||
res += scycle
|
||||
res += cyclew
|
||||
res += timew
|
||||
res += instretw
|
||||
res += stime
|
||||
res += sinstret
|
||||
res += scause
|
||||
res += sbadaddr
|
||||
res += stimew
|
||||
res += mstatus
|
||||
res += mtvec
|
||||
res += mtdeleg
|
||||
res += mie
|
||||
res += mtimecmp
|
||||
res += mscratch
|
||||
res += mepc
|
||||
res += mcause
|
||||
res += mbadaddr
|
||||
res += reset
|
||||
res += tohost
|
||||
res += fromhost
|
||||
res += mip
|
||||
res += mtime
|
||||
res += mcpuid
|
||||
res += mimpid
|
||||
res += mhartid
|
||||
res += mtohost
|
||||
res += mfromhost
|
||||
res += mreset
|
||||
res += send_ipi
|
||||
res += hartid
|
||||
res.toArray
|
||||
}
|
||||
val all32 = {
|
||||
@@ -321,9 +357,12 @@ object CSRs {
|
||||
res += cycleh
|
||||
res += timeh
|
||||
res += instreth
|
||||
res += scycleh
|
||||
res += cyclehw
|
||||
res += timehw
|
||||
res += instrethw
|
||||
res += stimeh
|
||||
res += sinstreth
|
||||
res += stimehw
|
||||
res += mtimeh
|
||||
res.toArray
|
||||
}
|
||||
}
|
||||
|
||||
@@ -670,8 +670,8 @@ class HellaCache extends L1HellaCacheModule {
|
||||
|
||||
io.cpu.xcpt.ma.ld := s1_read && misaligned
|
||||
io.cpu.xcpt.ma.st := s1_write && misaligned
|
||||
io.cpu.xcpt.pf.ld := s1_read && dtlb.io.resp.xcpt_ld
|
||||
io.cpu.xcpt.pf.st := s1_write && dtlb.io.resp.xcpt_st
|
||||
io.cpu.xcpt.pf.ld := !s1_req.phys && s1_read && dtlb.io.resp.xcpt_ld
|
||||
io.cpu.xcpt.pf.st := !s1_req.phys && s1_write && dtlb.io.resp.xcpt_st
|
||||
|
||||
assert (!(Reg(next=
|
||||
(io.cpu.xcpt.ma.ld || io.cpu.xcpt.ma.st || io.cpu.xcpt.pf.ld || io.cpu.xcpt.pf.st)) &&
|
||||
|
||||
@@ -3,5 +3,6 @@
|
||||
package object rocket extends
|
||||
rocket.constants.ScalarOpConstants
|
||||
{
|
||||
val START_ADDR = 0x100
|
||||
val MTVEC = 0x100
|
||||
val START_ADDR = MTVEC + 0x100
|
||||
}
|
||||
|
||||
@@ -33,22 +33,20 @@ class DatapathPTWIO extends CoreBundle {
|
||||
|
||||
class PTE extends CoreBundle {
|
||||
val ppn = Bits(width = ppnBits)
|
||||
val reserved = Bits(width = 16)
|
||||
val reserved_for_software = Bits(width = 2)
|
||||
val reserved_for_software = Bits(width = 3)
|
||||
val d = Bool()
|
||||
val r = Bool()
|
||||
val g = Bool()
|
||||
val perm = Bits(width = 2)
|
||||
val typ = Bits(width = 3)
|
||||
val typ = Bits(width = 4)
|
||||
val v = Bool()
|
||||
|
||||
def table(dummy: Int = 0) = typ === 1
|
||||
def leaf(dummy: Int = 0) = typ >= 2
|
||||
def ur(dummy: Int = 0) = typ === 2 || typ >= 4
|
||||
def uw(dummy: Int = 0) = ur() && perm(0)
|
||||
def ux(dummy: Int = 0) = ur() && perm(1)
|
||||
def sr(dummy: Int = 0) = typ >= 3
|
||||
def sw(dummy: Int = 0) = Mux(typ >= 4, typ(0), typ === 3 && perm(0))
|
||||
def sx(dummy: Int = 0) = Mux(typ >= 4, typ(1), typ === 3 && perm(1))
|
||||
def table(dummy: Int = 0) = v && typ < 2
|
||||
def leaf(dummy: Int = 0) = v && typ >= 2
|
||||
def ur(dummy: Int = 0) = leaf() && typ < 8
|
||||
def uw(dummy: Int = 0) = ur() && typ(0)
|
||||
def ux(dummy: Int = 0) = ur() && typ(1)
|
||||
def sr(dummy: Int = 0) = leaf()
|
||||
def sw(dummy: Int = 0) = leaf() && typ(0)
|
||||
def sx(dummy: Int = 0) = v && typ >= 4 && typ(1)
|
||||
def access_ok(prv: Bits, store: Bool, fetch: Bool) =
|
||||
Mux(prv(0), Mux(fetch, sx(), Mux(store, sw(), sr())), Mux(fetch, ux(), Mux(store, uw(), ur())))
|
||||
}
|
||||
|
||||
@@ -146,7 +146,7 @@ class TLB extends TLBModule {
|
||||
val plru = new PseudoLRU(entries)
|
||||
val repl_waddr = Mux(has_invalid_entry, invalid_entry, plru.replace)
|
||||
|
||||
val priv = Mux(io.ptw.status.prv === PRV_M && !io.req.bits.instruction, io.ptw.status.mprv, io.ptw.status.prv)
|
||||
val priv = Mux(io.ptw.status.mprv && !io.req.bits.instruction, io.ptw.status.prv1, io.ptw.status.prv)
|
||||
val priv_s = priv === PRV_S
|
||||
val priv_uses_vm = priv <= PRV_S
|
||||
val req_xwr = Cat(!r_req.store, r_req.store, !(r_req.instruction || r_req.store))
|
||||
@@ -155,7 +155,7 @@ class TLB extends TLBModule {
|
||||
val w_array = Mux(priv_s, sw_array, uw_array)
|
||||
val x_array = Mux(priv_s, sx_array, ux_array)
|
||||
|
||||
val vm_enabled = io.ptw.status.vm(2) && priv_uses_vm
|
||||
val vm_enabled = io.ptw.status.vm(3) && priv_uses_vm
|
||||
val bad_va = io.req.bits.vpn(vpnBits) != io.req.bits.vpn(vpnBits-1)
|
||||
// it's only a store hit if the dirty bit is set
|
||||
val tag_hits = tag_cam.io.hits & (dirty_array | ~(io.req.bits.store.toSInt & w_array))
|
||||
|
||||
@@ -12,6 +12,9 @@ object Util {
|
||||
implicit def intSeqToUIntSeq(x: Iterable[Int]): Iterable[UInt] = x.map(UInt(_))
|
||||
implicit def seqToVec[T <: Data](x: Iterable[T]): Vec[T] = Vec(x)
|
||||
implicit def wcToUInt(c: WideCounter): UInt = c.value
|
||||
implicit def sextToConv(x: UInt) = new AnyRef {
|
||||
def sextTo(n: Int): UInt = Cat(Fill(n - x.getWidth, x(x.getWidth-1)), x)
|
||||
}
|
||||
|
||||
implicit def intToUnsigned(x: Int): Unsigned = new Unsigned(x)
|
||||
implicit def booleanToIntConv(x: Boolean) = new AnyRef {
|
||||
@@ -97,7 +100,7 @@ object Split
|
||||
val w = x.getWidth
|
||||
def decreasing(x: Seq[Int]): Boolean =
|
||||
if (x.tail.isEmpty) true
|
||||
else x.head > x.tail.head && decreasing(x.tail)
|
||||
else x.head >= x.tail.head && decreasing(x.tail)
|
||||
require(decreasing(w :: n.toList))
|
||||
w
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user