diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-02-11 17:54:33 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-02-11 17:54:33 -0500 |
| commit | c4d0ebd25cc5f0657b99543ff2df30d1a86f3ad5 (patch) | |
| tree | f8eb75062055458ed2b2f44e4e87d2089c2debf4 /cpu/beta_cpu/fetch.hh | |
| parent | 1e7a744c09d0bde70e0f83179fdf4d6059585e4b (diff) | |
| download | gem5-c4d0ebd25cc5f0657b99543ff2df30d1a86f3ad5.tar.xz | |
Fix up #defines to use full path; fix up code for g++ 3.4
SConscript:
Remove efence option from automatically being used.
--HG--
extra : convert_revision : 466bb8077aa341db0b409720e2a73535b1fa6b69
Diffstat (limited to 'cpu/beta_cpu/fetch.hh')
| -rw-r--r-- | cpu/beta_cpu/fetch.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpu/beta_cpu/fetch.hh b/cpu/beta_cpu/fetch.hh index 4cfc2f167..7a3893708 100644 --- a/cpu/beta_cpu/fetch.hh +++ b/cpu/beta_cpu/fetch.hh @@ -4,17 +4,17 @@ // Figure out where to advance time buffer. Add a way to get a // stage's current status. -#ifndef __SIMPLE_FETCH_HH__ -#define __SIMPLE_FETCH_HH__ +#ifndef __CPU_BETA_CPU_SIMPLE_FETCH_HH__ +#define __CPU_BETA_CPU_SIMPLE_FETCH_HH__ //Will want to include: time buffer, structs, MemInterface, Event, //whatever class bzero uses, MemReqPtr +#include "base/statistics.hh" #include "base/timebuf.hh" -#include "sim/eventq.hh" #include "cpu/pc_event.hh" #include "mem/mem_interface.hh" -#include "base/statistics.hh" +#include "sim/eventq.hh" /** * SimpleFetch class to fetch a single instruction each cycle. SimpleFetch @@ -207,4 +207,4 @@ class SimpleFetch Stats::Distribution<> fetch_nisn_dist; }; -#endif //__SIMPLE_FETCH_HH__ +#endif //__CPU_BETA_CPU_SIMPLE_FETCH_HH__ |