diff options
author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-03-07 08:32:30 +0000 |
---|---|---|
committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-03-07 08:32:30 +0000 |
commit | 76a66253e5e48f1744f689041c1c21cedcaff630 (patch) | |
tree | c1003bd73ab8e2cbfe4a05c5b3f497bc2573fa4e /target-ppc/exec.h | |
parent | 1c7b3754f68382941a1921e578ead25d97d116fb (diff) |
Great PowerPC emulation code resynchronisation and improvments:
- Add status file to make regression tracking easier
- Move all micro-operations helpers definitions into a separate header:
should never be seen outside of op.c
- Update copyrights
- Add new / missing PowerPC CPU definitions
- Add definitions for PowerPC BookE
- Add support for PowerPC 6xx/7xx software driven TLBs
Allow use of PowerPC 603 as an example
- Add preliminary code for POWER, POWER2, PowerPC 403, 405, 440, 601, 602
and BookE support
- Avoid compiling priviledged only resources support for user-mode emulation
- Remove unused helpers / micro-ops / dead code
- Add instructions usage statistics dump: useful to figure which instructions
need strong optimizations.
- Micro-operation fixes:
* add missing RETURN in some micro-ops
* fix prototypes
* use softfloat routines for all floating-point operations
* fix tlbie instruction
* move some huge micro-operations into helpers
- emulation fixes:
* fix inverted opcodes for fcmpo / fcmpu
* condition register update is always to be done after the whole
instruction has completed
* add missing NIP updates when calling helpers that may generate an
exception
- optimizations and improvments:
* optimize very often used instructions (li, mr, rlwixx...)
* remove specific micro-ops for rarely used instructions
* add routines for addresses computations to avoid bugs due to multiple
different implementations
* fix TB linking: do not reset T0 at the end of every TB.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2473 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-ppc/exec.h')
-rw-r--r-- | target-ppc/exec.h | 76 |
1 files changed, 50 insertions, 26 deletions
diff --git a/target-ppc/exec.h b/target-ppc/exec.h index 89171f9d3f..25e060fb6f 100644 --- a/target-ppc/exec.h +++ b/target-ppc/exec.h @@ -1,7 +1,7 @@ /* * PowerPC emulation definitions for qemu. * - * Copyright (c) 2003-2005 Jocelyn Mayer + * Copyright (c) 2003-2007 Jocelyn Mayer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,15 +24,34 @@ #include "dyngen-exec.h" -#define TARGET_LONG_BITS 32 +#include "cpu.h" +#include "exec-all.h" register struct CPUPPCState *env asm(AREG0); -register uint32_t T0 asm(AREG1); -register uint32_t T1 asm(AREG2); -register uint32_t T2 asm(AREG3); +#if TARGET_LONG_BITS > HOST_LONG_BITS +/* no registers can be used */ +#define T0 (env->t0) +#define T1 (env->t1) +#define T2 (env->t2) +#else +/* This may be more efficient if HOST_LONG_BITS > TARGET_LONG_BITS + * To be set to one when we'll be sure it does not cause bugs.... + */ +#if 0 +register unsigned long T0 asm(AREG1); +register unsigned long T1 asm(AREG2); +register unsigned long T2 asm(AREG3); +#else +register target_ulong T0 asm(AREG1); +register target_ulong T1 asm(AREG2); +register target_ulong T2 asm(AREG3); +#endif +#endif +/* XXX: to clean: remove this mess */ #define PARAM(n) ((uint32_t)PARAM##n) #define SPARAM(n) ((int32_t)PARAM##n) + #define FT0 (env->ft0) #define FT1 (env->ft1) #define FT2 (env->ft2) @@ -43,14 +62,28 @@ register uint32_t T2 asm(AREG3); # define RETURN() __asm__ __volatile__("" : : : "memory"); #endif -#include "cpu.h" -#include "exec-all.h" +static inline target_ulong rotl8 (target_ulong i, int n) +{ + return (((uint8_t)i << n) | ((uint8_t)i >> (8 - n))); +} + +static inline target_ulong rotl16 (target_ulong i, int n) +{ + return (((uint16_t)i << n) | ((uint16_t)i >> (16 - n))); +} -static inline uint32_t rotl (uint32_t i, int n) +static inline target_ulong rotl32 (target_ulong i, int n) { - return ((i << n) | (i >> (32 - n))); + return (((uint32_t)i << n) | ((uint32_t)i >> (32 - n))); } +#if defined(TARGET_PPC64) +static inline target_ulong rotl64 (target_ulong i, int n) +{ + return (((uint64_t)i << n) | ((uint64_t)i >> (64 - n))); +} +#endif + #if !defined(CONFIG_USER_ONLY) #include "softmmu_exec.h" #endif /* !defined(CONFIG_USER_ONLY) */ @@ -58,23 +91,14 @@ static inline uint32_t rotl (uint32_t i, int n) void do_raise_exception_err (uint32_t exception, int error_code); void do_raise_exception (uint32_t exception); -void do_sraw(void); - -void do_fctiw (void); -void do_fctiwz (void); -void do_fnmadd (void); -void do_fnmsub (void); -void do_fsqrt (void); -void do_fres (void); -void do_frsqrte (void); -void do_fsel (void); -void do_fcmpu (void); -void do_fcmpo (void); +int get_physical_address (CPUState *env, mmu_ctx_t *ctx, target_ulong vaddr, + int rw, int access_type, int check_BATs); -void do_check_reservation (void); -void do_icbi (void); -void do_tlbia (void); -void do_tlbie (void); +void ppc6xx_tlb_invalidate_all (CPUState *env); +void ppc6xx_tlb_invalidate_virt (CPUState *env, target_ulong eaddr, + int is_code); +void ppc6xx_tlb_store (CPUState *env, target_ulong EPN, int way, int is_code, + target_ulong pte0, target_ulong pte1); static inline void env_to_regs(void) { @@ -84,7 +108,7 @@ static inline void regs_to_env(void) { } -int cpu_ppc_handle_mmu_fault (CPUState *env, uint32_t address, int rw, +int cpu_ppc_handle_mmu_fault (CPUState *env, target_ulong address, int rw, int is_user, int is_softmmu); #endif /* !defined (__PPC_H__) */ |