diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-24 18:45:28 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-24 18:45:28 -0500 |
| commit | e66f521d5be35683fc9460b2c4d6b7fb35fad940 (patch) | |
| tree | e290f340b7c1d5d999ee61ca3a4db008ecdc7517 /cpu/static_inst.hh | |
| parent | 802fd04f640b34d713f7ef75142e51d3d82559b9 (diff) | |
| parent | 7a37037358ae5800d0f6a40130929669d836fe70 (diff) | |
| download | gem5-e66f521d5be35683fc9460b2c4d6b7fb35fad940.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
SConscript:
arch/alpha/ev5.cc:
dev/alpha_console.cc:
Hand merged
--HG--
extra : convert_revision : 318a671e6803400d3ed086a90e70d6790e4f6b19
Diffstat (limited to 'cpu/static_inst.hh')
| -rw-r--r-- | cpu/static_inst.hh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpu/static_inst.hh b/cpu/static_inst.hh index db9e73714..5566f2f6d 100644 --- a/cpu/static_inst.hh +++ b/cpu/static_inst.hh @@ -316,7 +316,11 @@ class StaticInst : public StaticInstBase delete cachedDisassembly; } -#include "static_inst_impl.hh" +/** + * The execute() signatures are auto-generated by scons based on the + * set of CPU models we are compiling in today. + */ +#include "cpu/static_inst_exec_sigs.hh" /** * Return the target address for a PC-relative branch. |