summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-02-15 15:24:19 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-02-15 15:24:19 -0500
commitb2fd2a813d75815ed2ceaa447590986a29ee99b8 (patch)
tree8dff07dfe488b3454370b250300f62470910351c
parent6bc3e601a6dce316bd7fbc65f7a58a162f2e3963 (diff)
parente8cd54e805e9db51d184bb07b104a7e807926cec (diff)
downloadgem5-b2fd2a813d75815ed2ceaa447590986a29ee99b8.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : f9fd4df544144a691bb5956e3f84036a61822547
-rw-r--r--src/arch/sparc/remote_gdb.cc32
-rw-r--r--src/arch/sparc/remote_gdb.hh13
2 files changed, 30 insertions, 15 deletions
diff --git a/src/arch/sparc/remote_gdb.cc b/src/arch/sparc/remote_gdb.cc
index 21c4a468c..2221576a3 100644
--- a/src/arch/sparc/remote_gdb.cc
+++ b/src/arch/sparc/remote_gdb.cc
@@ -138,7 +138,7 @@ using namespace std;
using namespace TheISA;
RemoteGDB::RemoteGDB(System *_system, ThreadContext *c)
- : BaseRemoteGDB(_system, c, NumGDBRegs)
+ : BaseRemoteGDB(_system, c, NumGDBRegs), nextBkpt(0)
{}
///////////////////////////////////////////////////////////
@@ -165,10 +165,27 @@ RemoteGDB::getregs()
{
memset(gdbregs.regs, 0, gdbregs.size);
- gdbregs.regs[RegPc] = context->readPC();
- gdbregs.regs[RegNpc] = context->readNextPC();
+ if (context->readMiscRegWithEffect(MISCREG_PSTATE) &
+ PSTATE::am)
+ panic("In 32bit mode\n");
+
+ gdbregs.regs[RegPc] = htobe(context->readPC());
+ gdbregs.regs[RegNpc] = htobe(context->readNextPC());
for(int x = RegG0; x <= RegI0 + 7; x++)
- gdbregs.regs[x] = context->readIntReg(x - RegG0);
+ gdbregs.regs[x] = htobe(context->readIntReg(x - RegG0));
+
+ gdbregs.regs[RegFsr] = htobe(context->readMiscRegWithEffect(MISCREG_FSR));
+ gdbregs.regs[RegFprs] = htobe(context->readMiscRegWithEffect(MISCREG_FPRS));
+ gdbregs.regs[RegY] = htobe(context->readIntReg(NumIntArchRegs + 1));
+ gdbregs.regs[RegState] = htobe(
+ context->readMiscRegWithEffect(MISCREG_CWP) |
+ context->readMiscRegWithEffect(MISCREG_PSTATE) << 8 |
+ context->readMiscRegWithEffect(MISCREG_ASI) << 24 |
+ context->readIntReg(NumIntArchRegs + 2) << 32);
+
+
+ DPRINTF(GDBRead, "PC=%#x\n", gdbregs.regs[RegPc]);
+
//Floating point registers are left at 0 in netbsd
//All registers other than the pc, npc and int regs
//are ignored as well.
@@ -193,12 +210,13 @@ RemoteGDB::setregs()
void
RemoteGDB::clearSingleStep()
{
- warn("SPARC single stepping not implemented, "
- "but clearSingleStep called\n");
+ if (nextBkpt)
+ clearTempBreakpoint(nextBkpt);
}
void
RemoteGDB::setSingleStep()
{
- panic("SPARC single stepping not implemented.\n");
+ nextBkpt = context->readNextPC();
+ setTempBreakpoint(nextBkpt);
}
diff --git a/src/arch/sparc/remote_gdb.hh b/src/arch/sparc/remote_gdb.hh
index e4b66b783..17ad7a8e6 100644
--- a/src/arch/sparc/remote_gdb.hh
+++ b/src/arch/sparc/remote_gdb.hh
@@ -50,14 +50,9 @@ namespace SparcISA
enum RegisterConstants
{
RegG0 = 0, RegO0 = 8, RegL0 = 16, RegI0 = 24,
- RegF0 = 32, RegF32 = 64,
- RegPc = 80, RegNpc, RegCcr, RegFsr, RegFprs, RegY, RegAsi,
- RegVer, RegTick, RegPil, RegPstate,
- RegTstate, RegTba, RegTl, RegTt, RegTpc, RegTnpc, RegWstate,
- RegCwp, RegCansave, RegCanrestore, RegCleanwin, RegOtherwin,
- RegAsr16 = 103,
- RegIcc = 119, RegXcc,
- RegFcc0 = 121,
+ RegF0 = 32,
+ RegPc = 64, RegNpc, RegState, RegFsr, RegFprs, RegY,
+ /*RegState contains data in same format as tstate */
NumGDBRegs
};
@@ -72,6 +67,8 @@ namespace SparcISA
void clearSingleStep();
void setSingleStep();
+
+ Addr nextBkpt;
};
}