Hardware
/
VexRiscv
mirror of https://github.com/SpinalHDL/VexRiscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

implement #176 DebugPlugin.allowEBreak is now disabled until the debug bus is used.

This commit is contained in:
Dolu1990 2021-04-20 23:23:18 +02:00
parent 4e41654a84
commit bfe65da1eb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/vexriscv/plugin/DebugPlugin.scala
View File

@ -226,6 +226,9 @@ class DebugPlugin(var debugClockDomain : ClockDomain, hardwareBreakpointCount :
val isPipBusy = RegNext(stages.map(_.arbitration.isValid).orR || iBusFetcher.incoming()) val isPipBusy = RegNext(stages.map(_.arbitration.isValid).orR || iBusFetcher.incoming())
val godmode = RegInit(False) setWhen(haltIt && !isPipBusy) val godmode = RegInit(False) setWhen(haltIt && !isPipBusy)
val haltedByBreak = RegInit(False) val haltedByBreak = RegInit(False)
val allowEBreak = RegInit(False) setWhen(io.bus.cmd.valid)
// val allowEBreak = if(!pipeline.serviceExist(classOf[PrivilegeService])) True else pipeline.service(classOf[PrivilegeService]).isMachine()
val hardwareBreakpoints = Vec(Reg(new Bundle{ val hardwareBreakpoints = Vec(Reg(new Bundle{
val valid = Bool() val valid = Bool()
@ -277,8 +280,6 @@ class DebugPlugin(var debugClockDomain : ClockDomain, hardwareBreakpointCount :
} }
} }
val allowEBreak = if(!pipeline.serviceExist(classOf[PrivilegeService])) True else pipeline.service(classOf[PrivilegeService]).isMachine()
decode.insert(DO_EBREAK) := !haltIt && (decode.input(IS_EBREAK) || hardwareBreakpoints.map(hb => hb.valid && hb.pc === (decode.input(PC) >> 1)).foldLeft(False)(_ || _)) && allowEBreak decode.insert(DO_EBREAK) := !haltIt && (decode.input(IS_EBREAK) || hardwareBreakpoints.map(hb => hb.valid && hb.pc === (decode.input(PC) >> 1)).foldLeft(False)(_ || _)) && allowEBreak
when(execute.arbitration.isValid && execute.input(DO_EBREAK)){ when(execute.arbitration.isValid && execute.input(DO_EBREAK)){
execute.arbitration.haltByOther := True execute.arbitration.haltByOther := True

5
src/test/cpp/regression/main.cpp
View File

@ -2824,13 +2824,16 @@ public:
socklen_t addr_size; socklen_t addr_size;
char buffer[1024]; char buffer[1024];
uint32_t timeSpacer = 0; uint32_t timeSpacer = 0;
bool taskValid = false; bool taskValid;
DebugPluginTask task; DebugPluginTask task;
DebugPlugin(Workspace* ws){ DebugPlugin(Workspace* ws){
this->ws = ws; this->ws = ws;
this->top = ws->top; this->top = ws->top;
taskValid = true; //true as a Workaround to enable the ebreak
task.wr = false;
task.address = 0;
#ifdef DEBUG_PLUGIN_EXTERNAL #ifdef DEBUG_PLUGIN_EXTERNAL
ws->mTimeCmp = ~0; ws->mTimeCmp = ~0;