diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-03-02 10:31:48 -0500 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-03-02 10:31:48 -0500 |
commit | e7f442d5273bec95f3412cdc5a82742fe32f8cf3 (patch) | |
tree | 754efd78eb14fbc59700f4f275efb9a7b29930d2 /mem | |
parent | 0c2c7171a83f772b297016aa7382157f070b3466 (diff) | |
download | gem5-e7f442d5273bec95f3412cdc5a82742fe32f8cf3.tar.xz |
Simple program runs with sendAtomic!
Ignoring returned latency for now.
Refactored loadSections in ObjectFile hierarchy.
base/loader/aout_object.cc:
base/loader/aout_object.hh:
base/loader/ecoff_object.cc:
base/loader/ecoff_object.hh:
base/loader/elf_object.cc:
base/loader/elf_object.hh:
base/loader/object_file.hh:
Have each section record a pointer to image data.
This allows us to move common loadSections code into ObjectFile.
base/loader/object_file.cc:
Have each section record a pointer to image data.
This allows us to move common loadSections code into ObjectFile.
Also explicitly load BSS now since we need to allocate the
translations for it in syscall emulation.
cpu/base.hh:
Don't need memPort (just pass port in to ExecContext constructor).
cpu/exec_context.cc:
cpu/exec_context.hh:
mem/port.cc:
mem/translating_port.cc:
mem/translating_port.hh:
Pass syscall emulation Port into constructor instead of
getting it from BaseCPU.
cpu/simple/cpu.cc:
Explicitly choose one of three timing models.
Statically allocate request and packet objects when possible.
Several more minor bug fixes.
Works for simple program with SIMPLE_CPU_MEM_IMMEDIATE model now.
Probably have memory leaks with SIMPLE_CPU_MEM_TIMING (if it works at all).
Pass syscall emulation Port into constructor instead of
getting it from BaseCPU.
cpu/simple/cpu.hh:
Explicitly choose one of three timing models.
Statically allocate request and packet objects when possible.
Pass syscall emulation Port into constructor instead of
getting it from BaseCPU.
mem/physical.cc:
Set packet result field.
--HG--
extra : convert_revision : 359d0ebe4b4665867f4e26e7394ec0f1d17cfc26
Diffstat (limited to 'mem')
-rw-r--r-- | mem/physical.cc | 2 | ||||
-rw-r--r-- | mem/port.cc | 9 | ||||
-rw-r--r-- | mem/translating_port.cc | 20 | ||||
-rw-r--r-- | mem/translating_port.hh | 3 |
4 files changed, 27 insertions, 7 deletions
diff --git a/mem/physical.cc b/mem/physical.cc index fea4b6ec5..69544c8fe 100644 --- a/mem/physical.cc +++ b/mem/physical.cc @@ -174,6 +174,8 @@ PhysicalMemory::doFunctionalAccess(Packet &pkt) default: panic("unimplemented"); } + + pkt.result = Success; } Port * diff --git a/mem/port.cc b/mem/port.cc index 8c4b3810c..e080f8b81 100644 --- a/mem/port.cc +++ b/mem/port.cc @@ -63,3 +63,12 @@ Port::readBlobFunctional(Addr addr, uint8_t *p, int size) blobHelper(addr, p, size, Read); } +void +Port::memsetBlobFunctional(Addr addr, uint8_t val, int size) +{ + // quick and dirty... + uint8_t *buf = new uint8_t[size]; + + memset(buf, val, size); + blobHelper(addr, buf, size, Write); +} diff --git a/mem/translating_port.cc b/mem/translating_port.cc index e385a74b6..f4f2ca737 100644 --- a/mem/translating_port.cc +++ b/mem/translating_port.cc @@ -83,23 +83,31 @@ TranslatingPort::writeBlobFunctional(Addr addr, uint8_t *p, int size, return No_Fault; } -/* + Fault -TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size) +TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size, + bool alloc) { Addr paddr; for (ChunkGenerator gen(addr, size, VMPageSize); !gen.done(); gen.next()) { - if (!pTable->translate(gen.addr(),paddr)) - return Machine_Check_Fault; + if (!pTable->translate(gen.addr(), paddr)) { + if (alloc) { + pTable->allocate(roundDown(gen.addr(), VMPageSize), + VMPageSize); + pTable->translate(gen.addr(), paddr); + } else { + return Machine_Check_Fault; + } + } - port->memsetBlobFunctional(paddr, val, gen.size()); + port->memsetBlobFunctional(paddr, val, gen.size()); } return No_Fault; } -*/ + Fault TranslatingPort::writeStringFunctional(Addr addr, const char *str) diff --git a/mem/translating_port.hh b/mem/translating_port.hh index 3d77b2c2b..1a334c103 100644 --- a/mem/translating_port.hh +++ b/mem/translating_port.hh @@ -51,7 +51,8 @@ class TranslatingPort Fault readBlobFunctional(Addr addr, uint8_t *p, int size); Fault writeBlobFunctional(Addr addr, uint8_t *p, int size, bool alloc = false); - // Fault memsetBlobFunctional(Addr addr, uint8_t val, int size); + Fault memsetBlobFunctional(Addr addr, uint8_t val, int size, + bool alloc = false); Fault writeStringFunctional(Addr addr, const char *str); Fault readStringFunctional(std::string &str, Addr addr); |