Cross Reference: /gem5/src/arch/arm/insts/misc.cc

Deleted Added

sdiff udiff text old ( 13895:5762b3dc79c6 ) new ( 13999:a26c2e234a80 )

full compact

342,347c342
< uint32_t cpsr = xc->readMiscReg(MISCREG_CPSR);
< uint32_t hcr = xc->readMiscReg(MISCREG_HCR);
< uint32_t scr = xc->readMiscReg(MISCREG_SCR);
< uint32_t hdcr = xc->readMiscReg(MISCREG_HDCR);
< uint32_t hstr = xc->readMiscReg(MISCREG_HSTR);
< uint32_t hcptr = xc->readMiscReg(MISCREG_HCPTR);
---
> bool hypTrap = mcrMrc15TrapToHyp(miscReg, xc->tcBase(), iss);
349,350d343
< bool hypTrap = mcrMrc15TrapToHyp(miscReg, hcr, cpsr, scr, hdcr, hstr,
< hcptr, iss);
374,379c367
< uint32_t cpsr = xc->readMiscReg(MISCREG_CPSR);
< uint32_t hcr = xc->readMiscReg(MISCREG_HCR);
< uint32_t scr = xc->readMiscReg(MISCREG_SCR);
< uint32_t hdcr = xc->readMiscReg(MISCREG_HDCR);
< uint32_t hstr = xc->readMiscReg(MISCREG_HSTR);
< uint32_t hcptr = xc->readMiscReg(MISCREG_HCPTR);
---
> bool hypTrap = mcrMrc15TrapToHyp(miscReg, xc->tcBase(), iss);
381,382d368
< bool hypTrap = mcrMrc15TrapToHyp(miscReg, hcr, cpsr, scr, hdcr, hstr,
< hcptr, iss);