from soc.experiment.mem_types import LoadStore1ToDCacheType, LoadStore1ToMMUType
from soc.experiment.mem_types import DCacheToLoadStore1Type, MMUToLoadStore1Type
+# for testing purposes
+from soc.experiment.testmem import TestMemory
+
# glue logic for microwatt mmu and dcache
class LoadStore1(PortInterfaceBase):
def __init__(self, regwid=64, addrwid=4):
self.d_out = DCacheToLoadStore1Type()
self.l_in = LoadStore1ToMMUType()
self.l_out = MMUToLoadStore1Type()
+ # for debugging with gtkwave only
+ self.debug1 = Signal()
+ self.debug2 = Signal()
def set_wr_addr(self, m, addr, mask):
+ #m.d.comb += self.d_in.valid.eq(1)
+ #m.d.comb += self.l_in.valid.eq(1)
+ #m.d.comb += self.d_in.load.eq(0)
+ #m.d.comb += self.l_in.load.eq(0)
m.d.comb += self.d_in.addr.eq(addr)
m.d.comb += self.l_in.addr.eq(addr)
# TODO set mask
return None
def set_rd_addr(self, m, addr, mask):
+ m.d.comb += self.d_in.valid.eq(1)
+ m.d.comb += self.l_in.valid.eq(1)
+ m.d.comb += self.d_in.load.eq(1)
+ m.d.comb += self.l_in.load.eq(1)
m.d.comb += self.d_in.addr.eq(addr)
m.d.comb += self.l_in.addr.eq(addr)
- # TODO set mask
- return None
+ m.d.comb += self.debug1.eq(1)
+ # m.d.comb += self.debug2.eq(1)
+ # connect testmem first
+ return None #FIXME return value
def set_wr_data(self, m, data, wen):
m.d.comb += self.d_in.data.eq(data)
self.n.data_o = MMUOutputData(pspec)
# incoming PortInterface
- self.ldst = LoadStore1()
+ self.ldst = LoadStore1() # TODO make this depend on pspec
self.pi = self.ldst.pi
# this Function Unit is extremely unusual in that it actually stores a
self.mmu = MMU()
self.dcache = DCache()
+ regwid=64
+ aw = 5
+ # for verification of DCache
+ # XXX -- read testmem.py
+ self.testmem = TestMemory(regwid, aw, granularity=regwid//8, init=False)
# make life a bit easier in Core
self.pspec.mmu = self.mmu
self.pspec.dcache = self.dcache
# debugging output for gtkw
- self.debug0 = Signal(64)
- self.debug1 = Signal(64)
- self.debug2 = Signal(64)
- self.debug3 = Signal(64)
+ self.debug0 = Signal(4)
+ self.debug_wb_cyc = Signal()
+ self.debug_wb_stb = Signal()
+ self.debug_wb_we = Signal()
+ #self.debug1 = Signal(64)
+ #self.debug2 = Signal(64)
+ #self.debug3 = Signal(64)
# for SPR field number access
i = self.p.data_i
m.submodules.dcache = dcache = self.dcache
m.submodules.mmu = mmu = self.mmu
m.submodules.ldst = ldst = self.ldst
+ m.submodules.testmem = testmem = self.testmem
m.d.comb += dcache.m_in.eq(mmu.d_out)
m.d.comb += mmu.d_in.eq(dcache.m_out)
l_in, l_out = mmu.l_in, mmu.l_out
d_in, d_out = dcache.d_in, dcache.d_out
+ wb_out, wb_in = dcache.wb_out, dcache.wb_in
+ # link ldst and dcache together
comb += l_in.eq(self.ldst.l_in)
comb += self.ldst.l_out.eq(l_out)
comb += d_in.eq(self.ldst.d_in)
comb += self.ldst.d_out.eq(self.dcache.d_out)
+ #connect read port
+ rdport = self.testmem.rdport
+ comb += rdport.addr.eq(wb_out.adr)
+ comb += wb_in.dat.eq(rdport.data)
+
+ #connect write port
+ wrport = self.testmem.wrport
+ comb += wrport.addr.eq(wb_out.adr)
+ comb += wrport.data.eq(wb_out.dat) # write st to mem
+ comb += wrport.en.eq(wb_out.cyc & wb_out.we) # enable writes
+
+ # connect DCache wishbone master to debugger
+ comb += self.debug_wb_cyc.eq(wb_out.cyc)
+ comb += self.debug_wb_stb.eq(wb_out.stb)
+ comb += self.debug_wb_we.eq(wb_out.we)
+
+ comb += wb_in.stall.eq(0)
+ # testmem only takes on cycle
+ with m.If( wb_out.cyc ):
+ m.d.sync += wb_in.ack.eq( wb_out.stb )
+
data_i, data_o = self.p.data_i, self.n.data_o
a_i, b_i, o = data_i.ra, data_i.rb, data_o.o
op = data_i.ctx.op
# should "action" the operation. one of MMU or DCache gets
# enabled ("valid") and we twiddle our thumbs until it
# responds ("done").
+
+ # FIXME: properly implement MicrOp.OP_MTSPR and MicrOp.OP_MFSPR
+
with m.Switch(op.insn_type):
+ comb += self.debug0.eq(3)
with m.Case(MicrOp.OP_MTSPR):
- comb += self.debug0.eq(0xFF)
- comb += self.debug1.eq(spr)
- comb += self.debug2.eq(a_i)
- comb += self.debug3.eq(a_i[:32])
# subset SPR: first check a few bits
with m.If(~spr[9] & ~spr[5]):
with m.If(spr[0]):
comb += done.eq(l_out.done) # zzzz
with m.Case(MicrOp.OP_MFSPR):
+ comb += self.debug0.eq(3)
# subset SPR: first check a few bits
with m.If(~spr[9] & ~spr[5]):
with m.If(spr[0]):
# blip the MMU and wait for it to complete
comb += valid.eq(1) # start "pulse"
comb += l_in.valid.eq(blip) # start
- comb += l_in.mtspr.eq(1) # mtspr mode
+ comb += l_in.mtspr.eq(0) # mfspr!=mtspr
comb += l_in.sprn.eq(spr) # which SPR
comb += l_in.rs.eq(a_i) # incoming operand (RS)
comb += o.data.eq(l_out.sprval) # SPR from MMU
comb += d_in.dcbz.eq(1) # dcbz mode
comb += d_in.addr.eq(a_i + b_i) # addr is (RA|0) + RB
comb += done.eq(d_out.store_done) # TODO
+ comb += self.debug0.eq(1)
with m.Case(MicrOp.OP_TLBIE):
# pass TLBIE request to MMU (spec: v3.0B p1034)
comb += l_in.sprn.eq(spr) # use sprn to send insn bits
comb += l_in.addr.eq(b_i) # incoming operand (RB)
comb += done.eq(l_out.done) # zzzz
+ comb += self.debug0.eq(2)
with m.If(self.n.ready_i & self.n.valid_o):
m.d.sync += busy.eq(0)
projects / soc.git / blobdiff