diff options
| author | Korey Sewell <ksewell@umich.edu> | 2011-02-18 14:35:15 -0500 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2011-02-18 14:35:15 -0500 |
| commit | 66bb732c04ccbe322586501f18423923672f335c (patch) | |
| tree | 32aed408a40b2f908d9a697d8b61815de705730b /src/arch/x86/microcode_rom.hh | |
| parent | ab9c20cc78be49dbfc4bd8a4f479409094254e2a (diff) | |
| parent | e3d8d43b176d3a1eb69a5e5d16469d42292e514a (diff) | |
| download | gem5-66bb732c04ccbe322586501f18423923672f335c.tar.xz | |
m5: merge inorder/release-notes/make_release changes
Diffstat (limited to 'src/arch/x86/microcode_rom.hh')
| -rw-r--r-- | src/arch/x86/microcode_rom.hh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/arch/x86/microcode_rom.hh b/src/arch/x86/microcode_rom.hh index f8ad410ce..84c503bb9 100644 --- a/src/arch/x86/microcode_rom.hh +++ b/src/arch/x86/microcode_rom.hh @@ -32,6 +32,7 @@ #define __ARCH_X86_MICROCODE_ROM_HH__ #include "arch/x86/emulenv.hh" +#include "arch/x86/insts/badmicroop.hh" #include "cpu/static_inst.hh" namespace X86ISAInst @@ -60,8 +61,10 @@ namespace X86ISAInst fetchMicroop(MicroPC microPC, StaticInstPtr curMacroop) { microPC = normalMicroPC(microPC); - assert(microPC < numMicroops); - return genFuncs[microPC](curMacroop); + if (microPC >= numMicroops) + return X86ISA::badMicroop; + else + return genFuncs[microPC](curMacroop); } }; } |