diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2004-02-05 02:53:03 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2004-02-05 02:53:03 -0500 |
| commit | 4bbe8c1058df973be0bff485d2765a54d149f130 (patch) | |
| tree | 093fb18b600e4c08acee142830799c303426579e /cpu | |
| parent | daa579fc0f3aca4e042068862b022095734b41d9 (diff) | |
| parent | 98948b2e572d10faf1ac91f977837cf2e8a903c3 (diff) | |
| download | gem5-4bbe8c1058df973be0bff485d2765a54d149f130.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/kernel
--HG--
extra : convert_revision : 9ee9b8550b5761fa400df83caf268bd1c8ddc7ed
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/simple_cpu/simple_cpu.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc index 2e4dff280..efbe66020 100644 --- a/cpu/simple_cpu/simple_cpu.cc +++ b/cpu/simple_cpu/simple_cpu.cc @@ -364,32 +364,32 @@ SimpleCPU::read(Addr addr, T &data, unsigned flags) template Fault -SimpleCPU::read(Addr addr, uint64_t& data, unsigned flags); +SimpleCPU::read(Addr addr, uint64_t &data, unsigned flags); template Fault -SimpleCPU::read(Addr addr, uint32_t& data, unsigned flags); +SimpleCPU::read(Addr addr, uint32_t &data, unsigned flags); template Fault -SimpleCPU::read(Addr addr, uint16_t& data, unsigned flags); +SimpleCPU::read(Addr addr, uint16_t &data, unsigned flags); template Fault -SimpleCPU::read(Addr addr, uint8_t& data, unsigned flags); +SimpleCPU::read(Addr addr, uint8_t &data, unsigned flags); #endif //DOXYGEN_SHOULD_SKIP_THIS template<> Fault -SimpleCPU::read(Addr addr, double& data, unsigned flags) +SimpleCPU::read(Addr addr, double &data, unsigned flags) { return read(addr, *(uint64_t*)&data, flags); } template<> Fault -SimpleCPU::read(Addr addr, float& data, unsigned flags) +SimpleCPU::read(Addr addr, float &data, unsigned flags) { return read(addr, *(uint32_t*)&data, flags); } @@ -397,7 +397,7 @@ SimpleCPU::read(Addr addr, float& data, unsigned flags) template<> Fault -SimpleCPU::read(Addr addr, int32_t& data, unsigned flags) +SimpleCPU::read(Addr addr, int32_t &data, unsigned flags) { return read(addr, (uint32_t&)data, flags); } |