diff options
| author | Brad Beckmann <Brad.Beckmann@amd.com> | 2011-02-22 11:16:40 -0800 |
|---|---|---|
| committer | Brad Beckmann <Brad.Beckmann@amd.com> | 2011-02-22 11:16:40 -0800 |
| commit | 63a25a56ccc93c24703fec87f830c833974e7060 (patch) | |
| tree | a0f12244a32eb7da2963ca974ab49a993aee2cfc /src/arch/x86/insts/macroop.hh | |
| parent | 8ea71c3907a411de9c203b45bfd6eab24e3ad849 (diff) | |
| parent | 77eed184f529c4ccbef59ad2018d18ff3fbb54af (diff) | |
| download | gem5-63a25a56ccc93c24703fec87f830c833974e7060.tar.xz | |
m5: merged in hammer fix
Diffstat (limited to 'src/arch/x86/insts/macroop.hh')
| -rw-r--r-- | src/arch/x86/insts/macroop.hh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/arch/x86/insts/macroop.hh b/src/arch/x86/insts/macroop.hh index fcf051a37..4f4176b77 100644 --- a/src/arch/x86/insts/macroop.hh +++ b/src/arch/x86/insts/macroop.hh @@ -41,6 +41,7 @@ #define __ARCH_X86_INSTS_MACROOP_HH__ #include "arch/x86/emulenv.hh" +#include "arch/x86/insts/badmicroop.hh" #include "arch/x86/types.hh" #include "arch/x86/insts/static_inst.hh" @@ -76,8 +77,10 @@ class MacroopBase : public X86StaticInst StaticInstPtr fetchMicroop(MicroPC microPC) const { - assert(microPC < numMicroops); - return microops[microPC]; + if (microPC >= numMicroops) + return badMicroop; + else + return microops[microPC]; } std::string |