805b9cf1d5
before getting in a infinite loop. It actually "tries" to syscall too, but syscalls
aren't implemented just yet
arch/mips/faults.cc:
more descriptive names for faults (will help future users as well as me!)
arch/mips/isa/base.isa:
make sure we are printing out "BasicOp" format disassembly instructions as dest,src,src instead of src,src,dest
arch/mips/isa/decoder.isa:
FIX LW/SW Bug!!!! I was actually loading a byte instead of a word
FIX JALR Bug!!!! I was not saving the link address in R31 for this instruction
FIX SLL/NOP Bug!!! We now recognize the varying flavors of sll,nop,ehb,& ssnop correctly
base/loader/elf_object.cc:
change back to original way
base/loader/elf_object.hh:
change back to original!
--HG--
extra : convert_revision : 39b65fba31c1842ac6966346fe8a35816a4231fa
94 lines
2.2 KiB
C++
94 lines
2.2 KiB
C++
// -*- mode:c++ -*-
|
|
|
|
////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Base class for MIPS instructions, and some support functions
|
|
//
|
|
|
|
//Outputs to decoder.hh
|
|
output header {{
|
|
|
|
#define R31 31
|
|
#include "arch/mips/faults.hh"
|
|
#include "arch/mips/isa_traits.hh"
|
|
|
|
using namespace MipsISA;
|
|
|
|
|
|
/**
|
|
* Base class for all MIPS static instructions.
|
|
*/
|
|
class MipsStaticInst : public StaticInst
|
|
{
|
|
protected:
|
|
|
|
/// Make MipsISA register dependence tags directly visible in
|
|
/// this class and derived classes. Maybe these should really
|
|
/// live here and not in the MipsISA namespace.
|
|
/*enum DependenceTags {
|
|
FP_Base_DepTag = MipsISA::FP_Base_DepTag,
|
|
Fpcr_DepTag = MipsISA::Fpcr_DepTag,
|
|
Uniq_DepTag = MipsISA::Uniq_DepTag,
|
|
IPR_Base_DepTag = MipsISA::IPR_Base_DepTag
|
|
};*/
|
|
|
|
// Constructor
|
|
MipsStaticInst(const char *mnem, MachInst _machInst, OpClass __opClass)
|
|
: StaticInst(mnem, _machInst, __opClass)
|
|
{
|
|
}
|
|
|
|
/// Print a register name for disassembly given the unique
|
|
/// dependence tag number (FP or int).
|
|
void printReg(std::ostream &os, int reg) const;
|
|
|
|
std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
|
|
};
|
|
|
|
}};
|
|
|
|
//Ouputs to decoder.cc
|
|
output decoder {{
|
|
|
|
void MipsStaticInst::printReg(std::ostream &os, int reg) const
|
|
{
|
|
if (reg < FP_Base_DepTag) {
|
|
ccprintf(os, "r%d", reg);
|
|
}
|
|
else {
|
|
ccprintf(os, "f%d", reg - FP_Base_DepTag);
|
|
}
|
|
}
|
|
|
|
std::string MipsStaticInst::generateDisassembly(Addr pc, const SymbolTable *symtab) const
|
|
{
|
|
std::stringstream ss;
|
|
|
|
ccprintf(ss, "%-10s ", mnemonic);
|
|
|
|
if(_numDestRegs > 0){
|
|
if(_numSrcRegs > 0)
|
|
ss << ",";
|
|
printReg(ss, _destRegIdx[0]);
|
|
}
|
|
|
|
if(_numSrcRegs > 0) {
|
|
printReg(ss, _srcRegIdx[0]);
|
|
}
|
|
|
|
if(_numSrcRegs > 1) {
|
|
ss << ",";
|
|
printReg(ss, _srcRegIdx[1]);
|
|
}
|
|
|
|
|
|
if(mnemonic == "sll"){
|
|
ccprintf(ss," %d",SA);
|
|
}
|
|
|
|
return ss.str();
|
|
}
|
|
|
|
}};
|
|
|