diff options
| author | Gabe Black <gabeblack@google.com> | 2018-01-29 15:17:08 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-01-29 23:49:36 +0000 |
| commit | 89f2871168bcd2a69f3edc2e9f12f3bc66101128 (patch) | |
| tree | fe9d4e09989b87e978afc345f217184209a57e93 /src/arch/riscv/isa/formats | |
| parent | cca6459b4fe68593137cb0f3ede7d1415cdbd522 (diff) | |
| download | gem5-89f2871168bcd2a69f3edc2e9f12f3bc66101128.tar.xz | |
riscv: Add overrides to various StaticInst methods.
This makes riscv compile with the version of clang(++) I have on my
workstation.
Change-Id: I0478616810fbc8a715fd61323b7e0f73676c8328
Reviewed-on: https://gem5-review.googlesource.com/7643
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/arch/riscv/isa/formats')
| -rw-r--r-- | src/arch/riscv/isa/formats/amo.isa | 14 | ||||
| -rw-r--r-- | src/arch/riscv/isa/formats/basic.isa | 2 | ||||
| -rw-r--r-- | src/arch/riscv/isa/formats/mem.isa | 7 | ||||
| -rw-r--r-- | src/arch/riscv/isa/formats/standard.isa | 6 |
4 files changed, 16 insertions, 13 deletions
diff --git a/src/arch/riscv/isa/formats/amo.isa b/src/arch/riscv/isa/formats/amo.isa index e3be23749..1dca57191 100644 --- a/src/arch/riscv/isa/formats/amo.isa +++ b/src/arch/riscv/isa/formats/amo.isa @@ -51,10 +51,11 @@ def template AtomicMemOpDeclare {{ // Constructor %(class_name)sLoad(ExtMachInst machInst, %(class_name)s *_p); - Fault execute(ExecContext *, Trace::InstRecord *) const; - Fault initiateAcc(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; + Trace::InstRecord *) const override; }; class %(class_name)sStore : public %(base_class)sMicro @@ -63,10 +64,11 @@ def template AtomicMemOpDeclare {{ // Constructor %(class_name)sStore(ExtMachInst machInst, %(class_name)s *_p); - Fault execute(ExecContext *, Trace::InstRecord *) const; - Fault initiateAcc(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; + Trace::InstRecord *) const override; }; }; }}; diff --git a/src/arch/riscv/isa/formats/basic.isa b/src/arch/riscv/isa/formats/basic.isa index bb8401e3d..dd25ba6f7 100644 --- a/src/arch/riscv/isa/formats/basic.isa +++ b/src/arch/riscv/isa/formats/basic.isa @@ -40,7 +40,7 @@ def template BasicDeclare {{ public: /// Constructor. %(class_name)s(MachInst machInst); - Fault execute(ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; using %(base_class)s::generateDisassembly; }; }}; diff --git a/src/arch/riscv/isa/formats/mem.isa b/src/arch/riscv/isa/formats/mem.isa index d4c17541a..a932d01cc 100644 --- a/src/arch/riscv/isa/formats/mem.isa +++ b/src/arch/riscv/isa/formats/mem.isa @@ -43,9 +43,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/riscv/isa/formats/standard.isa b/src/arch/riscv/isa/formats/standard.isa index ebe157160..2e0e3edd4 100644 --- a/src/arch/riscv/isa/formats/standard.isa +++ b/src/arch/riscv/isa/formats/standard.isa @@ -43,7 +43,7 @@ def template ImmDeclare {{ public: /// Constructor. %(class_name)s(MachInst machInst); - Fault execute(ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const override; }; @@ -99,7 +99,7 @@ def template BranchDeclare {{ public: /// Constructor. %(class_name)s(MachInst machInst); - Fault execute(ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const override; @@ -158,7 +158,7 @@ def template JumpDeclare {{ public: /// Constructor. %(class_name)s(MachInst machInst); - Fault execute(ExecContext *, Trace::InstRecord *) const; + Fault execute(ExecContext *, Trace::InstRecord *) const override; std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const override; |