36a37
> using namespace std;
67c68
< class HiLoMiscOp: public HiLoOp
---
> class HiLoRsSelOp: public HiLoOp
72c73
< HiLoMiscOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
---
> HiLoRsSelOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
79a81,83
> class HiLoRdSelOp: public HiLoOp
> {
> protected:
80a85,106
> /// Constructor
> HiLoRdSelOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
> HiLoOp(mnem, _machInst, __opClass)
> {
> }
>
> std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
> };
>
> class HiLoRdSelValOp: public HiLoOp
> {
> protected:
>
> /// Constructor
> HiLoRdSelValOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
> HiLoOp(mnem, _machInst, __opClass)
> {
> }
>
> std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
> };
>
108,110c134
< // HiLo<Misc> instruction class execute method template.
< // Mainly to get instruction trace data to print out
< // correctly
---
> // HiLo instruction class execute method template.
124,129d147
< //If there are 2 Destination Registers then
< //concatenate the values for the traceData
< if(traceData && _numDestRegs == 2) {
< uint64_t hilo_final_val = (uint64_t)HI << 32 | LO;
< traceData->setData(hilo_final_val);
< }
134a153,204
> // HiLoRsSel instruction class execute method template.
> def template HiLoRsSelExecute {{
> Fault %(class_name)s::execute(%(CPU_exec_context)s *xc, Trace::InstRecord *traceData) const
> {
> Fault fault = NoFault;
>
> %(op_decl)s;
>
> if( ACSRC > 0 && !isDspEnabled(xc) )
> {
> fault = new DspStateDisabledFault();
> }
> else
> {
> %(op_rd)s;
> %(code)s;
> }
>
> if(fault == NoFault)
> {
> %(op_wb)s;
> }
> return fault;
> }
> }};
>
> // HiLoRdSel instruction class execute method template.
> def template HiLoRdSelExecute {{
> Fault %(class_name)s::execute(%(CPU_exec_context)s *xc, Trace::InstRecord *traceData) const
> {
> Fault fault = NoFault;
>
> %(op_decl)s;
>
> if( ACDST > 0 && !isDspEnabled(xc) )
> {
> fault = new DspStateDisabledFault();
> }
> else
> {
> %(op_rd)s;
> %(code)s;
> }
>
> if(fault == NoFault)
> {
> %(op_wb)s;
> }
> return fault;
> }
> }};
>
184c254
< std::string HiLoMiscOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
---
> std::string HiLoRsSelOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
198a269,298
> std::string HiLoRdSelOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
> {
> std::stringstream ss;
>
> ccprintf(ss, "%-10s ", mnemonic);
>
> if (_numDestRegs > 0 && _destRegIdx[0] < 32) {
> printReg(ss, _destRegIdx[0]);
> } else if (_numSrcRegs > 0 && _srcRegIdx[0] < 32) {
> printReg(ss, _srcRegIdx[0]);
> }
>
> return ss.str();
> }
>
> std::string HiLoRdSelValOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
> {
> std::stringstream ss;
>
> ccprintf(ss, "%-10s ", mnemonic);
>
> if (_numDestRegs > 0 && _destRegIdx[0] < 32) {
> printReg(ss, _destRegIdx[0]);
> } else if (_numSrcRegs > 0 && _srcRegIdx[0] < 32) {
> printReg(ss, _srcRegIdx[0]);
> }
>
> return ss.str();
> }
>
242,246c342,343
< def format HiLoOp(code, *opt_flags) {{
< code += 'HI = val<63:32>;\n'
< code += 'LO = val<31:0>;\n'
<
< iop = InstObjParams(name, Name, 'HiLoOp', code, opt_flags)
---
> def format HiLoRsSelOp(code, *opt_flags) {{
> iop = InstObjParams(name, Name, 'HiLoRsSelOp', code, opt_flags)
250c347
< exec_output = HiLoExecute.subst(iop)
---
> exec_output = HiLoRsSelExecute.subst(iop)
253,254c350,351
< def format HiLoMiscOp(code, *opt_flags) {{
< iop = InstObjParams(name, Name, 'HiLoMiscOp', code, opt_flags)
---
> def format HiLoRdSelOp(code, *opt_flags) {{
> iop = InstObjParams(name, Name, 'HiLoRdSelOp', code, opt_flags)
258c355
< exec_output = BasicExecute.subst(iop)
---
> exec_output = HiLoRdSelExecute.subst(iop)
260a358
> def format HiLoRdSelValOp(code, *opt_flags) {{
261a360,363
> if '.sd' in code:
> code = 'int64_t ' + code
> elif '.ud' in code:
> code = 'uint64_t ' + code
262a365,366
> code += 'HI_RD_SEL = val<63:32>;\n'
> code += 'LO_RD_SEL = val<31:0>;\n'
263a368,373
> iop = InstObjParams(name, Name, 'HiLoRdSelOp', code, opt_flags)
> header_output = BasicDeclare.subst(iop)
> decoder_output = BasicConstructor.subst(iop)
> decode_block = BasicDecode.subst(iop)
> exec_output = HiLoRdSelExecute.subst(iop)
> }};
264a375,381
> def format HiLoOp(code, *opt_flags) {{
> iop = InstObjParams(name, Name, 'HiLoOp', code, opt_flags)
> header_output = BasicDeclare.subst(iop)
> decoder_output = BasicConstructor.subst(iop)
> decode_block = BasicDecode.subst(iop)
> exec_output = HiLoExecute.subst(iop)
> }};