diff options
Diffstat (limited to 'src/arch/alpha')
-rw-r--r-- | src/arch/alpha/isa/branch.isa | 13 | ||||
-rw-r--r-- | src/arch/alpha/isa/fp.isa | 4 | ||||
-rw-r--r-- | src/arch/alpha/isa/int.isa | 4 | ||||
-rw-r--r-- | src/arch/alpha/isa/main.isa | 18 | ||||
-rw-r--r-- | src/arch/alpha/isa/mem.isa | 15 | ||||
-rw-r--r-- | src/arch/alpha/isa/opcdec.isa | 6 | ||||
-rw-r--r-- | src/arch/alpha/isa/pal.isa | 16 | ||||
-rw-r--r-- | src/arch/alpha/isa/unimp.isa | 18 |
8 files changed, 48 insertions, 46 deletions
diff --git a/src/arch/alpha/isa/branch.isa b/src/arch/alpha/isa/branch.isa index a43efff9c..8f641a4b4 100644 --- a/src/arch/alpha/isa/branch.isa +++ b/src/arch/alpha/isa/branch.isa @@ -81,13 +81,14 @@ output header {{ { } - AlphaISA::PCState branchTarget(const AlphaISA::PCState &branchPC) const; + AlphaISA::PCState branchTarget( + const AlphaISA::PCState &branchPC) const override; /// Explicitly import the otherwise hidden branchTarget using StaticInst::branchTarget; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -109,13 +110,13 @@ output header {{ { } - AlphaISA::PCState branchTarget(ThreadContext *tc) const; + AlphaISA::PCState branchTarget(ThreadContext *tc) const override; /// Explicitly import the otherwise hidden branchTarget using StaticInst::branchTarget; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; diff --git a/src/arch/alpha/isa/fp.isa b/src/arch/alpha/isa/fp.isa index 36bfde2dd..6e03f4654 100644 --- a/src/arch/alpha/isa/fp.isa +++ b/src/arch/alpha/isa/fp.isa @@ -126,8 +126,8 @@ output header {{ // This differs from the AlphaStaticInst version only in // printing suffixes for non-default rounding & trapping modes. - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; diff --git a/src/arch/alpha/isa/int.isa b/src/arch/alpha/isa/int.isa index 265b3c4a9..612ad5f04 100644 --- a/src/arch/alpha/isa/int.isa +++ b/src/arch/alpha/isa/int.isa @@ -49,8 +49,8 @@ output header {{ { } - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; diff --git a/src/arch/alpha/isa/main.isa b/src/arch/alpha/isa/main.isa index 4f269b373..646286605 100644 --- a/src/arch/alpha/isa/main.isa +++ b/src/arch/alpha/isa/main.isa @@ -232,11 +232,11 @@ output header {{ /// dependence tag number (FP or int). void printReg(std::ostream &os, RegId reg) const; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; void - advancePC(AlphaISA::PCState &pcState) const + advancePC(AlphaISA::PCState &pcState) const override { pcState.advance(); } @@ -263,8 +263,8 @@ output decoder {{ } std::string - AlphaStaticInst::generateDisassembly(Addr pc, - const SymbolTable *symtab) const + AlphaStaticInst::generateDisassembly( + Addr pc, const SymbolTable *symtab) const { std::stringstream ss; @@ -304,7 +304,7 @@ def template BasicDeclare {{ /// Constructor. %(class_name)s(ExtMachInst machInst); - Fault execute(ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; }; }}; @@ -383,10 +383,10 @@ output header {{ ~Nop() { } - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; - Fault execute(ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; }; /// Helper function for decoding nops. Substitute Nop object diff --git a/src/arch/alpha/isa/mem.isa b/src/arch/alpha/isa/mem.isa index 0c8a404f0..3cdab6f47 100644 --- a/src/arch/alpha/isa/mem.isa +++ b/src/arch/alpha/isa/mem.isa @@ -51,8 +51,8 @@ output header {{ { } - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -88,8 +88,8 @@ output header {{ { } - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; @@ -129,9 +129,10 @@ def template LoadStoreDeclare {{ /// Constructor. %(class_name)s(ExtMachInst machInst); - Fault execute(ExecContext *, Trace::InstRecord *) const; - Fault initiateAcc(ExecContext *, Trace::InstRecord *) const; - Fault completeAcc(PacketPtr, ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; + Fault initiateAcc(ExecContext *, Trace::InstRecord *) const override; + Fault completeAcc(PacketPtr, ExecContext *, + Trace::InstRecord *) const override; }; }}; diff --git a/src/arch/alpha/isa/opcdec.isa b/src/arch/alpha/isa/opcdec.isa index 3bd3835a1..ae17d59a7 100644 --- a/src/arch/alpha/isa/opcdec.isa +++ b/src/arch/alpha/isa/opcdec.isa @@ -48,10 +48,10 @@ output header {{ { } - Fault execute(ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; diff --git a/src/arch/alpha/isa/pal.isa b/src/arch/alpha/isa/pal.isa index 3913fa82d..69b8a477b 100644 --- a/src/arch/alpha/isa/pal.isa +++ b/src/arch/alpha/isa/pal.isa @@ -49,8 +49,8 @@ output header {{ { } - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; @@ -93,8 +93,8 @@ output header {{ CallPalBase(const char *mnem, ExtMachInst _machInst, OpClass __opClass); - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; @@ -157,8 +157,8 @@ output header {{ /// Constructor HwLoadStore(const char *mnem, ExtMachInst _machInst, OpClass __opClass); - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; @@ -239,8 +239,8 @@ output header {{ { } - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; diff --git a/src/arch/alpha/isa/unimp.isa b/src/arch/alpha/isa/unimp.isa index 39f177663..e5a773d70 100644 --- a/src/arch/alpha/isa/unimp.isa +++ b/src/arch/alpha/isa/unimp.isa @@ -53,10 +53,10 @@ output header {{ flags[IsNonSpeculative] = true; } - Fault execute(ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; /** @@ -84,10 +84,10 @@ output header {{ flags[IsNonSpeculative] = true; } - Fault execute(ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; @@ -163,10 +163,10 @@ output header {{ flags[IsNonSpeculative] = true; } - Fault execute(ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; + std::string generateDisassembly( + Addr pc, const SymbolTable *symtab) const override; }; }}; |