6d8d6d15cd
arch/isa_parser.py: Expanded the capability of the InstObjParams constructor to allow adding in extra keys for use in templates. These are added as key, value tuples as optional arguements. arch/sparc/isa/base.isa: arch/sparc/isa/formats/mem.isa: arch/sparc/isa/formats/priv.isa: The genCompositeIop function is no longer needed, as this functionality is now in the InstObjParams constructor. arch/sparc/isa/decoder.isa: Fixed up alot of instructions, and fixed indentation. arch/sparc/isa/formats/integerop.isa: The genCompositeIop function is no longer needed, as this functionality is now in the InstObjParams constructor. Also changed the immediate values to be signed. base/traceflags.py: Added SPARC traceflag configs/test/hello_sparc: Recompiled without -mflat cpu/cpu_exec_context.cc: Used the regfile clear function rather than memsetting to 0. --HG-- extra : convert_revision : b9da6f264f3ebc4ce1815008dfff7f476b247ee9
164 lines
4.9 KiB
Text
164 lines
4.9 KiB
Text
////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Mem instructions
|
|
//
|
|
|
|
output header {{
|
|
/**
|
|
* Base class for memory operations.
|
|
*/
|
|
class Mem : public SparcStaticInst
|
|
{
|
|
protected:
|
|
|
|
// Constructor
|
|
Mem(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
|
|
SparcStaticInst(mnem, _machInst, __opClass)
|
|
{
|
|
}
|
|
|
|
std::string generateDisassembly(Addr pc,
|
|
const SymbolTable *symtab) const;
|
|
};
|
|
|
|
/**
|
|
* Class for memory operations which use an immediate offset.
|
|
*/
|
|
class MemImm : public Mem
|
|
{
|
|
protected:
|
|
|
|
// Constructor
|
|
MemImm(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
|
|
Mem(mnem, _machInst, __opClass), imm(SIMM13)
|
|
{
|
|
}
|
|
|
|
std::string generateDisassembly(Addr pc,
|
|
const SymbolTable *symtab) const;
|
|
|
|
int32_t imm;
|
|
};
|
|
}};
|
|
|
|
output decoder {{
|
|
std::string Mem::generateDisassembly(Addr pc,
|
|
const SymbolTable *symtab) const
|
|
{
|
|
std::stringstream response;
|
|
bool load = flags[IsLoad];
|
|
|
|
printMnemonic(response, mnemonic);
|
|
if(!load)
|
|
{
|
|
printReg(response, _srcRegIdx[0]);
|
|
ccprintf(response, ", ");
|
|
}
|
|
ccprintf(response, "[ ");
|
|
printReg(response, _srcRegIdx[load ? 0 : 1]);
|
|
ccprintf(response, " + ");
|
|
printReg(response, _srcRegIdx[load ? 1 : 2]);
|
|
ccprintf(response, " ]");
|
|
if(load)
|
|
{
|
|
ccprintf(response, ", ");
|
|
printReg(response, _destRegIdx[0]);
|
|
}
|
|
|
|
return response.str();
|
|
}
|
|
|
|
std::string MemImm::generateDisassembly(Addr pc,
|
|
const SymbolTable *symtab) const
|
|
{
|
|
std::stringstream response;
|
|
bool load = flags[IsLoad];
|
|
|
|
printMnemonic(response, mnemonic);
|
|
if(!load)
|
|
{
|
|
printReg(response, _srcRegIdx[0]);
|
|
ccprintf(response, ", ");
|
|
}
|
|
ccprintf(response, "[ ");
|
|
printReg(response, _srcRegIdx[load ? 0 : 1]);
|
|
ccprintf(response, " + 0x%x ]", imm);
|
|
if(load)
|
|
{
|
|
ccprintf(response, ", ");
|
|
printReg(response, _destRegIdx[0]);
|
|
}
|
|
|
|
return response.str();
|
|
}
|
|
}};
|
|
|
|
def template MemExecute {{
|
|
Fault %(class_name)s::execute(%(CPU_exec_context)s *xc,
|
|
Trace::InstRecord *traceData) const
|
|
{
|
|
Fault fault = NoFault;
|
|
Addr EA;
|
|
%(op_decl)s;
|
|
%(op_rd)s;
|
|
%(ea_code)s;
|
|
%(load)s;
|
|
%(code)s;
|
|
%(store)s;
|
|
|
|
if(fault == NoFault)
|
|
{
|
|
//Write the resulting state to the execution context
|
|
%(op_wb)s;
|
|
}
|
|
|
|
return fault;
|
|
}
|
|
}};
|
|
|
|
let {{
|
|
# Leave memAccessFlags at 0 for now
|
|
loadString = "xc->read(EA, (uint%(width)s_t&)Mem, 0);"
|
|
storeString = "uint64_t write_result = 0; \
|
|
xc->write((uint%(width)s_t)Mem, EA, 0, &write_result);"
|
|
|
|
def doMemFormat(code, load, store, name, Name, opt_flags):
|
|
addrCalcReg = 'EA = Rs1 + Rs2;'
|
|
addrCalcImm = 'EA = Rs1 + SIMM13;'
|
|
iop = InstObjParams(name, Name, 'Mem', code,
|
|
opt_flags, ("ea_code", addrCalcReg),
|
|
("load", load), ("store", store))
|
|
iop_imm = InstObjParams(name, Name + 'Imm', 'MemImm', code,
|
|
opt_flags, ("ea_code", addrCalcImm),
|
|
("load", load), ("store", store))
|
|
header_output = BasicDeclare.subst(iop) + BasicDeclare.subst(iop_imm)
|
|
decoder_output = BasicConstructor.subst(iop) + BasicConstructor.subst(iop_imm)
|
|
decode_block = ROrImmDecode.subst(iop)
|
|
exec_output = MemExecute.subst(iop) + MemExecute.subst(iop_imm)
|
|
return (header_output, decoder_output, exec_output, decode_block)
|
|
}};
|
|
|
|
def format Load(code, width, *opt_flags) {{
|
|
(header_output,
|
|
decoder_output,
|
|
exec_output,
|
|
decode_block) = doMemFormat(code,
|
|
loadString % {"width":width}, '', name, Name, opt_flags)
|
|
}};
|
|
|
|
def format Store(code, width, *opt_flags) {{
|
|
(header_output,
|
|
decoder_output,
|
|
exec_output,
|
|
decode_block) = doMemFormat(code, '',
|
|
storeString % {"width":width}, name, Name, opt_flags)
|
|
}};
|
|
|
|
def format LoadStore(code, width, *opt_flags) {{
|
|
(header_output,
|
|
decoder_output,
|
|
exec_output,
|
|
decode_block) = doMemFormat(code,
|
|
loadString % {"width":width}, storeString % {"width":width},
|
|
name, Name, opt_flags)
|
|
}};
|