motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-17 07:02:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/openrisc: Use identical sizes for ITLB and DTLB

Browse source 
The sizes are already the same, however, we can improve things
if they are identical by design.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Stafford Horne <shorne@gmail.com>
This commit is contained in:
Richard Henderson 2018-05-22 20:18:20 -07:00 • committed by Stafford Horne
parent b9bed1b9ab
commit 56c3a14156
4 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
target/openrisc/cpu.h
View file

@ -222,10 +222,8 @@ enum {
/* TLB size */ /* TLB size */
enum { enum {
DTLB_SIZE = 64, TLB_SIZE = 64,
DTLB_MASK = (DTLB_SIZE-1), TLB_MASK = TLB_SIZE - 1,
ITLB_SIZE = 64,
ITLB_MASK = (ITLB_SIZE-1),
}; };
/* TLB prot */ /* TLB prot */
@ -254,8 +252,8 @@ typedef struct OpenRISCTLBEntry {
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
typedef struct CPUOpenRISCTLBContext { typedef struct CPUOpenRISCTLBContext {
OpenRISCTLBEntry itlb[ITLB_SIZE]; OpenRISCTLBEntry itlb[TLB_SIZE];
OpenRISCTLBEntry dtlb[DTLB_SIZE]; OpenRISCTLBEntry dtlb[TLB_SIZE];
int (*cpu_openrisc_map_address_code)(struct OpenRISCCPU *cpu, int (*cpu_openrisc_map_address_code)(struct OpenRISCCPU *cpu,
hwaddr *physical, hwaddr *physical,

4
target/openrisc/machine.c
View file

@ -42,9 +42,9 @@ static const VMStateDescription vmstate_cpu_tlb = {
.minimum_version_id = 1, .minimum_version_id = 1,
.minimum_version_id_old = 1, .minimum_version_id_old = 1,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_STRUCT_ARRAY(itlb, CPUOpenRISCTLBContext, ITLB_SIZE, 0, VMSTATE_STRUCT_ARRAY(itlb, CPUOpenRISCTLBContext, TLB_SIZE, 0,
vmstate_tlb_entry, OpenRISCTLBEntry), vmstate_tlb_entry, OpenRISCTLBEntry),
VMSTATE_STRUCT_ARRAY(dtlb, CPUOpenRISCTLBContext, DTLB_SIZE, 0, VMSTATE_STRUCT_ARRAY(dtlb, CPUOpenRISCTLBContext, TLB_SIZE, 0,
vmstate_tlb_entry, OpenRISCTLBEntry), vmstate_tlb_entry, OpenRISCTLBEntry),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }

4
target/openrisc/mmu.c
View file

@ -41,7 +41,7 @@ static int get_phys_code(OpenRISCCPU *cpu, hwaddr *physical, int *prot,
target_ulong address, int rw, bool supervisor) target_ulong address, int rw, bool supervisor)
{ {
int vpn = address >> TARGET_PAGE_BITS; int vpn = address >> TARGET_PAGE_BITS;
int idx = vpn & ITLB_MASK; int idx = vpn & TLB_MASK;
int right = 0; int right = 0;
uint32_t mr = cpu->env.tlb.itlb[idx].mr; uint32_t mr = cpu->env.tlb.itlb[idx].mr;
uint32_t tr = cpu->env.tlb.itlb[idx].tr; uint32_t tr = cpu->env.tlb.itlb[idx].tr;
@ -74,7 +74,7 @@ static int get_phys_data(OpenRISCCPU *cpu, hwaddr *physical, int *prot,
target_ulong address, int rw, bool supervisor) target_ulong address, int rw, bool supervisor)
{ {
int vpn = address >> TARGET_PAGE_BITS; int vpn = address >> TARGET_PAGE_BITS;
int idx = vpn & DTLB_MASK; int idx = vpn & TLB_MASK;
int right = 0; int right = 0;
uint32_t mr = cpu->env.tlb.dtlb[idx].mr; uint32_t mr = cpu->env.tlb.dtlb[idx].mr;
uint32_t tr = cpu->env.tlb.dtlb[idx].tr; uint32_t tr = cpu->env.tlb.dtlb[idx].tr;

16
target/openrisc/sys_helper.c
View file

@ -80,7 +80,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb)
env->shadow_gpr[idx / 32][idx % 32] = rb; env->shadow_gpr[idx / 32][idx % 32] = rb;
break; break;
case TO_SPR(1, 512) ... TO_SPR(1, 512+DTLB_SIZE-1): /* DTLBW0MR 0-127 */ case TO_SPR(1, 512) ... TO_SPR(1, 512 + TLB_SIZE - 1): /* DTLBW0MR 0-127 */
idx = spr - TO_SPR(1, 512); idx = spr - TO_SPR(1, 512);
mr = env->tlb.dtlb[idx].mr; mr = env->tlb.dtlb[idx].mr;
if (mr & 1) { if (mr & 1) {
@ -91,7 +91,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb)
} }
env->tlb.dtlb[idx].mr = rb; env->tlb.dtlb[idx].mr = rb;
break; break;
case TO_SPR(1, 640) ... TO_SPR(1, 640+DTLB_SIZE-1): /* DTLBW0TR 0-127 */ case TO_SPR(1, 640) ... TO_SPR(1, 640 + TLB_SIZE - 1): /* DTLBW0TR 0-127 */
idx = spr - TO_SPR(1, 640); idx = spr - TO_SPR(1, 640);
env->tlb.dtlb[idx].tr = rb; env->tlb.dtlb[idx].tr = rb;
break; break;
@ -103,7 +103,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb)
case TO_SPR(1, 1408) ... TO_SPR(1, 1535): /* DTLBW3TR 0-127 */ case TO_SPR(1, 1408) ... TO_SPR(1, 1535): /* DTLBW3TR 0-127 */
break; break;
case TO_SPR(2, 512) ... TO_SPR(2, 512+ITLB_SIZE-1): /* ITLBW0MR 0-127 */ case TO_SPR(2, 512) ... TO_SPR(2, 512 + TLB_SIZE - 1): /* ITLBW0MR 0-127 */
idx = spr - TO_SPR(2, 512); idx = spr - TO_SPR(2, 512);
mr = env->tlb.itlb[idx].mr; mr = env->tlb.itlb[idx].mr;
if (mr & 1) { if (mr & 1) {
@ -114,7 +114,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb)
} }
env->tlb.itlb[idx].mr = rb; env->tlb.itlb[idx].mr = rb;
break; break;
case TO_SPR(2, 640) ... TO_SPR(2, 640+ITLB_SIZE-1): /* ITLBW0TR 0-127 */ case TO_SPR(2, 640) ... TO_SPR(2, 640 + TLB_SIZE - 1): /* ITLBW0TR 0-127 */
idx = spr - TO_SPR(2, 640); idx = spr - TO_SPR(2, 640);
env->tlb.itlb[idx].tr = rb; env->tlb.itlb[idx].tr = rb;
break; break;
@ -247,11 +247,11 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, target_ulong rd,
idx = (spr - 1024); idx = (spr - 1024);
return env->shadow_gpr[idx / 32][idx % 32]; return env->shadow_gpr[idx / 32][idx % 32];
case TO_SPR(1, 512) ... TO_SPR(1, 512+DTLB_SIZE-1): /* DTLBW0MR 0-127 */ case TO_SPR(1, 512) ... TO_SPR(1, 512 + TLB_SIZE - 1): /* DTLBW0MR 0-127 */
idx = spr - TO_SPR(1, 512); idx = spr - TO_SPR(1, 512);
return env->tlb.dtlb[idx].mr; return env->tlb.dtlb[idx].mr;
case TO_SPR(1, 640) ... TO_SPR(1, 640+DTLB_SIZE-1): /* DTLBW0TR 0-127 */ case TO_SPR(1, 640) ... TO_SPR(1, 640 + TLB_SIZE - 1): /* DTLBW0TR 0-127 */
idx = spr - TO_SPR(1, 640); idx = spr - TO_SPR(1, 640);
return env->tlb.dtlb[idx].tr; return env->tlb.dtlb[idx].tr;
@ -263,11 +263,11 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, target_ulong rd,
case TO_SPR(1, 1408) ... TO_SPR(1, 1535): /* DTLBW3TR 0-127 */ case TO_SPR(1, 1408) ... TO_SPR(1, 1535): /* DTLBW3TR 0-127 */
break; break;
case TO_SPR(2, 512) ... TO_SPR(2, 512+ITLB_SIZE-1): /* ITLBW0MR 0-127 */ case TO_SPR(2, 512) ... TO_SPR(2, 512 + TLB_SIZE - 1): /* ITLBW0MR 0-127 */
idx = spr - TO_SPR(2, 512); idx = spr - TO_SPR(2, 512);
return env->tlb.itlb[idx].mr; return env->tlb.itlb[idx].mr;
case TO_SPR(2, 640) ... TO_SPR(2, 640+ITLB_SIZE-1): /* ITLBW0TR 0-127 */ case TO_SPR(2, 640) ... TO_SPR(2, 640 + TLB_SIZE - 1): /* ITLBW0TR 0-127 */
idx = spr - TO_SPR(2, 640); idx = spr - TO_SPR(2, 640);
return env->tlb.itlb[idx].tr; return env->tlb.itlb[idx].tr;