summaryrefslogtreecommitdiff
path: root/src/cpu/simple
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-01-26 18:50:28 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-01-26 18:50:28 -0500
commit6d9d0c68b574ceba53fc36d34b83f7109e00b1d0 (patch)
tree8004fcb5879cd81d738bd750441fbc900208e049 /src/cpu/simple
parentc215d54aac6925cf13079d8d8fe3691451a77ce1 (diff)
parentfd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f (diff)
downloadgem5-6d9d0c68b574ceba53fc36d34b83f7109e00b1d0.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.suncc --HG-- extra : convert_revision : 1706f6218abec7eb575dcff3ad4aef83894f64ab
Diffstat (limited to 'src/cpu/simple')
-rw-r--r--src/cpu/simple/base.hh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpu/simple/base.hh b/src/cpu/simple/base.hh
index c39bfa9cd..31fd00977 100644
--- a/src/cpu/simple/base.hh
+++ b/src/cpu/simple/base.hh
@@ -186,7 +186,8 @@ class BaseSimpleCPU : public BaseCPU
// These functions are only used in CPU models that split
// effective address computation from the actual memory access.
void setEA(Addr EA) { panic("BaseSimpleCPU::setEA() not implemented\n"); }
- Addr getEA() { panic("BaseSimpleCPU::getEA() not implemented\n"); }
+ Addr getEA() { panic("BaseSimpleCPU::getEA() not implemented\n");
+ M5_DUMMY_RETURN}
void prefetch(Addr addr, unsigned flags)
{