Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/migen
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3a284b9c1ece
Choose a base ref
...
head repository: m-labs/migen
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fe54c687629f
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 10, 2013

  1. genlib/fsm: fix handling of zero delayed_enter

    Sebastien Bourdeauducq committed Jun 10, 2013
    Copy the full SHA
    aea3b59 View commit details
  2. lasmi: fix minor problems

    Sebastien Bourdeauducq committed Jun 10, 2013
    Copy the full SHA
    fe54c68 View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 migen/actorlib/dma_lasmi.py
  2. +3 −3 migen/bus/wishbone2lasmi.py
  3. +1 −1 migen/genlib/fsm.py
2 changes: 1 addition & 1 deletion migen/actorlib/dma_lasmi.py
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ def __init__(self, lasmim, fifo_depth=None):
request_issued = Signal()

self.comb += [
self.bus.we.eq(0),
lasmim.we.eq(0),
lasmim.stb.eq(self.address.stb & request_enable),
lasmim.adr.eq(self.address.payload.a),
self.address.ack.eq(lasmim.ack),
6 changes: 3 additions & 3 deletions migen/bus/wishbone2lasmi.py
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ def __init__(self, cachesize, lasmim):
# TAG | LINE NUMBER | LINE OFFSET
offsetbits = log2_int(lasmim.dw//32)
addressbits = lasmim.aw + offsetbits
linebits = log2_int(self.cachesize) - offsetbits
linebits = log2_int(cachesize) - offsetbits
tagbits = addressbits - linebits
adr_offset, adr_line, adr_tag = split(self.wishbone.adr, offsetbits, linebits, tagbits)

@@ -93,7 +93,7 @@ def __init__(self, cachesize, lasmim):
fsm.next_state(fsm.IDLE)
).Else(
If(tag_do.dirty,
fsm.next_state(fsm.EVICT_ISSUE)
fsm.next_state(fsm.EVICT_REQUEST)
).Else(
fsm.next_state(fsm.REFILL_WRTAG)
)
@@ -120,6 +120,6 @@ def __init__(self, cachesize, lasmim):
If(lasmim.ack, fsm.next_state(fsm.REFILL_DATAD))
)
fsm.act(fsm.REFILL_DATA,
write_from_asmi.eq(1),
write_from_lasmi.eq(1),
fsm.next_state(fsm.TEST_HIT)
)
2 changes: 1 addition & 1 deletion migen/genlib/fsm.py
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ def __init__(self, *states, delayed_enters=[]):
self.actions.append([self.next_state(target_state)])
else:
# alias
setattr(self, name, getattr(self, target_state))
setattr(self, name, target_state)

def reset_state(self, state):
self._state.reset = state