yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-03 14:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

m68k: improve comments on m68k_move_to/from helpers

Browse source 
Add more detailed comments to each case of m68k_move_to/from helpers to list
the supported CPUs for that CR as they were wrong in some cases, and
missing some cpu classes in other cases.

Backports 60d8e96453d090f71027f95e47e5ddbe17f670e3
This commit is contained in:
Lucien Murray-Pitts 2021-03-12 14:38:47 -05:00 committed by Lioncash
parent 32e9e17576
commit c6d5eea686
1 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
qemu/target/m68k/helper.c
View file

@ -56,13 +56,15 @@ void HELPER(cf_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)
void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)
{ {
switch (reg) { switch (reg) {
/* MC680[1234]0 */ /* MC680[12346]0 */
case M68K_CR_SFC: case M68K_CR_SFC:
env->sfc = val & 7; env->sfc = val & 7;
return; return;
/* MC680[12346]0 */
case M68K_CR_DFC: case M68K_CR_DFC:
env->dfc = val & 7; env->dfc = val & 7;
return; return;
/* MC680[12346]0 */
case M68K_CR_VBR: case M68K_CR_VBR:
env->vbr = val; env->vbr = val;
return; return;
@ -79,25 +81,30 @@ void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)
} }
m68k_switch_sp(env); m68k_switch_sp(env);
return; return;
/* MC680[34]0 */ /* MC680[46]0 */
case M68K_CR_TC: case M68K_CR_TC:
env->mmu.tcr = val; env->mmu.tcr = val;
return; return;
/* MC68040 */
case M68K_CR_MMUSR: case M68K_CR_MMUSR:
env->mmu.mmusr = val; env->mmu.mmusr = val;
return; return;
/* MC680[46]0 */
case M68K_CR_SRP: case M68K_CR_SRP:
env->mmu.srp = val; env->mmu.srp = val;
return; return;
case M68K_CR_URP: case M68K_CR_URP:
env->mmu.urp = val; env->mmu.urp = val;
return; return;
/* MC680[46]0 */
case M68K_CR_USP: case M68K_CR_USP:
env->sp[M68K_USP] = val; env->sp[M68K_USP] = val;
return; return;
/* MC680[234]0 */
case M68K_CR_MSP: case M68K_CR_MSP:
env->sp[M68K_SSP] = val; env->sp[M68K_SSP] = val;
return; return;
/* MC680[234]0 */
case M68K_CR_ISP: case M68K_CR_ISP:
env->sp[M68K_ISP] = val; env->sp[M68K_ISP] = val;
return; return;
@ -105,12 +112,15 @@ void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)
case M68K_CR_ITT0: case M68K_CR_ITT0:
env->mmu.ttr[M68K_ITTR0] = val; env->mmu.ttr[M68K_ITTR0] = val;
return; return;
/* MC68040/MC68LC040 */
case M68K_CR_ITT1: case M68K_CR_ITT1:
env->mmu.ttr[M68K_ITTR1] = val; env->mmu.ttr[M68K_ITTR1] = val;
return; return;
/* MC68040/MC68LC040 */
case M68K_CR_DTT0: case M68K_CR_DTT0:
env->mmu.ttr[M68K_DTTR0] = val; env->mmu.ttr[M68K_DTTR0] = val;
return; return;
/* MC68040/MC68LC040 */
case M68K_CR_DTT1: case M68K_CR_DTT1:
env->mmu.ttr[M68K_DTTR1] = val; env->mmu.ttr[M68K_DTTR1] = val;
return; return;
@ -123,39 +133,50 @@ void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)
uint32_t HELPER(m68k_movec_from)(CPUM68KState *env, uint32_t reg) uint32_t HELPER(m68k_movec_from)(CPUM68KState *env, uint32_t reg)
{ {
switch (reg) { switch (reg) {
/* MC680[1234]0 */ /* MC680[12346]0 */
case M68K_CR_SFC: case M68K_CR_SFC:
return env->sfc; return env->sfc;
/* MC680[12346]0 */
case M68K_CR_DFC: case M68K_CR_DFC:
return env->dfc; return env->dfc;
/* MC680[12346]0 */
case M68K_CR_VBR: case M68K_CR_VBR:
return env->vbr; return env->vbr;
/* MC680[234]0 */ /* MC680[2346]0 */
case M68K_CR_CACR: case M68K_CR_CACR:
return env->cacr; return env->cacr;
/* MC680[34]0 */ /* MC680[46]0 */
case M68K_CR_TC: case M68K_CR_TC:
return env->mmu.tcr; return env->mmu.tcr;
/* MC68040 */
case M68K_CR_MMUSR: case M68K_CR_MMUSR:
return env->mmu.mmusr; return env->mmu.mmusr;
/* MC680[46]0 */
case M68K_CR_SRP: case M68K_CR_SRP:
return env->mmu.srp; return env->mmu.srp;
/* MC680[46]0 */
case M68K_CR_USP: case M68K_CR_USP:
return env->sp[M68K_USP]; return env->sp[M68K_USP];
/* MC680[234]0 */
case M68K_CR_MSP: case M68K_CR_MSP:
return env->sp[M68K_SSP]; return env->sp[M68K_SSP];
/* MC680[234]0 */
case M68K_CR_ISP: case M68K_CR_ISP:
return env->sp[M68K_ISP]; return env->sp[M68K_ISP];
/* MC68040/MC68LC040 */ /* MC68040/MC68LC040 */
case M68K_CR_URP: case M68K_CR_URP:
return env->mmu.urp; return env->mmu.urp;
case M68K_CR_ITT0: /* MC68040/MC68LC040 */
case M68K_CR_ITT0: /* MC68EC040 only: M68K_CR_IACR0 */
return env->mmu.ttr[M68K_ITTR0]; return env->mmu.ttr[M68K_ITTR0];
case M68K_CR_ITT1: /* MC68040/MC68LC040 */
case M68K_CR_ITT1: /* MC68EC040 only: M68K_CR_IACR1 */
return env->mmu.ttr[M68K_ITTR1]; return env->mmu.ttr[M68K_ITTR1];
case M68K_CR_DTT0: /* MC68040/MC68LC040 */
case M68K_CR_DTT0: /* MC68EC040 only: M68K_CR_DACR0 */
return env->mmu.ttr[M68K_DTTR0]; return env->mmu.ttr[M68K_DTTR0];
case M68K_CR_DTT1: /* MC68040/MC68LC040 */
case M68K_CR_DTT1: /* MC68EC040 only: M68K_CR_DACR1 */
return env->mmu.ttr[M68K_DTTR1]; return env->mmu.ttr[M68K_DTTR1];
} }
cpu_abort(env_cpu(env), "Unimplemented control register read 0x%x\n", cpu_abort(env_cpu(env), "Unimplemented control register read 0x%x\n",