summaryrefslogtreecommitdiff
path: root/src/arch/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/sparc')
-rw-r--r--src/arch/sparc/insts/nop.cc2
-rw-r--r--src/arch/sparc/insts/priv.hh16
-rw-r--r--src/arch/sparc/insts/static_inst.hh5
-rw-r--r--src/arch/sparc/isa/formats/basic.isa6
-rw-r--r--src/arch/sparc/isa/formats/mem/basicmem.isa7
-rw-r--r--src/arch/sparc/isa/formats/mem/blockmem.isa64
6 files changed, 61 insertions, 39 deletions
diff --git a/src/arch/sparc/insts/nop.cc b/src/arch/sparc/insts/nop.cc
index d1257907f..a45df64f4 100644
--- a/src/arch/sparc/insts/nop.cc
+++ b/src/arch/sparc/insts/nop.cc
@@ -57,7 +57,7 @@ output header {{
}
std::string generateDisassembly(Addr pc,
- const SymbolTable *symtab) const;
+ const SymbolTable *symtab) const override;
};
}};
diff --git a/src/arch/sparc/insts/priv.hh b/src/arch/sparc/insts/priv.hh
index 6530d09f8..c4681da07 100644
--- a/src/arch/sparc/insts/priv.hh
+++ b/src/arch/sparc/insts/priv.hh
@@ -46,7 +46,8 @@ class Priv : public SparcStaticInst
{
protected:
using SparcStaticInst::SparcStaticInst;
- std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
+ std::string generateDisassembly(
+ Addr pc, const SymbolTable *symtab) const override;
};
class PrivReg : public Priv
@@ -66,7 +67,8 @@ class RdPriv : public PrivReg
{
protected:
using PrivReg::PrivReg;
- std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
+ std::string generateDisassembly(
+ Addr pc, const SymbolTable *symtab) const override;
};
// This class is for instructions that explicitly write control
@@ -75,7 +77,8 @@ class WrPriv : public PrivReg
{
protected:
using PrivReg::PrivReg;
- std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
+ std::string generateDisassembly(
+ Addr pc, const SymbolTable *symtab) const override;
};
/**
@@ -103,11 +106,12 @@ class WrPrivImm : public PrivImm
PrivImm(mnem, _machInst, __opClass), regName(_regName)
{}
- std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
+ std::string generateDisassembly(
+ Addr pc, const SymbolTable *symtab) const override;
char const *regName;
-}
-;
+};
+
}
#endif //__ARCH_SPARC_INSTS_PRIV_HH__
diff --git a/src/arch/sparc/insts/static_inst.hh b/src/arch/sparc/insts/static_inst.hh
index 9e15c8dab..32930fb9f 100644
--- a/src/arch/sparc/insts/static_inst.hh
+++ b/src/arch/sparc/insts/static_inst.hh
@@ -90,7 +90,8 @@ class SparcStaticInst : public StaticInst
protected:
using StaticInst::StaticInst;
- std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
+ std::string generateDisassembly(
+ Addr pc, const SymbolTable *symtab) const override;
static void printMnemonic(std::ostream &os, const char *mnemonic);
static void printReg(std::ostream &os, RegId reg);
@@ -101,7 +102,7 @@ class SparcStaticInst : public StaticInst
void printRegArray(std::ostream &os,
const RegId indexArray[], int num) const;
- void advancePC(PCState &pcState) const;
+ void advancePC(PCState &pcState) const override;
static bool passesFpCondition(uint32_t fcc, uint32_t condition);
static bool passesCondition(uint32_t codes, uint32_t condition);
diff --git a/src/arch/sparc/isa/formats/basic.isa b/src/arch/sparc/isa/formats/basic.isa
index a6b15388d..7fd6b245c 100644
--- a/src/arch/sparc/isa/formats/basic.isa
+++ b/src/arch/sparc/isa/formats/basic.isa
@@ -38,7 +38,7 @@ class %(class_name)s : public %(base_class)s
public:
// Constructor.
%(class_name)s(ExtMachInst machInst);
- Fault execute(ExecContext *, Trace::InstRecord *) const;
+ Fault execute(ExecContext *, Trace::InstRecord *) const override;
};
}};
@@ -52,7 +52,7 @@ class %(class_name)s : public %(base_class)s
public:
// Constructor.
%(class_name)s(ExtMachInst machInst);
- Fault execute(ExecContext *, Trace::InstRecord *) const;
+ Fault execute(ExecContext *, Trace::InstRecord *) const override;
Fault doFpOp(ExecContext *, Trace::InstRecord *) const M5_NO_INLINE;
};
}};
@@ -67,7 +67,7 @@ class %(class_name)s : public %(base_class)s
public:
// Constructor.
%(class_name)s(const char *mnemonic, ExtMachInst machInst);
- Fault execute(ExecContext *, Trace::InstRecord *) const;
+ Fault execute(ExecContext *, Trace::InstRecord *) const override;
};
}};
diff --git a/src/arch/sparc/isa/formats/mem/basicmem.isa b/src/arch/sparc/isa/formats/mem/basicmem.isa
index bc7d033b6..aff7d4d73 100644
--- a/src/arch/sparc/isa/formats/mem/basicmem.isa
+++ b/src/arch/sparc/isa/formats/mem/basicmem.isa
@@ -45,10 +45,11 @@ def template MemDeclare {{
/// Constructor.
%(class_name)s(ExtMachInst machInst);
- 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/sparc/isa/formats/mem/blockmem.isa b/src/arch/sparc/isa/formats/mem/blockmem.isa
index 05ddc63b3..60a72a69b 100644
--- a/src/arch/sparc/isa/formats/mem/blockmem.isa
+++ b/src/arch/sparc/isa/formats/mem/blockmem.isa
@@ -48,10 +48,12 @@ def template BlockMemDeclare {{
public:
// Constructor
%(class_name)s_0(ExtMachInst machInst);
- 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)s_1 : public %(base_class)sMicro
@@ -59,10 +61,12 @@ def template BlockMemDeclare {{
public:
// Constructor
%(class_name)s_1(ExtMachInst machInst);
- 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)s_2 : public %(base_class)sMicro
@@ -70,10 +74,12 @@ def template BlockMemDeclare {{
public:
// Constructor
%(class_name)s_2(ExtMachInst machInst);
- 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)s_3 : public %(base_class)sMicro
@@ -81,10 +87,12 @@ def template BlockMemDeclare {{
public:
// Constructor
%(class_name)s_3(ExtMachInst machInst);
- 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)s_4 : public %(base_class)sMicro
@@ -92,10 +100,12 @@ def template BlockMemDeclare {{
public:
// Constructor
%(class_name)s_4(ExtMachInst machInst);
- 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)s_5 : public %(base_class)sMicro
@@ -103,10 +113,12 @@ def template BlockMemDeclare {{
public:
// Constructor
%(class_name)s_5(ExtMachInst machInst);
- 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)s_6 : public %(base_class)sMicro
@@ -114,10 +126,12 @@ def template BlockMemDeclare {{
public:
// Constructor
%(class_name)s_6(ExtMachInst machInst);
- 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)s_7 : public %(base_class)sMicro
@@ -125,10 +139,12 @@ def template BlockMemDeclare {{
public:
// Constructor
%(class_name)s_7(ExtMachInst machInst);
- 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;
};
};
}};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 18:12:12 +0000