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

target-ppc: Use #define for max slb entries 

Instead of opencoding 64 use MAX_SLB_ENTRIES. We don't update the kernel
header here.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Aneesh Kumar K.V 2013-10-01 21:49:31 +05:30 committed by Alexander Graf
parent 2f4d0f5990
commit d83af16786
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target-ppc/cpu.h
View File

@ -405,6 +405,7 @@ struct ppc_slb_t {
uint64_t vsid; uint64_t vsid;
}; };
#define MAX_SLB_ENTRIES 64
#define SEGMENT_SHIFT_256M 28 #define SEGMENT_SHIFT_256M 28
#define SEGMENT_MASK_256M (~((1ULL << SEGMENT_SHIFT_256M) - 1)) #define SEGMENT_MASK_256M (~((1ULL << SEGMENT_SHIFT_256M) - 1))
@ -949,7 +950,7 @@ struct CPUPPCState {
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
/* PowerPC 64 SLB area */ /* PowerPC 64 SLB area */
ppc_slb_t slb[64]; ppc_slb_t slb[MAX_SLB_ENTRIES];
int32_t slb_nr; int32_t slb_nr;
#endif #endif
/* segment registers */ /* segment registers */

4
target-ppc/kvm.c
View File

@ -818,7 +818,7 @@ int kvm_arch_put_registers(CPUState *cs, int level)
/* Sync SLB */ /* Sync SLB */
#ifdef TARGET_PPC64 #ifdef TARGET_PPC64
for (i = 0; i < 64; i++) { for (i = 0; i < ARRAY_SIZE(env->slb); i++) {
sregs.u.s.ppc64.slb[i].slbe = env->slb[i].esid; sregs.u.s.ppc64.slb[i].slbe = env->slb[i].esid;
sregs.u.s.ppc64.slb[i].slbv = env->slb[i].vsid; sregs.u.s.ppc64.slb[i].slbv = env->slb[i].vsid;
} }
@ -1040,7 +1040,7 @@ int kvm_arch_get_registers(CPUState *cs)
* back in. * back in.
*/ */
memset(env->slb, 0, sizeof(env->slb)); memset(env->slb, 0, sizeof(env->slb));
for (i = 0; i < 64; i++) { for (i = 0; i < ARRAY_SIZE(env->slb); i++) {
target_ulong rb = sregs.u.s.ppc64.slb[i].slbe; target_ulong rb = sregs.u.s.ppc64.slb[i].slbe;
target_ulong rs = sregs.u.s.ppc64.slb[i].slbv; target_ulong rs = sregs.u.s.ppc64.slb[i].slbv;
/* /*

2
target-ppc/machine.c
View File

@ -312,7 +312,7 @@ static const VMStateDescription vmstate_slb = {
.minimum_version_id_old = 1, .minimum_version_id_old = 1,
.fields = (VMStateField []) { .fields = (VMStateField []) {
VMSTATE_INT32_EQUAL(env.slb_nr, PowerPCCPU), VMSTATE_INT32_EQUAL(env.slb_nr, PowerPCCPU),
VMSTATE_SLB_ARRAY(env.slb, PowerPCCPU, 64), VMSTATE_SLB_ARRAY(env.slb, PowerPCCPU, MAX_SLB_ENTRIES),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };