fix failing VPI callbacks the vpip_cur_task was left dangling

Johann Klammer · steveicarus · commit c79df7c44b33 · 2017-01-01T17:44:54.000-08:00
diff --git a/vvp/vpi_callback.cc b/vvp/vpi_callback.cc
@@ -316,7 +316,9 @@ void sync_cb::run_run()
       if (cur->cb_data.cb_rtn != 0) {
 	    assert(vpi_mode_flag == VPI_MODE_NONE);
 	    vpi_mode_flag = sync_flag? VPI_MODE_ROSYNC : VPI_MODE_RWSYNC;
+	    vpip_cur_task = dynamic_cast<__vpiSysTaskCall*>(cur->cb_data.obj);
 	    (cur->cb_data.cb_rtn)(&cur->cb_data);
+	    vpip_cur_task = 0;
 	    vpi_mode_flag = VPI_MODE_NONE;
       }
 
diff --git a/vvp/vpi_tasks.cc b/vvp/vpi_tasks.cc
@@ -978,6 +978,7 @@ void vpip_execute_vpi_call(vthread_t thr, vpiHandle ref)
       else if (sysfunc_vec4*func_vec4 = dynamic_cast<sysfunc_vec4*>(ref)) {
 	    vthread_push_vec4(thr, func_vec4->return_value());
       }
+      vpip_cur_task = 0;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,9 @@ void sync_cb::run_run()`
`316`	`316`	`if (cur->cb_data.cb_rtn != 0) {`
`317`	`317`	`assert(vpi_mode_flag == VPI_MODE_NONE);`
`318`	`318`	`vpi_mode_flag = sync_flag? VPI_MODE_ROSYNC : VPI_MODE_RWSYNC;`
	`319`	`+ vpip_cur_task = dynamic_cast<__vpiSysTaskCall*>(cur->cb_data.obj);`
`319`	`320`	`(cur->cb_data.cb_rtn)(&cur->cb_data);`
	`321`	`+ vpip_cur_task = 0;`
`320`	`322`	`vpi_mode_flag = VPI_MODE_NONE;`
`321`	`323`	`}`
`322`	`324`
Original file line number	Diff line number	Diff line change
`@@ -978,6 +978,7 @@ void vpip_execute_vpi_call(vthread_t thr, vpiHandle ref)`
`978`	`978`	`else if (sysfunc_vec4func_vec4 = dynamic_cast<sysfunc_vec4>(ref)) {`
`979`	`979`	`vthread_push_vec4(thr, func_vec4->return_value());`
`980`	`980`	`}`
	`981`	`+ vpip_cur_task = 0;`
`981`	`982`	`}`
`982`	`983`
`983`	`984`	`/*`