From fff5b8e7451177322edfe2683313b199a0bdc4da Mon Sep 17 00:00:00 2001 From: Gabe Black <gabeblack@google.com> Date: Mon, 17 Aug 2020 23:09:46 -0700 Subject: [PATCH] x86: Fix some style issues in the microcode ROM class. Change-Id: I64fb5efbc9f63298c103816503f4718308032eb4 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32896 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Maintainer: Gabe Black <gabeblack@google.com> Tested-by: kokoro <noreply+kokoro@google.com> --- src/arch/x86/microcode_rom.hh | 67 +++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/src/arch/x86/microcode_rom.hh b/src/arch/x86/microcode_rom.hh index ad7bb99e8..4f7952a23 100644 --- a/src/arch/x86/microcode_rom.hh +++ b/src/arch/x86/microcode_rom.hh @@ -35,41 +35,46 @@ namespace X86ISAInst { - class MicrocodeRom + +class MicrocodeRom +{ + protected: + + typedef StaticInstPtr (*GenFunc)(StaticInstPtr); + + static const MicroPC numMicroops; + + GenFunc *genFuncs; + + public: + //Constructor. + MicrocodeRom(); + + //Destructor. + ~MicrocodeRom() { - protected: - - typedef StaticInstPtr (*GenFunc)(StaticInstPtr); - - static const MicroPC numMicroops; - - GenFunc * genFuncs; - - public: - //Constructor. - MicrocodeRom(); - - //Destructor. - ~MicrocodeRom() - { - delete [] genFuncs; - } - - StaticInstPtr - fetchMicroop(MicroPC microPC, StaticInstPtr curMacroop) - { - microPC = normalMicroPC(microPC); - if (microPC >= numMicroops) - return X86ISA::badMicroop; - else - return genFuncs[microPC](curMacroop); - } - }; -} + delete [] genFuncs; + } + + StaticInstPtr + fetchMicroop(MicroPC microPC, StaticInstPtr curMacroop) + { + microPC = normalMicroPC(microPC); + if (microPC >= numMicroops) + return X86ISA::badMicroop; + else + return genFuncs[microPC](curMacroop); + } +}; + +} // namespace X86ISAInst namespace X86ISA { - using X86ISAInst::MicrocodeRom; + +using X86ISAInst::MicrocodeRom; + } + #endif // __ARCH_X86_MICROCODE_ROM_HH__ -- 2.30.2