diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-01-28 14:46:56 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-01-28 14:46:56 -0500 |
| commit | 91ca1b48e29dc8a5edcd57bf03ed9737b5de0661 (patch) | |
| tree | 9a2db053cba40110ae69a2444b061c3d5ea8bdef /src/cpu | |
| parent | 0358ccee23072eef0b6448e3170457037682a452 (diff) | |
| parent | 37795b104d93a48b319074fbef770d88820d554a (diff) | |
| download | gem5-91ca1b48e29dc8a5edcd57bf03ed9737b5de0661.tar.xz | |
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
--HG--
extra : convert_revision : 2398e48722dd71ddf270e93bd7b387078fb30e6b
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/static_inst.hh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh index 5928eea76..416c8ab56 100644 --- a/src/cpu/static_inst.hh +++ b/src/cpu/static_inst.hh @@ -379,6 +379,7 @@ class StaticInst : public StaticInstBase { panic("StaticInst::branchTarget() called on instruction " "that is not a PC-relative branch."); + M5_DUMMY_RETURN } /** @@ -393,6 +394,7 @@ class StaticInst : public StaticInstBase panic("StaticInst::branchTarget() called on instruction " "that is not an indirect branch."); } + M5_DUMMY_RETURN /** * Return true if the instruction is a control transfer, and if so, |