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: amaranth-lang/amaranth-soc
base: e9f73e4b8846
Choose a base ref
...
head repository: amaranth-lang/amaranth-soc
compare: ec7d19e226db
Choose a head ref
  • 3 commits
  • 9 files changed
  • 1 contributor

Commits on Oct 29, 2021

  1. memory: use id() to index memory map resources and windows. 

    Resource objects are no longer required to implement __hash__.
    @jfng
    Jean-François Nguyen authored and jfng committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    9d67a0a View commit details
    Browse the repository at this point in the history

  2. memory: provide a naming mechanism for memory map resources and windows 

    Each memory map now has a namespace for its resources and windows.
Names are mandatory for resources, but optional for windows. The full
name of a resource is a concatenation of its own name and the name of
each named window behind which it is located.

Breaking changes:
* MemoryMap.add_resource() now takes a mandatory ``name`` parameter.
* MemoryMap.resources() now returns a ``resource, name, (start, end)``
  tuple.
* Freezing a memory map now prevents the further addition of *any*
  resource or window, instead of only the ones that require an extension
  of the memory map address bits. Allowing these could prevent us from
  detecting name conflicts in some cases.

Other changes:
* The MemoryMap constructor now takes an optional ``name`` parameter,
  which is then visible as a property.
* The constructors of csr.Multiplexer, csr.Decoder, WishboneCSRBridge
  and wishbone.Decoder now take an optional ``name`` parameter, which is
  passed to their underlying memory map.
    @jfng
    Jean-François Nguyen authored and jfng committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    9a7232b View commit details
    Browse the repository at this point in the history

  3. memory: use a ResourceInfo data class to answer resource queries. 

    Breaking changes:
* MemoryMap.all_resources() and MemoryMap.find_resource() return an
  instance of ResourceInfo describing the resource and its assigned name
  and address range, instead of a tuple.

Fixes #20.
    @jfng
    Jean-François Nguyen authored and jfng committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    ec7d19e View commit details
    Browse the repository at this point in the history