diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2004-06-15 10:48:31 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2004-06-15 10:48:31 -0700 |
| commit | ed534a6c0b23facd1f8aa10481a8bf0c0f9ecac9 (patch) | |
| tree | dc3e78b99e90779c41bf0c94f8150fb2bcac06fe /cpu | |
| parent | 58fe84b6468f8157f096724a506885437d51c044 (diff) | |
| parent | d53c6c168afa7eafdf8c4fa10a10f835db25e3da (diff) | |
| download | gem5-ed534a6c0b23facd1f8aa10481a8bf0c0f9ecac9.tar.xz | |
Merge isabel.reinhardt.house:/z/stever/bk/m5-head
into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : 1af377ff2dbe27f357410ab91a50b06c61f12e83
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/simple_cpu/simple_cpu.hh | 2 | ||||
| -rw-r--r-- | cpu/static_inst.hh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh index 1c6b18d03..545c753f0 100644 --- a/cpu/simple_cpu/simple_cpu.hh +++ b/cpu/simple_cpu/simple_cpu.hh @@ -253,7 +253,7 @@ class SimpleCPU : public BaseCPU // need to do this... } - void writeHint(Addr addr, int size) + void writeHint(Addr addr, int size, unsigned flags) { // need to do this... } diff --git a/cpu/static_inst.hh b/cpu/static_inst.hh index 3eeefb675..68c30df2f 100644 --- a/cpu/static_inst.hh +++ b/cpu/static_inst.hh @@ -72,8 +72,7 @@ class StaticInstBase : public RefCounted /// unconditional branches, memory barriers) or both (e.g., an /// FP/int conversion). /// - If IsMemRef is set, then exactly one of IsLoad or IsStore - /// will be set. Prefetches are marked as IsLoad, even if they - /// prefetch exclusive copies. + /// will be set. /// - If IsControl is set, then exactly one of IsDirectControl or /// IsIndirect Control will be set, and exactly one of /// IsCondControl or IsUncondControl will be set. |