ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-sparc: use explicit mmu register pointers 

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

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Artyom Tarasenko 2016-02-08 22:40:34 +01:00
parent c9b459aab8
commit 20395e6337
No known key found for this signature in database
GPG Key ID: 3360C3F7411A125F
2 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/sparc/cpu.h
View File

@ -446,6 +446,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 {
@ -458,6 +460,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];

66
target/sparc/ldst_helper.c
View File

@ -1220,14 +1220,25 @@ uint64_t helper_ld_asi(CPUSPARCState *env, target_ulong addr,
case ASI_IMMU: /* I-MMU regs */ case ASI_IMMU: /* I-MMU regs */
{ {
int reg = (addr >> 3) & 0xf; int reg = (addr >> 3) & 0xf;
switch (reg) {
if (reg == 0) { case 0:
/* I-TSB Tag Target register */ /* 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 */
@ -1263,12 +1274,38 @@ uint64_t helper_ld_asi(CPUSPARCState *env, target_ulong addr,
case ASI_DMMU: /* D-MMU regs */ case ASI_DMMU: /* D-MMU regs */
{ {
int reg = (addr >> 3) & 0xf; int reg = (addr >> 3) & 0xf;
switch (reg) {
if (reg == 0) { case 0:
/* D-TSB Tag Target register */ /* 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;
} }
@ -1456,6 +1493,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;
} }
@ -1526,9 +1564,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;
} }