diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-06-12 17:19:14 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-06-12 17:19:14 +0000 |
| commit | 02732929e8a69fcdda523ebc7aa511d4cdbb0f0e (patch) | |
| tree | 0c4f8c8327b69c0191da08d8ca8ee24b20f37e19 /src/cpu/static_inst.cc | |
| parent | 1a3e668446e4b2d2c61651c9ae58e643c2aa3ad2 (diff) | |
| parent | 0d8d3f988f835e58e5e53b6ee2be871e7bff9132 (diff) | |
| download | gem5-02732929e8a69fcdda523ebc7aa511d4cdbb0f0e.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : 1d2efac895a1c8328026a079e0b319a436325616
Diffstat (limited to 'src/cpu/static_inst.cc')
| -rw-r--r-- | src/cpu/static_inst.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/static_inst.cc b/src/cpu/static_inst.cc index 64fcc0580..a5580d707 100644 --- a/src/cpu/static_inst.cc +++ b/src/cpu/static_inst.cc @@ -76,9 +76,9 @@ StaticInst::hasBranchTarget(Addr pc, ThreadContext *tc, Addr &tgt) const } StaticInstPtr -StaticInst::fetchMicroOp(MicroPC micropc) +StaticInst::fetchMicroop(MicroPC micropc) { - panic("StaticInst::fetchMicroOp() called on instruction " + panic("StaticInst::fetchMicroop() called on instruction " "that is not microcoded."); } |