diff -r 570a27a1612f -r 8ca660dbac7e src/mem/AbstractMemory.py --- a/src/mem/AbstractMemory.py Mon Sep 10 17:17:27 2012 +0100 +++ b/src/mem/AbstractMemory.py Mon Sep 10 17:17:33 2012 +0100 @@ -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 570a27a1612f -r 8ca660dbac7e src/mem/abstract_mem.cc --- a/src/mem/abstract_mem.cc Mon Sep 10 17:17:27 2012 +0100 +++ b/src/mem/abstract_mem.cc Mon Sep 10 17:17:33 2012 +0100 @@ -75,29 +75,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