fixes tohost behavior of SC wrapper and cycle-estimate plugin
This commit is contained in:
@ -101,7 +101,7 @@ bool iss::plugin::cycle_estimate::registration(const char* const version, vm_if&
|
||||
|
||||
void iss::plugin::cycle_estimate::callback(instr_info_t instr_info) {
|
||||
size_t instr_id = instr_info.instr_id;
|
||||
auto entry = delays[instr_id];
|
||||
auto& entry = instr_id<delays.size()?delays[instr_id]:illegal_desc;
|
||||
if(instr_info.phase_id==PRE_SYNC) {
|
||||
if(entry.f)
|
||||
current_delay = entry.f(instr_if->get_instr_word());
|
||||
@ -110,5 +110,6 @@ void iss::plugin::cycle_estimate::callback(instr_info_t instr_info) {
|
||||
current_delay = instr_if->is_branch_taken()? entry.taken: entry.not_taken;
|
||||
if(current_delay>1)
|
||||
instr_if->update_last_instr_cycles(current_delay);
|
||||
current_delay = 1;
|
||||
}
|
||||
}
|
||||
|
@ -48,10 +48,10 @@ namespace plugin {
|
||||
|
||||
class cycle_estimate: public vm_plugin {
|
||||
struct instr_desc {
|
||||
size_t size;
|
||||
bool is_branch;
|
||||
unsigned not_taken;
|
||||
unsigned taken;
|
||||
size_t size{0};
|
||||
bool is_branch{false};
|
||||
unsigned not_taken{1};
|
||||
unsigned taken{1};
|
||||
std::function<unsigned(uint64_t)> f;
|
||||
};
|
||||
|
||||
@ -79,6 +79,7 @@ public:
|
||||
private:
|
||||
iss::instrumentation_if *instr_if{nullptr};
|
||||
uint32_t* reg_base_ptr {nullptr};
|
||||
instr_desc illegal_desc{};
|
||||
std::vector<instr_desc> delays;
|
||||
unsigned current_delay{0};
|
||||
struct pair_hash {
|
||||
|
Reference in New Issue
Block a user