typedef enum
{
- ACTION_NONE = MCONTROL_ACTION_NONE,
ACTION_DEBUG_EXCEPTION = MCONTROL_ACTION_DEBUG_EXCEPTION,
ACTION_DEBUG_MODE = MCONTROL_ACTION_DEBUG_MODE,
ACTION_TRACE_START = MCONTROL_ACTION_TRACE_START,
typedef struct
{
uint8_t type;
+ bool dmode;
uint8_t maskmax;
bool select;
+ bool timing;
mcontrol_action_t action;
bool chain;
mcontrol_match_t match;
reg_t mip;
reg_t medeleg;
reg_t mideleg;
- reg_t mucounteren;
- reg_t mscounteren;
+ uint32_t mucounteren;
+ uint32_t mscounteren;
reg_t sepc;
reg_t sbadaddr;
reg_t sscratch;
dcsr_t dcsr;
reg_t tselect;
mcontrol_t mcontrol[num_triggers];
- reg_t tdata1[num_triggers];
+ reg_t tdata2[num_triggers];
uint32_t fflags;
uint32_t frm;
// When true, display disassembly of each instruction that's executed.
bool debug;
- void update_slow_path();
+ // When true, take the slow simulation path.
+ bool slow_path();
// Return the index of a trigger that matched, or -1.
inline int trigger_match(trigger_operation_t operation, reg_t address, reg_t data)
if (state.dcsr.cause)
return -1;
- bool chain_ok = false;
+ bool chain_ok = true;
for (unsigned int i = 0; i < state.num_triggers; i++) {
- if (state.mcontrol[i].action == ACTION_NONE ||
- (operation == OPERATION_EXECUTE && !state.mcontrol[i].execute) ||
+ if (!chain_ok) {
+ chain_ok |= !state.mcontrol[i].chain;
+ continue;
+ }
+
+ if ((operation == OPERATION_EXECUTE && !state.mcontrol[i].execute) ||
(operation == OPERATION_STORE && !state.mcontrol[i].store) ||
(operation == OPERATION_LOAD && !state.mcontrol[i].load) ||
(state.prv == PRV_M && !state.mcontrol[i].m) ||
(state.prv == PRV_H && !state.mcontrol[i].h) ||
(state.prv == PRV_S && !state.mcontrol[i].s) ||
(state.prv == PRV_U && !state.mcontrol[i].u)) {
- goto next;
+ continue;
}
reg_t value;
switch (state.mcontrol[i].match) {
case MATCH_EQUAL:
- if (value != state.tdata1[i])
- goto next;
+ if (value != state.tdata2[i])
+ continue;
break;
case MATCH_NAPOT:
{
- reg_t mask = ~((1 << cto(state.tdata1[i])) - 1);
- if ((value & mask) != (state.tdata1[i] & mask))
- goto next;
+ reg_t mask = ~((1 << cto(state.tdata2[i])) - 1);
+ if ((value & mask) != (state.tdata2[i] & mask))
+ continue;
}
break;
case MATCH_GE:
- if (value < state.tdata1[i])
- goto next;
+ if (value < state.tdata2[i])
+ continue;
break;
case MATCH_LT:
- if (value >= state.tdata1[i])
- goto next;
+ if (value >= state.tdata2[i])
+ continue;
break;
case MATCH_MASK_LOW:
{
- reg_t mask = state.tdata1[i] >> (xlen/2);
- if ((value & mask) != (state.tdata1[i] & mask))
- goto next;
+ reg_t mask = state.tdata2[i] >> (xlen/2);
+ if ((value & mask) != (state.tdata2[i] & mask))
+ continue;
}
break;
case MATCH_MASK_HIGH:
{
- reg_t mask = state.tdata1[i] >> (xlen/2);
- if (((value >> (xlen/2)) & mask) != (state.tdata1[i] & mask))
- goto next;
+ reg_t mask = state.tdata2[i] >> (xlen/2);
+ if (((value >> (xlen/2)) & mask) != (state.tdata2[i] & mask))
+ continue;
}
break;
}
- if (state.mcontrol[i].chain && !chain_ok) {
- goto next;
- }
-
- // We got here, so this trigger matches. But if the next trigger has
- // chain set, then we can't perform the action.
- if (i+1 < state.num_triggers && state.mcontrol[i+1].chain) {
- chain_ok = true;
- continue;
- } else {
+ if (!state.mcontrol[i].chain) {
return i;
}
-
-next:
- chain_ok = false;
+ chain_ok = true;
}
return -1;
}
unsigned max_xlen;
unsigned xlen;
reg_t isa;
+ reg_t max_isa;
std::string isa_string;
bool histogram_enabled;
bool halt_on_reset;
- // When true, take the slow simulation path.
- bool slow_path;
std::vector<insn_desc_t> instructions;
std::map<reg_t,uint64_t> pc_histogram;