yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-20 22:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-sparc: use explicit mmu register pointers

Browse source 
Use explicit register pointers while accessing D/I-MMU registers.
Call cpu_unassigned_access on access to missing registers.

Backports commit 20395e63375358bf6dd147057aaf998abf7abdb9 from qemu
This commit is contained in:
Artyom Tarasenko 2018-03-01 20:36:20 -05:00 committed by Lioncash
parent be8357f8b5
commit c1c88e147d
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 58 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/target-sparc/cpu.h
View file

@ -440,6 +440,8 @@ struct CPUSPARCState {
uint64_t sfar; uint64_t sfar;
uint64_t tsb; uint64_t tsb;
uint64_t tag_access; uint64_t tag_access;
uint64_t virtual_watchpoint;
uint64_t physical_watchpoint;
} immu; } immu;
}; };
union { union {
@ -452,6 +454,8 @@ struct CPUSPARCState {
uint64_t sfar; uint64_t sfar;
uint64_t tsb; uint64_t tsb;
uint64_t tag_access; uint64_t tag_access;
uint64_t virtual_watchpoint;
uint64_t physical_watchpoint;
} dmmu; } dmmu;
}; };
SparcTLBEntry itlb[64]; SparcTLBEntry itlb[64];

64
qemu/target-sparc/ldst_helper.c
View file

@ -1231,13 +1231,25 @@ uint64_t helper_ld_asi(CPUSPARCState *env, target_ulong addr,
{ {
int reg = (addr >> 3) & 0xf; int reg = (addr >> 3) & 0xf;
if (reg == 0) { switch (reg) {
/* I-TSB Tag Target register */ case 0:
/* 0x00 I-TSB Tag Target register */
ret = ultrasparc_tag_target(env->immu.tag_access); ret = ultrasparc_tag_target(env->immu.tag_access);
} else { break;
ret = env->immuregs[reg]; case 3: /* SFSR */
ret = env->immu.sfsr;
break;
case 5: /* TSB access */
ret = env->immu.tsb;
break;
case 6:
/* 0x30 I-TSB Tag Access register */
ret = env->immu.tag_access;
break;
default:
cpu_unassigned_access(cs, addr, false, false, 1, size);
ret = 0;
} }
break; break;
} }
case ASI_IMMU_TSB_8KB_PTR: /* I-MMU 8k TSB pointer */ case ASI_IMMU_TSB_8KB_PTR: /* I-MMU 8k TSB pointer */
@ -1274,11 +1286,38 @@ uint64_t helper_ld_asi(CPUSPARCState *env, target_ulong addr,
{ {
int reg = (addr >> 3) & 0xf; int reg = (addr >> 3) & 0xf;
if (reg == 0) { switch (reg) {
/* D-TSB Tag Target register */ case 0:
/* 0x00 D-TSB Tag Target register */
ret = ultrasparc_tag_target(env->dmmu.tag_access); ret = ultrasparc_tag_target(env->dmmu.tag_access);
} else { break;
ret = env->dmmuregs[reg]; case 1: /* 0x08 Primary Context */
ret = env->dmmu.mmu_primary_context;
break;
case 2: /* 0x10 Secondary Context */
ret = env->dmmu.mmu_secondary_context;
break;
case 3: /* SFSR */
ret = env->dmmu.sfsr;
break;
case 4: /* 0x20 SFAR */
ret = env->dmmu.sfar;
break;
case 5: /* 0x28 TSB access */
ret = env->dmmu.tsb;
break;
case 6: /* 0x30 D-TSB Tag Access register */
ret = env->dmmu.tag_access;
break;
case 7:
ret = env->dmmu.virtual_watchpoint;
break;
case 8:
ret = env->dmmu.physical_watchpoint;
break;
default:
cpu_unassigned_access(cs, addr, false, false, 1, size);
ret = 0;
} }
break; break;
} }
@ -1467,6 +1506,7 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val,
case 8: case 8:
return; return;
default: default:
cpu_unassigned_access(cs, addr, true, false, 1, size);
break; break;
} }
@ -1537,9 +1577,13 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val,
env->dmmu.tag_access = val; env->dmmu.tag_access = val;
break; break;
case 7: /* Virtual Watchpoint */ case 7: /* Virtual Watchpoint */
env->dmmu.virtual_watchpoint = val;
break;
case 8: /* Physical Watchpoint */ case 8: /* Physical Watchpoint */
env->dmmu.physical_watchpoint = val;
break;
default: default:
env->dmmuregs[reg] = val; cpu_unassigned_access(cs, addr, true, false, 1, size);
break; break;
} }