diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2012-04-06 13:46:31 -0400 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-04-06 13:46:31 -0400 |
commit | b00949d88bb3185dfa2e27799de7f90e5a449be8 (patch) | |
tree | 74789b938463bcf38d5ffd5e6be5ef7a02d84a58 /src/arch/sparc | |
parent | dbe1608fd58d818f59a0adf5f3fb562f61242f99 (diff) | |
download | gem5-b00949d88bb3185dfa2e27799de7f90e5a449be8.tar.xz |
MEM: Enable multiple distributed generalized memories
This patch removes the assumption on having on single instance of
PhysicalMemory, and enables a distributed memory where the individual
memories in the system are each responsible for a single contiguous
address range.
All memories inherit from an AbstractMemory that encompasses the basic
behaviuor of a random access memory, and provides untimed access
methods. What was previously called PhysicalMemory is now
SimpleMemory, and a subclass of AbstractMemory. All future types of
memory controllers should inherit from AbstractMemory.
To enable e.g. the atomic CPU and RubyPort to access the now
distributed memory, the system has a wrapper class, called
PhysicalMemory that is aware of all the memories in the system and
their associated address ranges. This class thus acts as an
infinitely-fast bus and performs address decoding for these "shortcut"
accesses. Each memory can specify that it should not be part of the
global address map (used e.g. by the functional memories by some
testers). Moreover, each memory can be configured to be reported to
the OS configuration table, useful for populating ATAG structures, and
any potential ACPI tables.
Checkpointing support currently assumes that all memories have the
same size and organisation when creating and resuming from the
checkpoint. A future patch will enable a more flexible
re-organisation.
--HG--
rename : src/mem/PhysicalMemory.py => src/mem/AbstractMemory.py
rename : src/mem/PhysicalMemory.py => src/mem/SimpleMemory.py
rename : src/mem/physical.cc => src/mem/abstract_mem.cc
rename : src/mem/physical.hh => src/mem/abstract_mem.hh
rename : src/mem/physical.cc => src/mem/simple_mem.cc
rename : src/mem/physical.hh => src/mem/simple_mem.hh
Diffstat (limited to 'src/arch/sparc')
-rw-r--r-- | src/arch/sparc/SparcSystem.py | 18 | ||||
-rw-r--r-- | src/arch/sparc/remote_gdb.hh | 1 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/arch/sparc/SparcSystem.py b/src/arch/sparc/SparcSystem.py index 92845235a..b0fddf311 100644 --- a/src/arch/sparc/SparcSystem.py +++ b/src/arch/sparc/SparcSystem.py @@ -28,7 +28,7 @@ from m5.params import * -from PhysicalMemory import * +from SimpleMemory import SimpleMemory from System import System class SparcSystem(System): @@ -38,20 +38,20 @@ class SparcSystem(System): _hypervisor_desc_base = 0x1f12080000 _partition_desc_base = 0x1f12000000 # ROM for OBP/Reset/Hypervisor - rom = Param.PhysicalMemory( - PhysicalMemory(range=AddrRange(_rom_base, size='8MB')), + rom = Param.SimpleMemory( + SimpleMemory(range=AddrRange(_rom_base, size='8MB')), "Memory to hold the ROM data") # nvram - nvram = Param.PhysicalMemory( - PhysicalMemory(range=AddrRange(_nvram_base, size='8kB')), + nvram = Param.SimpleMemory( + SimpleMemory(range=AddrRange(_nvram_base, size='8kB')), "Memory to hold the nvram data") # hypervisor description - hypervisor_desc = Param.PhysicalMemory( - PhysicalMemory(range=AddrRange(_hypervisor_desc_base, size='8kB')), + hypervisor_desc = Param.SimpleMemory( + SimpleMemory(range=AddrRange(_hypervisor_desc_base, size='8kB')), "Memory to hold the hypervisor description") # partition description - partition_desc = Param.PhysicalMemory( - PhysicalMemory(range=AddrRange(_partition_desc_base, size='8kB')), + partition_desc = Param.SimpleMemory( + SimpleMemory(range=AddrRange(_partition_desc_base, size='8kB')), "Memory to hold the partition description") reset_addr = Param.Addr(_rom_base, "Address to load ROM at") diff --git a/src/arch/sparc/remote_gdb.hh b/src/arch/sparc/remote_gdb.hh index 6ada8bdca..0176fd323 100644 --- a/src/arch/sparc/remote_gdb.hh +++ b/src/arch/sparc/remote_gdb.hh @@ -40,7 +40,6 @@ class System; class ThreadContext; -class PhysicalMemory; namespace SparcISA { |