diff --git a/src/arch/mips/isa/formats/basic.isa b/src/arch/mips/isa/formats/basic.isa index 17d08ef3b9..765dae2755 100644 --- a/src/arch/mips/isa/formats/basic.isa +++ b/src/arch/mips/isa/formats/basic.isa @@ -35,19 +35,23 @@ def template BasicDeclare {{ */ class %(class_name)s : public %(base_class)s { + private: + %(reg_idx_arr_decl)s; public: - /// Constructor. - %(class_name)s(MachInst machInst); - Fault execute(ExecContext *, - Trace::InstRecord *) const override; + /// Constructor. + %(class_name)s(MachInst machInst); + Fault execute(ExecContext *, + Trace::InstRecord *) const override; }; }}; // Basic instruction class constructor template. def template BasicConstructor {{ - %(class_name)s::%(class_name)s(MachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) + %(class_name)s::%(class_name)s(MachInst machInst) : + %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { - %(constructor)s; + %(set_reg_idx_arr)s; + %(constructor)s; } }}; diff --git a/src/arch/mips/isa/formats/mem.isa b/src/arch/mips/isa/formats/mem.isa index a31485dd6a..ac56803c06 100644 --- a/src/arch/mips/isa/formats/mem.isa +++ b/src/arch/mips/isa/formats/mem.isa @@ -129,8 +129,10 @@ def template LoadStoreDeclare {{ */ class %(class_name)s : public %(base_class)s { - public: + private: + %(reg_idx_arr_decl)s; + public: /// Constructor. %(class_name)s(ExtMachInst machInst); @@ -146,6 +148,7 @@ def template LoadStoreConstructor {{ %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { + %(set_reg_idx_arr)s; %(constructor)s; } }};