changeset c38988024f1f in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=c38988024f1f
description:
Mem: Remove the file parameter from AbstractMemory
This patch removes the unused file parameter from the
AbstractMemory. The patch serves to make it easier to transition to a
separation of the actual contigious host memory backing store, and the
gem5 memory controllers.
Without the file parameter it becomes easier to hide the creation of
the mmap in the PhysicalMemory, as there are no longer any reasons to
expose the actual contigious ranges to the user.
To the best of my knowledge there is no use of the parameter, so the
change should not affect anyone.
diffstat:
src/mem/AbstractMemory.py | 1 -
src/mem/abstract_mem.cc | 24 ++++--------------------
2 files changed, 4 insertions(+), 21 deletions(-)
diffs (48 lines):
diff -r 5aa4896ed55a -r c38988024f1f src/mem/AbstractMemory.py
--- a/src/mem/AbstractMemory.py Wed Sep 19 06:15:44 2012 -0400
+++ b/src/mem/AbstractMemory.py Wed Sep 19 06:15:46 2012 -0400
@@ -46,7 +46,6 @@
type = 'AbstractMemory'
abstract = True
range = Param.AddrRange(AddrRange('128MB'), "Address range")
- file = Param.String('', "Memory-mapped file")
null = Param.Bool(False, "Do not store data, always return zero")
zero = Param.Bool(False, "Initialize memory with zeros")
diff -r 5aa4896ed55a -r c38988024f1f src/mem/abstract_mem.cc
--- a/src/mem/abstract_mem.cc Wed Sep 19 06:15:44 2012 -0400
+++ b/src/mem/abstract_mem.cc Wed Sep 19 06:15:46 2012 -0400
@@ -76,29 +76,13 @@
if (params()->null)
return;
- if (params()->file == "") {
- int map_flags = MAP_ANON | MAP_PRIVATE;
- pmemAddr = (uint8_t *)mmap(NULL, size(),
- PROT_READ | PROT_WRITE, map_flags, -1, 0);
- } else {
- int map_flags = MAP_PRIVATE;
- int fd = open(params()->file.c_str(), O_RDONLY);
- long _size = lseek(fd, 0, SEEK_END);
- if (_size != range.size()) {
- fatal("Specified size %d does not match file %s %d\n",
- range.size(), params()->file, _size);
- }
- lseek(fd, 0, SEEK_SET);
- pmemAddr = (uint8_t *)mmap(NULL, roundUp(_size, sysconf(_SC_PAGESIZE)),
- PROT_READ | PROT_WRITE, map_flags, fd, 0);
- }
+ int map_flags = MAP_ANON | MAP_PRIVATE;
+ pmemAddr = (uint8_t *)mmap(NULL, size(),
+ PROT_READ | PROT_WRITE, map_flags, -1, 0);
if (pmemAddr == (void *)MAP_FAILED) {
perror("mmap");
- if (params()->file == "")
- fatal("Could not mmap!\n");
- else
- fatal("Could not find file: %s\n", params()->file);
+ fatal("Could not mmap!\n");
}
//If requested, initialize all the memory to 0
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
