88c88,91
< void getThrRegExValues(%(CPU_exec_context)s *xc, unsigned &vpe_conf0, unsigned &tc_bind_mt, unsigned &tc_bind, unsigned &vpe_control, unsigned &mvp_conf0)
---
> void getThrRegExValues(%(CPU_exec_context)s *xc,
> VPEConf0Reg &vpe_conf0, TCBindReg &tc_bind_mt,
> TCBindReg &tc_bind, VPEControlReg &vpe_control,
> MVPConf0Reg &mvp_conf0)
97c100
< void getMTExValues(%(CPU_exec_context)s *xc, unsigned &config3)
---
> void getMTExValues(%(CPU_exec_context)s *xc, Config3Reg &config3)
111c114,118
< unsigned vpe_conf0, tc_bind_mt, tc_bind, vpe_control, mvp_conf0;
---
> VPEConf0Reg vpeConf0;
> TCBindReg tcBindMT;
> TCBindReg tcBind;
> VPEControlReg vpeControl;
> MVPConf0Reg mvpConf0;
113c120,121
< getThrRegExValues(xc, vpe_conf0, tc_bind_mt, tc_bind, vpe_control, mvp_conf0);
---
> getThrRegExValues(xc, vpeConf0, tcBindMT,
> tcBind, vpeControl, mvpConf0);
116,118c124
< if (bits(vpe_conf0, VPEC0_MVP) == 0 &&
< bits(tc_bind_mt, TCB_CUR_VPE_HI, TCB_CUR_VPE_LO) !=
< bits(tc_bind, TCB_CUR_VPE_HI, TCB_CUR_VPE_LO)) {
---
> if (vpeConf0.mvp == 0 && tcBindMT.curVPE != tcBind.curVPE) {
120,121c126
< } else if (bits(vpe_control, VPEC_TARG_TC_HI, VPEC_TARG_TC_LO) >
< bits(mvp_conf0, MVPC0_PTC_HI, MVPC0_PTC_LO)) {
---
> } else if (vpeControl.targTC > mvpConf0.ptc) {
157c162
< unsigned config3;
---
> Config3Reg config3;
162c167
< if (bits(config3, CFG3_MT) == 1) {
---
> if (config3.mt == 1) {