OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/ppc: Style fixes for cpu.[ch]

Browse Source 
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
This commit is contained in:
David Gibson 2019-03-21 16:29:36 +11:00
parent b93745bba4
commit c647e3fe3d
1 changed files with 129 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
target/ppc/cpu.h
View File

@ -23,7 +23,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/int128.h" #include "qemu/int128.h"
//#define PPC_EMULATE_32BITS_HYPV /* #define PPC_EMULATE_32BITS_HYPV */
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
/* PowerPC 64 definitions */ /* PowerPC 64 definitions */
@ -32,14 +32,19 @@
#define TCG_GUEST_DEFAULT_MO 0 #define TCG_GUEST_DEFAULT_MO 0
/* Note that the official physical address space bits is 62-M where M /*
is implementation dependent. I've not looked up M for the set of * Note that the official physical address space bits is 62-M where M
cpus we emulate at the system level. */ * is implementation dependent. I've not looked up M for the set of
* cpus we emulate at the system level.
*/
#define TARGET_PHYS_ADDR_SPACE_BITS 62 #define TARGET_PHYS_ADDR_SPACE_BITS 62
/* Note that the PPC environment architecture talks about 80 bit virtual /*
addresses, with segmentation. Obviously that's not all visible to a * Note that the PPC environment architecture talks about 80 bit
single process, which is all we're concerned with here. */ * virtual addresses, with segmentation. Obviously that's not all
* visible to a single process, which is all we're concerned with
* here.
*/
#ifdef TARGET_ABI32 #ifdef TARGET_ABI32
# define TARGET_VIRT_ADDR_SPACE_BITS 32 # define TARGET_VIRT_ADDR_SPACE_BITS 32
#else #else
@ -237,9 +242,11 @@ struct ppc_spr_t {
const char *name; const char *name;
target_ulong default_value; target_ulong default_value;
#ifdef CONFIG_KVM #ifdef CONFIG_KVM
/* We (ab)use the fact that all the SPRs will have ids for the /*
* We (ab)use the fact that all the SPRs will have ids for the
* ONE_REG interface will have KVM_REG_PPC to use 0 as meaning, * ONE_REG interface will have KVM_REG_PPC to use 0 as meaning,
* don't sync this */ * don't sync this
*/
uint64_t one_reg_id; uint64_t one_reg_id;
#endif #endif
}; };
@ -962,9 +969,10 @@ struct ppc_radix_page_info {
/*****************************************************************************/ /*****************************************************************************/
/* The whole PowerPC CPU context */ /* The whole PowerPC CPU context */
/* PowerPC needs eight modes for different hypervisor/supervisor/guest + /*
* real/paged mode combinations. The other two modes are for external PID * PowerPC needs eight modes for different hypervisor/supervisor/guest
* load/store. * + real/paged mode combinations. The other two modes are for
* external PID load/store.
*/ */
#define NB_MMU_MODES 10 #define NB_MMU_MODES 10
#define MMU_MODE8_SUFFIX _epl #define MMU_MODE8_SUFFIX _epl
@ -976,8 +984,9 @@ struct ppc_radix_page_info {
#define PPC_CPU_INDIRECT_OPCODES_LEN 0x20 #define PPC_CPU_INDIRECT_OPCODES_LEN 0x20
struct CPUPPCState { struct CPUPPCState {
/* First are the most commonly used resources /*
* during translated code execution * First are the most commonly used resources during translated
* code execution
*/ */
/* general purpose registers */ /* general purpose registers */
target_ulong gpr[32]; target_ulong gpr[32];
@ -1023,8 +1032,8 @@ struct CPUPPCState {
/* High part of 128-bit helper return. */ /* High part of 128-bit helper return. */
uint64_t retxh; uint64_t retxh;
int access_type; /* when a memory exception occurs, the access /* when a memory exception occurs, the access type is stored here */
type is stored here */ int access_type;
CPU_COMMON CPU_COMMON
@ -1072,8 +1081,10 @@ struct CPUPPCState {
/* SPE registers */ /* SPE registers */
uint64_t spe_acc; uint64_t spe_acc;
uint32_t spe_fscr; uint32_t spe_fscr;
/* SPE and Altivec can share a status since they will never be used /*
* simultaneously */ * SPE and Altivec can share a status since they will never be
* used simultaneously
*/
float_status vec_status; float_status vec_status;
/* Internal devices resources */ /* Internal devices resources */
@ -1103,7 +1114,8 @@ struct CPUPPCState {
int error_code; int error_code;
uint32_t pending_interrupts; uint32_t pending_interrupts;
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
/* This is the IRQ controller, which is implementation dependent /*
* This is the IRQ controller, which is implementation dependent
* and only relevant when emulating a complete machine. * and only relevant when emulating a complete machine.
*/ */
uint32_t irq_input_state; uint32_t irq_input_state;
@ -1117,7 +1129,8 @@ struct CPUPPCState {
hwaddr mpic_iack; hwaddr mpic_iack;
/* true when the external proxy facility mode is enabled */ /* true when the external proxy facility mode is enabled */
bool mpic_proxy; bool mpic_proxy;
/* set when the processor has an HV mode, thus HV priv /*
* set when the processor has an HV mode, thus HV priv
* instructions and SPRs are diallowed if MSR:HV is 0 * instructions and SPRs are diallowed if MSR:HV is 0
*/ */
bool has_hv_mode; bool has_hv_mode;
@ -1149,8 +1162,10 @@ struct CPUPPCState {
/* booke timers */ /* booke timers */
/* Specifies bit locations of the Time Base used to signal a fixed timer /*
* exception on a transition from 0 to 1. (watchdog or fixed-interval timer) * Specifies bit locations of the Time Base used to signal a fixed
* timer exception on a transition from 0 to 1. (watchdog or
* fixed-interval timer)
* *
* 0 selects the least significant bit. * 0 selects the least significant bit.
* 63 selects the most significant bit. * 63 selects the most significant bit.
@ -1290,11 +1305,12 @@ extern const struct VMStateDescription vmstate_ppc_cpu;
/*****************************************************************************/ /*****************************************************************************/
void ppc_translate_init(void); void ppc_translate_init(void);
/* you can call this signal handler from your SIGBUS and SIGSEGV /*
signal handlers to inform the virtual CPU of exceptions. non zero * you can call this signal handler from your SIGBUS and SIGSEGV
is returned if the signal was handled by the virtual CPU. */ * signal handlers to inform the virtual CPU of exceptions. non zero
int cpu_ppc_signal_handler (int host_signum, void *pinfo, * is returned if the signal was handled by the virtual CPU.
void *puc); */
int cpu_ppc_signal_handler(int host_signum, void *pinfo, void *puc);
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
int ppc_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, int ppc_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw,
int mmu_idx); int mmu_idx);
@ -1349,7 +1365,8 @@ static inline uint64_t ppc_dump_gpr(CPUPPCState *env, int gprn)
gprv = env->gpr[gprn]; gprv = env->gpr[gprn];
if (env->flags & POWERPC_FLAG_SPE) { if (env->flags & POWERPC_FLAG_SPE) {
/* If the CPU implements the SPE extension, we have to get the /*
* If the CPU implements the SPE extension, we have to get the
* high bits of the GPR from the gprh storage area * high bits of the GPR from the gprh storage area
*/ */
gprv &= 0xFFFFFFFFULL; gprv &= 0xFFFFFFFFULL;
@ -2226,7 +2243,8 @@ enum {
}; };
/*****************************************************************************/ /*****************************************************************************/
/* Memory access type : /*
* Memory access type :
* may be needed for precise access rights control and precise exceptions. * may be needed for precise access rights control and precise exceptions.
*/ */
enum { enum {
@ -2242,7 +2260,8 @@ enum {
ACCESS_CACHE = 0x60, /* Cache manipulation */ ACCESS_CACHE = 0x60, /* Cache manipulation */
}; };
/* Hardware interruption sources: /*
* Hardware interrupt sources:
* all those exception can be raised simulteaneously * all those exception can be raised simulteaneously
*/ */
/* Input pins definitions */ /* Input pins definitions */
@ -2325,9 +2344,11 @@ enum {
enum { enum {
/* POWER7 input pins */ /* POWER7 input pins */
POWER7_INPUT_INT = 0, POWER7_INPUT_INT = 0,
/* POWER7 probably has other inputs, but we don't care about them /*
* POWER7 probably has other inputs, but we don't care about them
* for any existing machine. We can wire these up when we need * for any existing machine. We can wire these up when we need
* them */ * them
*/
POWER7_INPUT_NB, POWER7_INPUT_NB,
}; };