mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
PowerPC MMU and exception fixes:
* PowerPC 601 (and probably POWER/POWER2) uses a different BAT format than later PowerPC implementation. * Bugfix in BATs check: must not stop after 4 BATs when more are provided. * Enable POWER 'rac' instruction. * Fix exception prefix for all supported PowerPC implementations. * Fix exceptions, MMU model and bus model for PowerPC 601 & 620. * Enable PowerPC 620 as it could mostly boot a PreP target. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3518 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
j_mayer
parent
f10c315f8f
commit
faadf50e29
5 changed files with 114 additions and 55 deletions
|
|
@ -2246,9 +2246,9 @@ static void init_excp_4xx_real (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_FIT] = 0x00001010;
|
||||
env->excp_vectors[POWERPC_EXCP_WDT] = 0x00001020;
|
||||
env->excp_vectors[POWERPC_EXCP_DEBUG] = 0x00002000;
|
||||
env->excp_prefix = 0x00000000;
|
||||
env->ivor_mask = 0x0000FFF0;
|
||||
env->ivpr_mask = 0xFFFF0000;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
env->ivor_mask = 0x0000FFF0UL;
|
||||
env->ivpr_mask = 0xFFFF0000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2271,9 +2271,9 @@ static void init_excp_4xx_softmmu (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_DTLB] = 0x00001100;
|
||||
env->excp_vectors[POWERPC_EXCP_ITLB] = 0x00001200;
|
||||
env->excp_vectors[POWERPC_EXCP_DEBUG] = 0x00002000;
|
||||
env->excp_prefix = 0x00000000;
|
||||
env->ivor_mask = 0x0000FFF0;
|
||||
env->ivpr_mask = 0xFFFF0000;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
env->ivor_mask = 0x0000FFF0UL;
|
||||
env->ivpr_mask = 0xFFFF0000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2298,9 +2298,9 @@ static void init_excp_BookE (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_DTLB] = 0x00000000;
|
||||
env->excp_vectors[POWERPC_EXCP_ITLB] = 0x00000000;
|
||||
env->excp_vectors[POWERPC_EXCP_DEBUG] = 0x00000000;
|
||||
env->excp_prefix = 0x00000000;
|
||||
env->ivor_mask = 0x0000FFE0;
|
||||
env->ivpr_mask = 0xFFFF0000;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
env->ivor_mask = 0x0000FFE0UL;
|
||||
env->ivpr_mask = 0xFFFF0000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2321,7 +2321,7 @@ static void init_excp_601 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_IO] = 0x00000A00;
|
||||
env->excp_vectors[POWERPC_EXCP_SYSCALL] = 0x00000C00;
|
||||
env->excp_vectors[POWERPC_EXCP_RUNM] = 0x00002000;
|
||||
env->excp_prefix = 0xFFF00000;
|
||||
env->excp_prefix = 0xFFF00000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0x00000100UL;
|
||||
#endif
|
||||
|
|
@ -2349,7 +2349,7 @@ static void init_excp_602 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_SMI] = 0x00001400;
|
||||
env->excp_vectors[POWERPC_EXCP_WDT] = 0x00001500;
|
||||
env->excp_vectors[POWERPC_EXCP_EMUL] = 0x00001600;
|
||||
env->excp_prefix = 0xFFF00000;
|
||||
env->excp_prefix = 0xFFF00000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2374,6 +2374,7 @@ static void init_excp_603 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_DSTLB] = 0x00001200;
|
||||
env->excp_vectors[POWERPC_EXCP_IABR] = 0x00001300;
|
||||
env->excp_vectors[POWERPC_EXCP_SMI] = 0x00001400;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2399,6 +2400,7 @@ static void init_excp_G2 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_DSTLB] = 0x00001200;
|
||||
env->excp_vectors[POWERPC_EXCP_IABR] = 0x00001300;
|
||||
env->excp_vectors[POWERPC_EXCP_SMI] = 0x00001400;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2421,6 +2423,7 @@ static void init_excp_604 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_PERFM] = 0x00000F00;
|
||||
env->excp_vectors[POWERPC_EXCP_IABR] = 0x00001300;
|
||||
env->excp_vectors[POWERPC_EXCP_SMI] = 0x00001400;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2433,7 +2436,9 @@ static void init_excp_620 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_RESET] = 0x00000100;
|
||||
env->excp_vectors[POWERPC_EXCP_MCHECK] = 0x00000200;
|
||||
env->excp_vectors[POWERPC_EXCP_DSI] = 0x00000300;
|
||||
env->excp_vectors[POWERPC_EXCP_DSEG] = 0x00000380;
|
||||
env->excp_vectors[POWERPC_EXCP_ISI] = 0x00000400;
|
||||
env->excp_vectors[POWERPC_EXCP_ISEG] = 0x00000480;
|
||||
env->excp_vectors[POWERPC_EXCP_EXTERNAL] = 0x00000500;
|
||||
env->excp_vectors[POWERPC_EXCP_ALIGN] = 0x00000600;
|
||||
env->excp_vectors[POWERPC_EXCP_PROGRAM] = 0x00000700;
|
||||
|
|
@ -2445,8 +2450,9 @@ static void init_excp_620 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_PERFM] = 0x00000F00;
|
||||
env->excp_vectors[POWERPC_EXCP_IABR] = 0x00001300;
|
||||
env->excp_vectors[POWERPC_EXCP_SMI] = 0x00001400;
|
||||
env->excp_prefix = 0xFFF00000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0x0000000000000100ULL; /* ? */
|
||||
env->hreset_vector = 0x0000000000000100ULL;
|
||||
#endif
|
||||
}
|
||||
#endif /* defined(TARGET_PPC64) */
|
||||
|
|
@ -2468,6 +2474,7 @@ static void init_excp_7x0 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_PERFM] = 0x00000F00;
|
||||
env->excp_vectors[POWERPC_EXCP_IABR] = 0x00001300;
|
||||
env->excp_vectors[POWERPC_EXCP_THERM] = 0x00001700;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2491,6 +2498,7 @@ static void init_excp_750FX (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_IABR] = 0x00001300;
|
||||
env->excp_vectors[POWERPC_EXCP_SMI] = 0x00001400;
|
||||
env->excp_vectors[POWERPC_EXCP_THERM] = 0x00001700;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2517,6 +2525,7 @@ static void init_excp_7x5 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_PERFM] = 0x00000F00;
|
||||
env->excp_vectors[POWERPC_EXCP_IABR] = 0x00001300;
|
||||
env->excp_vectors[POWERPC_EXCP_SMI] = 0x00001400;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2542,6 +2551,7 @@ static void init_excp_7400 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_SMI] = 0x00001400;
|
||||
env->excp_vectors[POWERPC_EXCP_VPUA] = 0x00001600;
|
||||
env->excp_vectors[POWERPC_EXCP_THERM] = 0x00001700;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2569,6 +2579,7 @@ static void init_excp_7450 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_IABR] = 0x00001300;
|
||||
env->excp_vectors[POWERPC_EXCP_SMI] = 0x00001400;
|
||||
env->excp_vectors[POWERPC_EXCP_VPUA] = 0x00001600;
|
||||
env->excp_prefix = 0x00000000UL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0xFFFFFFFCUL;
|
||||
#endif
|
||||
|
|
@ -2600,6 +2611,7 @@ static void init_excp_970 (CPUPPCState *env)
|
|||
env->excp_vectors[POWERPC_EXCP_MAINT] = 0x00001600;
|
||||
env->excp_vectors[POWERPC_EXCP_VPUA] = 0x00001700;
|
||||
env->excp_vectors[POWERPC_EXCP_THERM] = 0x00001800;
|
||||
env->excp_prefix = 0x00000000FFF00000ULL;
|
||||
/* Hardware reset vector */
|
||||
env->hreset_vector = 0x0000000000000100ULL;
|
||||
#endif
|
||||
|
|
@ -3232,7 +3244,7 @@ static void init_proc_e500 (CPUPPCState *env)
|
|||
#define POWERPC_INSNS_601 (POWERPC_INSNS_6xx | PPC_CACHE_DCBZ | \
|
||||
PPC_SEGMENT | PPC_EXTERN | PPC_POWER_BR)
|
||||
#define POWERPC_MSRM_601 (0x000000000000FD70ULL)
|
||||
#define POWERPC_MMU_601 (POWERPC_MMU_32B)
|
||||
//#define POWERPC_MMU_601 (POWERPC_MMU_601)
|
||||
//#define POWERPC_EXCP_601 (POWERPC_EXCP_601)
|
||||
#define POWERPC_INPUT_601 (PPC_FLAGS_INPUT_6xx)
|
||||
#define POWERPC_BFDM_601 (bfd_mach_ppc_601)
|
||||
|
|
@ -3248,7 +3260,7 @@ static void init_proc_601 (CPUPPCState *env)
|
|||
spr_register(env, SPR_HID0, "HID0",
|
||||
SPR_NOACCESS, SPR_NOACCESS,
|
||||
&spr_read_generic, &spr_write_generic,
|
||||
0x00000000);
|
||||
0x80010080);
|
||||
/* XXX : not implemented */
|
||||
spr_register(env, SPR_HID1, "HID1",
|
||||
SPR_NOACCESS, SPR_NOACCESS,
|
||||
|
|
@ -3278,7 +3290,8 @@ static void init_proc_601 (CPUPPCState *env)
|
|||
init_excp_601(env);
|
||||
env->dcache_line_size = 64;
|
||||
env->icache_line_size = 64;
|
||||
/* XXX: TODO: allocate internal IRQ controller */
|
||||
/* Allocate hardware IRQ controller */
|
||||
ppc6xx_irq_init(env);
|
||||
}
|
||||
|
||||
/* PowerPC 602 */
|
||||
|
|
@ -4182,9 +4195,6 @@ static void init_proc_970 (CPUPPCState *env)
|
|||
SPR_NOACCESS, SPR_NOACCESS,
|
||||
&spr_read_generic, &spr_write_generic,
|
||||
0xFFF00000); /* XXX: This is a hack */
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
env->excp_prefix = 0xFFF00000;
|
||||
#endif
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
env->slb_nr = 32;
|
||||
#endif
|
||||
|
|
@ -4259,9 +4269,6 @@ static void init_proc_970FX (CPUPPCState *env)
|
|||
SPR_NOACCESS, SPR_NOACCESS,
|
||||
&spr_read_generic, &spr_write_generic,
|
||||
0xFFF00000); /* XXX: This is a hack */
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
env->excp_prefix = 0xFFF00000;
|
||||
#endif
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
env->slb_nr = 32;
|
||||
#endif
|
||||
|
|
@ -4336,9 +4343,6 @@ static void init_proc_970GX (CPUPPCState *env)
|
|||
SPR_NOACCESS, SPR_NOACCESS,
|
||||
&spr_read_generic, &spr_write_generic,
|
||||
0xFFF00000); /* XXX: This is a hack */
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
env->excp_prefix = 0xFFF00000;
|
||||
#endif
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
env->slb_nr = 32;
|
||||
#endif
|
||||
|
|
@ -4413,9 +4417,6 @@ static void init_proc_970MP (CPUPPCState *env)
|
|||
SPR_NOACCESS, SPR_NOACCESS,
|
||||
&spr_read_generic, &spr_write_generic,
|
||||
0xFFF00000); /* XXX: This is a hack */
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
env->excp_prefix = 0xFFF00000;
|
||||
#endif
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
env->slb_nr = 32;
|
||||
#endif
|
||||
|
|
@ -4432,7 +4433,7 @@ static void init_proc_970MP (CPUPPCState *env)
|
|||
#define POWERPC_MSRM_620 (0x800000000005FF73ULL)
|
||||
#define POWERPC_MMU_620 (POWERPC_MMU_64B)
|
||||
#define POWERPC_EXCP_620 (POWERPC_EXCP_970)
|
||||
#define POWERPC_INPUT_620 (PPC_FLAGS_INPUT_970)
|
||||
#define POWERPC_INPUT_620 (PPC_FLAGS_INPUT_6xx)
|
||||
#define POWERPC_BFDM_620 (bfd_mach_ppc64)
|
||||
#define POWERPC_FLAG_620 (POWERPC_FLAG_SE | POWERPC_FLAG_BE)
|
||||
#define check_pow_620 check_pow_nocheck /* Check this */
|
||||
|
|
@ -4456,7 +4457,8 @@ static void init_proc_620 (CPUPPCState *env)
|
|||
init_excp_620(env);
|
||||
env->dcache_line_size = 64;
|
||||
env->icache_line_size = 64;
|
||||
/* XXX: TODO: initialize internal interrupt controller */
|
||||
/* Allocate hardware IRQ controller */
|
||||
ppc6xx_irq_init(env);
|
||||
}
|
||||
#endif /* defined (TARGET_PPC64) */
|
||||
|
||||
|
|
@ -5771,10 +5773,8 @@ static ppc_def_t ppc_defs[] = {
|
|||
POWERPC_DEF("7457v1.2", CPU_POWERPC_74x7_v12, 0xFFFFFFFF, 7455),
|
||||
/* 64 bits PowerPC */
|
||||
#if defined (TARGET_PPC64)
|
||||
#if defined (TODO)
|
||||
/* PowerPC 620 */
|
||||
POWERPC_DEF("620", CPU_POWERPC_620, 0xFFFFFFFF, 620),
|
||||
#endif
|
||||
#if defined (TODO)
|
||||
/* PowerPC 630 (POWER3) */
|
||||
POWERPC_DEF("630", CPU_POWERPC_630, 0xFFFFFFFF, 630),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue