tcg: Split out target/arch/cpu-param.h

For all targets, into this new file move TARGET_LONG_BITS,
TARGET_PAGE_BITS, TARGET_PHYS_ADDR_SPACE_BITS,
TARGET_VIRT_ADDR_SPACE_BITS, and NB_MMU_MODES.

Include this new file from exec/cpu-defs.h.

This now removes the somewhat odd requirement that target/arch/cpu.h
defines TARGET_LONG_BITS before including exec/cpu-defs.h, so push the
bulk of the includes within target/arch/cpu.h to the top.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2019-03-22 11:51:19 -07:00
parent 79e4208506
commit 74433bf083
45 changed files with 544 additions and 333 deletions

View File

@ -34,8 +34,28 @@
#endif #endif
#include "exec/memattrs.h" #include "exec/memattrs.h"
#include "cpu-param.h"
#ifndef TARGET_LONG_BITS #ifndef TARGET_LONG_BITS
#error TARGET_LONG_BITS must be defined before including this header # error TARGET_LONG_BITS must be defined in cpu-param.h
#endif
#ifndef NB_MMU_MODES
# error NB_MMU_MODES must be defined in cpu-param.h
#endif
#ifndef TARGET_PHYS_ADDR_SPACE_BITS
# error TARGET_PHYS_ADDR_SPACE_BITS must be defined in cpu-param.h
#endif
#ifndef TARGET_VIRT_ADDR_SPACE_BITS
# error TARGET_VIRT_ADDR_SPACE_BITS must be defined in cpu-param.h
#endif
#ifndef TARGET_PAGE_BITS
# ifdef TARGET_PAGE_BITS_VARY
# ifndef TARGET_PAGE_BITS_MIN
# error TARGET_PAGE_BITS_MIN must be defined in cpu-param.h
# endif
# else
# error TARGET_PAGE_BITS must be defined in cpu-param.h
# endif
#endif #endif
#define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8) #define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8)

31
target/alpha/cpu-param.h Normal file
View File

@ -0,0 +1,31 @@
/*
* Alpha cpu parameters for qemu.
*
* Copyright (c) 2007 Jocelyn Mayer
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef ALPHA_CPU_PARAM_H
#define ALPHA_CPU_PARAM_H 1
#define TARGET_LONG_BITS 64
#define TARGET_PAGE_BITS 13
#ifdef CONFIG_USER_ONLY
/*
* ??? The kernel likes to give addresses in high memory. If the host has
* more virtual address space than the guest, this can lead to impossible
* allocations. Honor the long-standing assumption that only kernel addrs
* are negative, but otherwise allow allocations anywhere. This could lead
* to tricky emulation problems for programs doing tagged addressing, but
* that's far fewer than encounter the impossible allocation problem.
*/
#define TARGET_PHYS_ADDR_SPACE_BITS 63
#define TARGET_VIRT_ADDR_SPACE_BITS 63
#else
/* ??? EV4 has 34 phys addr bits, EV5 has 40, EV6 has 44. */
#define TARGET_PHYS_ADDR_SPACE_BITS 44
#define TARGET_VIRT_ADDR_SPACE_BITS (30 + TARGET_PAGE_BITS)
#endif
#define NB_MMU_MODES 3
#endif

View File

@ -22,8 +22,8 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/cpu-defs.h"
#define TARGET_LONG_BITS 64
#define ALIGNED_ONLY #define ALIGNED_ONLY
#define CPUArchState struct CPUAlphaState #define CPUArchState struct CPUAlphaState
@ -31,28 +31,9 @@
/* Alpha processors have a weak memory model */ /* Alpha processors have a weak memory model */
#define TCG_GUEST_DEFAULT_MO (0) #define TCG_GUEST_DEFAULT_MO (0)
#include "exec/cpu-defs.h"
#define ICACHE_LINE_SIZE 32 #define ICACHE_LINE_SIZE 32
#define DCACHE_LINE_SIZE 32 #define DCACHE_LINE_SIZE 32
#define TARGET_PAGE_BITS 13
#ifdef CONFIG_USER_ONLY
/* ??? The kernel likes to give addresses in high memory. If the host has
more virtual address space than the guest, this can lead to impossible
allocations. Honor the long-standing assumption that only kernel addrs
are negative, but otherwise allow allocations anywhere. This could lead
to tricky emulation problems for programs doing tagged addressing, but
that's far fewer than encounter the impossible allocation problem. */
#define TARGET_PHYS_ADDR_SPACE_BITS 63
#define TARGET_VIRT_ADDR_SPACE_BITS 63
#else
/* ??? EV4 has 34 phys addr bits, EV5 has 40, EV6 has 44. */
#define TARGET_PHYS_ADDR_SPACE_BITS 44
#define TARGET_VIRT_ADDR_SPACE_BITS (30 + TARGET_PAGE_BITS)
#endif
/* Alpha major type */ /* Alpha major type */
enum { enum {
ALPHA_EV3 = 1, ALPHA_EV3 = 1,
@ -217,8 +198,6 @@ enum {
PALcode cheats and usees the KSEG mapping for its code+data rather than PALcode cheats and usees the KSEG mapping for its code+data rather than
physical addresses. */ physical addresses. */
#define NB_MMU_MODES 3
#define MMU_MODE0_SUFFIX _kernel #define MMU_MODE0_SUFFIX _kernel
#define MMU_MODE1_SUFFIX _user #define MMU_MODE1_SUFFIX _user
#define MMU_KERNEL_IDX 0 #define MMU_KERNEL_IDX 0

34
target/arm/cpu-param.h Normal file
View File

@ -0,0 +1,34 @@
/*
* ARM cpu parameters for qemu.
*
* Copyright (c) 2003 Fabrice Bellard
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef ARM_CPU_PARAM_H
#define ARM_CPU_PARAM_H 1
#ifdef TARGET_AARCH64
# define TARGET_LONG_BITS 64
# define TARGET_PHYS_ADDR_SPACE_BITS 48
# define TARGET_VIRT_ADDR_SPACE_BITS 48
#else
# define TARGET_LONG_BITS 32
# define TARGET_PHYS_ADDR_SPACE_BITS 40
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#ifdef CONFIG_USER_ONLY
#define TARGET_PAGE_BITS 12
#else
/*
* ARMv7 and later CPUs have 4K pages minimum, but ARMv5 and v6
* have to support 1K tiny pages.
*/
# define TARGET_PAGE_BITS_VARY
# define TARGET_PAGE_BITS_MIN 10
#endif
#define NB_MMU_MODES 8
#endif

View File

@ -22,23 +22,15 @@
#include "kvm-consts.h" #include "kvm-consts.h"
#include "hw/registerfields.h" #include "hw/registerfields.h"
#include "qemu-common.h"
#if defined(TARGET_AARCH64) #include "cpu-qom.h"
/* AArch64 definitions */ #include "exec/cpu-defs.h"
# define TARGET_LONG_BITS 64
#else
# define TARGET_LONG_BITS 32
#endif
/* ARM processors have a weak memory model */ /* ARM processors have a weak memory model */
#define TCG_GUEST_DEFAULT_MO (0) #define TCG_GUEST_DEFAULT_MO (0)
#define CPUArchState struct CPUARMState #define CPUArchState struct CPUARMState
#include "qemu-common.h"
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
#define EXCP_UDEF 1 /* undefined instruction */ #define EXCP_UDEF 1 /* undefined instruction */
#define EXCP_SWI 2 /* software interrupt */ #define EXCP_SWI 2 /* software interrupt */
#define EXCP_PREFETCH_ABORT 3 #define EXCP_PREFETCH_ABORT 3
@ -114,7 +106,6 @@ enum {
#define ARM_CPU_VIRQ 2 #define ARM_CPU_VIRQ 2
#define ARM_CPU_VFIQ 3 #define ARM_CPU_VFIQ 3
#define NB_MMU_MODES 8
/* ARM-specific extra insn start words: /* ARM-specific extra insn start words:
* 1: Conditional execution bits * 1: Conditional execution bits
* 2: Partial exception syndrome for data aborts * 2: Partial exception syndrome for data aborts
@ -2639,24 +2630,6 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_sync);
#define ARM_CPUID_TI915T 0x54029152 #define ARM_CPUID_TI915T 0x54029152
#define ARM_CPUID_TI925T 0x54029252 #define ARM_CPUID_TI925T 0x54029252
#if defined(CONFIG_USER_ONLY)
#define TARGET_PAGE_BITS 12
#else
/* ARMv7 and later CPUs have 4K pages minimum, but ARMv5 and v6
* have to support 1K tiny pages.
*/
#define TARGET_PAGE_BITS_VARY
#define TARGET_PAGE_BITS_MIN 10
#endif
#if defined(TARGET_AARCH64)
# define TARGET_PHYS_ADDR_SPACE_BITS 48
# define TARGET_VIRT_ADDR_SPACE_BITS 48
#else
# define TARGET_PHYS_ADDR_SPACE_BITS 40
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx, static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,
unsigned int target_el) unsigned int target_el)
{ {

17
target/cris/cpu-param.h Normal file
View File

@ -0,0 +1,17 @@
/*
* CRIS cpu parameters for qemu.
*
* Copyright (c) 2007 AXIS Communications AB
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef CRIS_CPU_PARAM_H
#define CRIS_CPU_PARAM_H 1
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 13
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define NB_MMU_MODES 2
#endif

View File

@ -23,13 +23,10 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/cpu-defs.h"
#define TARGET_LONG_BITS 32
#define CPUArchState struct CPUCRISState #define CPUArchState struct CPUCRISState
#include "exec/cpu-defs.h"
#define EXCP_NMI 1 #define EXCP_NMI 1
#define EXCP_GURU 2 #define EXCP_GURU 2
#define EXCP_BUSFAULT 3 #define EXCP_BUSFAULT 3
@ -105,8 +102,6 @@
#define CC_A 14 #define CC_A 14
#define CC_P 15 #define CC_P 15
#define NB_MMU_MODES 2
typedef struct { typedef struct {
uint32_t hi; uint32_t hi;
uint32_t lo; uint32_t lo;
@ -260,12 +255,8 @@ enum {
}; };
/* CRIS uses 8k pages. */ /* CRIS uses 8k pages. */
#define TARGET_PAGE_BITS 13
#define MMAP_SHIFT TARGET_PAGE_BITS #define MMAP_SHIFT TARGET_PAGE_BITS
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define CRIS_CPU_TYPE_SUFFIX "-" TYPE_CRIS_CPU #define CRIS_CPU_TYPE_SUFFIX "-" TYPE_CRIS_CPU
#define CRIS_CPU_TYPE_NAME(name) (name CRIS_CPU_TYPE_SUFFIX) #define CRIS_CPU_TYPE_NAME(name) (name CRIS_CPU_TYPE_SUFFIX)
#define CPU_RESOLVING_TYPE TYPE_CRIS_CPU #define CPU_RESOLVING_TYPE TYPE_CRIS_CPU

34
target/hppa/cpu-param.h Normal file
View File

@ -0,0 +1,34 @@
/*
* PA-RISC cpu parameters for qemu.
*
* Copyright (c) 2016 Richard Henderson <rth@twiddle.net>
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef HPPA_CPU_PARAM_H
#define HPPA_CPU_PARAM_H 1
#ifdef TARGET_HPPA64
# define TARGET_LONG_BITS 64
# define TARGET_REGISTER_BITS 64
# define TARGET_VIRT_ADDR_SPACE_BITS 64
# define TARGET_PHYS_ADDR_SPACE_BITS 64
#elif defined(CONFIG_USER_ONLY)
# define TARGET_LONG_BITS 32
# define TARGET_REGISTER_BITS 32
# define TARGET_VIRT_ADDR_SPACE_BITS 32
# define TARGET_PHYS_ADDR_SPACE_BITS 32
#else
/*
* In order to form the GVA from space:offset,
* we need a 64-bit virtual address space.
*/
# define TARGET_LONG_BITS 64
# define TARGET_REGISTER_BITS 32
# define TARGET_VIRT_ADDR_SPACE_BITS 64
# define TARGET_PHYS_ADDR_SPACE_BITS 32
#endif
#define TARGET_PAGE_BITS 12
#define NB_MMU_MODES 5
#endif

View File

@ -22,25 +22,8 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/cpu-defs.h"
#ifdef TARGET_HPPA64
#define TARGET_LONG_BITS 64
#define TARGET_VIRT_ADDR_SPACE_BITS 64
#define TARGET_REGISTER_BITS 64
#define TARGET_PHYS_ADDR_SPACE_BITS 64
#elif defined(CONFIG_USER_ONLY)
#define TARGET_LONG_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define TARGET_REGISTER_BITS 32
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#else
/* In order to form the GVA from space:offset,
we need a 64-bit virtual address space. */
#define TARGET_LONG_BITS 64
#define TARGET_VIRT_ADDR_SPACE_BITS 64
#define TARGET_REGISTER_BITS 32
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#endif
/* PA-RISC 1.x processors have a strong memory model. */ /* PA-RISC 1.x processors have a strong memory model. */
/* ??? While we do not yet implement PA-RISC 2.0, those processors have /* ??? While we do not yet implement PA-RISC 2.0, those processors have
@ -50,12 +33,7 @@
#define CPUArchState struct CPUHPPAState #define CPUArchState struct CPUHPPAState
#include "exec/cpu-defs.h"
#define TARGET_PAGE_BITS 12
#define ALIGNED_ONLY #define ALIGNED_ONLY
#define NB_MMU_MODES 5
#define MMU_KERNEL_IDX 0 #define MMU_KERNEL_IDX 0
#define MMU_USER_IDX 3 #define MMU_USER_IDX 3
#define MMU_PHYS_IDX 4 #define MMU_PHYS_IDX 4

28
target/i386/cpu-param.h Normal file
View File

@ -0,0 +1,28 @@
/*
* i386 cpu parameters for qemu.
*
* Copyright (c) 2003 Fabrice Bellard
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef I386_CPU_PARAM_H
#define I386_CPU_PARAM_H 1
#ifdef TARGET_X86_64
# define TARGET_LONG_BITS 64
# define TARGET_PHYS_ADDR_SPACE_BITS 52
/*
* ??? This is really 48 bits, sign-extended, but the only thing
* accessible to userland with bit 48 set is the VSYSCALL, and that
* is handled via other mechanisms.
*/
# define TARGET_VIRT_ADDR_SPACE_BITS 47
#else
# define TARGET_LONG_BITS 32
# define TARGET_PHYS_ADDR_SPACE_BITS 36
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#define TARGET_PAGE_BITS 12
#define NB_MMU_MODES 3
#endif

View File

@ -24,13 +24,6 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "hyperv-proto.h" #include "hyperv-proto.h"
#ifdef TARGET_X86_64
#define TARGET_LONG_BITS 64
#else
#define TARGET_LONG_BITS 32
#endif
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
/* The x86 has a strong memory model with some store-after-load re-ordering */ /* The x86 has a strong memory model with some store-after-load re-ordering */
@ -956,7 +949,6 @@ typedef struct {
#define MAX_FIXED_COUNTERS 3 #define MAX_FIXED_COUNTERS 3
#define MAX_GP_COUNTERS (MSR_IA32_PERF_STATUS - MSR_P6_EVNTSEL0) #define MAX_GP_COUNTERS (MSR_IA32_PERF_STATUS - MSR_P6_EVNTSEL0)
#define NB_MMU_MODES 3
#define TARGET_INSN_START_EXTRA_WORDS 1 #define TARGET_INSN_START_EXTRA_WORDS 1
#define NB_OPMASK_REGS 8 #define NB_OPMASK_REGS 8
@ -1695,19 +1687,6 @@ void cpu_x86_update_dr7(CPUX86State *env, uint32_t new_dr7);
/* hw/pc.c */ /* hw/pc.c */
uint64_t cpu_get_tsc(CPUX86State *env); uint64_t cpu_get_tsc(CPUX86State *env);
#define TARGET_PAGE_BITS 12
#ifdef TARGET_X86_64
#define TARGET_PHYS_ADDR_SPACE_BITS 52
/* ??? This is really 48 bits, sign-extended, but the only thing
accessible to userland with bit 48 set is the VSYSCALL, and that
is handled via other mechanisms. */
#define TARGET_VIRT_ADDR_SPACE_BITS 47
#else
#define TARGET_PHYS_ADDR_SPACE_BITS 36
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
/* XXX: This value should match the one returned by CPUID /* XXX: This value should match the one returned by CPUID
* and in exec.c */ * and in exec.c */
# if defined(TARGET_X86_64) # if defined(TARGET_X86_64)

17
target/lm32/cpu-param.h Normal file
View File

@ -0,0 +1,17 @@
/*
* LatticeMico32 cpu parameters for qemu.
*
* Copyright (c) 2010 Michael Walle <michael@walle.cc>
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef LM32_CPU_PARAM_H
#define LM32_CPU_PARAM_H 1
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define NB_MMU_MODES 1
#endif

View File

@ -20,26 +20,20 @@
#ifndef LM32_CPU_H #ifndef LM32_CPU_H
#define LM32_CPU_H #define LM32_CPU_H
#define TARGET_LONG_BITS 32
#define CPUArchState struct CPULM32State
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#define CPUArchState struct CPULM32State
struct CPULM32State; struct CPULM32State;
typedef struct CPULM32State CPULM32State; typedef struct CPULM32State CPULM32State;
#define NB_MMU_MODES 1
#define TARGET_PAGE_BITS 12
static inline int cpu_mmu_index(CPULM32State *env, bool ifetch) static inline int cpu_mmu_index(CPULM32State *env, bool ifetch)
{ {
return 0; return 0;
} }
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
/* Exceptions indices */ /* Exceptions indices */
enum { enum {
EXCP_RESET = 0, EXCP_RESET = 0,

22
target/m68k/cpu-param.h Normal file
View File

@ -0,0 +1,22 @@
/*
* m68k cpu parameters for qemu.
*
* Copyright (c) 2005-2007 CodeSourcery
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef M68K_CPU_PARAM_H
#define M68K_CPU_PARAM_H 1
#define TARGET_LONG_BITS 32
/*
* Coldfire Linux uses 8k pages
* and m68k linux uses 4k pages
* use the smallest one
*/
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define NB_MMU_MODES 2
#endif

View File

@ -21,14 +21,12 @@
#ifndef M68K_CPU_H #ifndef M68K_CPU_H
#define M68K_CPU_H #define M68K_CPU_H
#define TARGET_LONG_BITS 32
#define CPUArchState struct CPUM68KState
#include "qemu-common.h" #include "qemu-common.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#define CPUArchState struct CPUM68KState
#define OS_BYTE 0 #define OS_BYTE 0
#define OS_WORD 1 #define OS_WORD 1
#define OS_LONG 2 #define OS_LONG 2
@ -82,7 +80,6 @@
#define M68K_MAX_TTR 2 #define M68K_MAX_TTR 2
#define TTR(type, index) ttr[((type & ACCESS_CODE) == ACCESS_CODE) * 2 + index] #define TTR(type, index) ttr[((type & ACCESS_CODE) == ACCESS_CODE) * 2 + index]
#define NB_MMU_MODES 2
#define TARGET_INSN_START_EXTRA_WORDS 1 #define TARGET_INSN_START_EXTRA_WORDS 1
typedef CPU_LDoubleU FPReg; typedef CPU_LDoubleU FPReg;
@ -502,12 +499,6 @@ void m68k_cpu_list(void);
void register_m68k_insns (CPUM68KState *env); void register_m68k_insns (CPUM68KState *env);
/* Coldfire Linux uses 8k pages
* and m68k linux uses 4k pages
* use the smallest one
*/
#define TARGET_PAGE_BITS 12
enum { enum {
/* 1 bit to define user level / supervisor access */ /* 1 bit to define user level / supervisor access */
ACCESS_SUPER = 0x01, ACCESS_SUPER = 0x01,
@ -522,9 +513,6 @@ enum {
ACCESS_DATA = 0x20, /* Data load/store access */ ACCESS_DATA = 0x20, /* Data load/store access */
}; };
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define M68K_CPU_TYPE_SUFFIX "-" TYPE_M68K_CPU #define M68K_CPU_TYPE_SUFFIX "-" TYPE_M68K_CPU
#define M68K_CPU_TYPE_NAME(model) model M68K_CPU_TYPE_SUFFIX #define M68K_CPU_TYPE_NAME(model) model M68K_CPU_TYPE_SUFFIX
#define CPU_RESOLVING_TYPE TYPE_M68K_CPU #define CPU_RESOLVING_TYPE TYPE_M68K_CPU

View File

@ -0,0 +1,18 @@
/*
* MicroBlaze cpu parameters for qemu.
*
* Copyright (c) 2009 Edgar E. Iglesias
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef MICROBLAZE_CPU_PARAM_H
#define MICROBLAZE_CPU_PARAM_H 1
#define TARGET_LONG_BITS 64
#define TARGET_PHYS_ADDR_SPACE_BITS 64
#define TARGET_VIRT_ADDR_SPACE_BITS 64
/* FIXME: MB uses variable pages down to 1K but linux only uses 4k. */
#define TARGET_PAGE_BITS 12
#define NB_MMU_MODES 3
#endif

View File

@ -22,13 +22,11 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/cpu-defs.h"
#define TARGET_LONG_BITS 64 #include "fpu/softfloat-types.h"
#define CPUArchState struct CPUMBState #define CPUArchState struct CPUMBState
#include "exec/cpu-defs.h"
#include "fpu/softfloat-types.h"
struct CPUMBState; struct CPUMBState;
typedef struct CPUMBState CPUMBState; typedef struct CPUMBState CPUMBState;
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
@ -228,8 +226,6 @@ typedef struct CPUMBState CPUMBState;
#define CC_NE 1 #define CC_NE 1
#define CC_EQ 0 #define CC_EQ 0
#define NB_MMU_MODES 3
#define STREAM_EXCEPTION (1 << 0) #define STREAM_EXCEPTION (1 << 0)
#define STREAM_ATOMIC (1 << 1) #define STREAM_ATOMIC (1 << 1)
#define STREAM_TEST (1 << 2) #define STREAM_TEST (1 << 2)
@ -340,12 +336,6 @@ void mb_tcg_init(void);
int cpu_mb_signal_handler(int host_signum, void *pinfo, int cpu_mb_signal_handler(int host_signum, void *pinfo,
void *puc); void *puc);
/* FIXME: MB uses variable pages down to 1K but linux only uses 4k. */
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 64
#define TARGET_VIRT_ADDR_SPACE_BITS 64
#define CPU_RESOLVING_TYPE TYPE_MICROBLAZE_CPU #define CPU_RESOLVING_TYPE TYPE_MICROBLAZE_CPU
#define cpu_signal_handler cpu_mb_signal_handler #define cpu_signal_handler cpu_mb_signal_handler

29
target/mips/cpu-param.h Normal file
View File

@ -0,0 +1,29 @@
/*
* MIPS cpu parameters for qemu.
*
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef MIPS_CPU_PARAM_H
#define MIPS_CPU_PARAM_H 1
#ifdef TARGET_MIPS64
# define TARGET_LONG_BITS 64
#else
# define TARGET_LONG_BITS 32
#endif
#ifdef TARGET_MIPS64
#define TARGET_PHYS_ADDR_SPACE_BITS 48
#define TARGET_VIRT_ADDR_SPACE_BITS 48
#else
#define TARGET_PHYS_ADDR_SPACE_BITS 40
# ifdef CONFIG_USER_ONLY
# define TARGET_VIRT_ADDR_SPACE_BITS 31
# else
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#endif
#define TARGET_PAGE_BITS 12
#define NB_MMU_MODES 4
#endif

View File

@ -7,9 +7,9 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "mips-defs.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "fpu/softfloat.h" #include "fpu/softfloat.h"
#include "mips-defs.h"
#define TCG_GUEST_DEFAULT_MO (0) #define TCG_GUEST_DEFAULT_MO (0)
@ -103,7 +103,6 @@ struct CPUMIPSFPUContext {
#define FP_UNIMPLEMENTED 32 #define FP_UNIMPLEMENTED 32
}; };
#define NB_MMU_MODES 4
#define TARGET_INSN_START_EXTRA_WORDS 2 #define TARGET_INSN_START_EXTRA_WORDS 2
typedef struct CPUMIPSMVPContext CPUMIPSMVPContext; typedef struct CPUMIPSMVPContext CPUMIPSMVPContext;

View File

@ -5,23 +5,8 @@
//#define USE_HOST_FLOAT_REGS //#define USE_HOST_FLOAT_REGS
/* Real pages are variable size... */ /* Real pages are variable size... */
#define TARGET_PAGE_BITS 12
#define MIPS_TLB_MAX 128 #define MIPS_TLB_MAX 128
#if defined(TARGET_MIPS64)
#define TARGET_LONG_BITS 64
#define TARGET_PHYS_ADDR_SPACE_BITS 48
#define TARGET_VIRT_ADDR_SPACE_BITS 48
#else
#define TARGET_LONG_BITS 32
#define TARGET_PHYS_ADDR_SPACE_BITS 40
# ifdef CONFIG_USER_ONLY
# define TARGET_VIRT_ADDR_SPACE_BITS 31
# else
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#endif
/* /*
* bit definitions for insn_flags (ISAs/ASEs flags) * bit definitions for insn_flags (ISAs/ASEs flags)
* ------------------------------------------------ * ------------------------------------------------

17
target/moxie/cpu-param.h Normal file
View File

@ -0,0 +1,17 @@
/*
* Moxie cpu parameters for qemu.
*
* Copyright (c) 2008, 2010, 2013 Anthony Green
* SPDX-License-Identifier: LGPL-2.1+
*/
#ifndef MOXIE_CPU_PARAM_H
#define MOXIE_CPU_PARAM_H 1
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12 /* 4k */
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define NB_MMU_MODES 1
#endif

View File

@ -21,8 +21,7 @@
#define MOXIE_CPU_H #define MOXIE_CPU_H
#include "qemu-common.h" #include "qemu-common.h"
#include "exec/cpu-defs.h"
#define TARGET_LONG_BITS 32
#define CPUArchState struct CPUMoxieState #define CPUArchState struct CPUMoxieState
@ -33,15 +32,6 @@
#define MOXIE_EX_MMU_MISS 4 #define MOXIE_EX_MMU_MISS 4
#define MOXIE_EX_BREAK 16 #define MOXIE_EX_BREAK 16
#include "exec/cpu-defs.h"
#define TARGET_PAGE_BITS 12 /* 4k */
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define NB_MMU_MODES 1
typedef struct CPUMoxieState { typedef struct CPUMoxieState {
uint32_t flags; /* general execution flags */ uint32_t flags; /* general execution flags */

21
target/nios2/cpu-param.h Normal file
View File

@ -0,0 +1,21 @@
/*
* Altera Nios II cpu parameters for qemu.
*
* Copyright (c) 2012 Chris Wulff <crwulff@gmail.com>
* SPDX-License-Identifier: LGPL-2.1+
*/
#ifndef NIOS2_CPU_PARAM_H
#define NIOS2_CPU_PARAM_H 1
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#ifdef CONFIG_USER_ONLY
# define TARGET_VIRT_ADDR_SPACE_BITS 31
#else
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#define NB_MMU_MODES 2
#endif

View File

@ -22,13 +22,11 @@
#define NIOS2_CPU_H #define NIOS2_CPU_H
#include "qemu-common.h" #include "qemu-common.h"
#include "exec/cpu-defs.h"
#define TARGET_LONG_BITS 32 #include "qom/cpu.h"
#define CPUArchState struct CPUNios2State #define CPUArchState struct CPUNios2State
#include "exec/cpu-defs.h"
#include "qom/cpu.h"
struct CPUNios2State; struct CPUNios2State;
typedef struct CPUNios2State CPUNios2State; typedef struct CPUNios2State CPUNios2State;
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
@ -164,8 +162,6 @@ typedef struct Nios2CPUClass {
#define CPU_INTERRUPT_NMI CPU_INTERRUPT_TGT_EXT_3 #define CPU_INTERRUPT_NMI CPU_INTERRUPT_TGT_EXT_3
#define NB_MMU_MODES 2
struct CPUNios2State { struct CPUNios2State {
uint32_t regs[NUM_CORE_REGS]; uint32_t regs[NUM_CORE_REGS];
@ -225,13 +221,6 @@ void nios2_check_interrupts(CPUNios2State *env);
void do_nios2_semihosting(CPUNios2State *env); void do_nios2_semihosting(CPUNios2State *env);
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#ifdef CONFIG_USER_ONLY
# define TARGET_VIRT_ADDR_SPACE_BITS 31
#else
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#define CPU_RESOLVING_TYPE TYPE_NIOS2_CPU #define CPU_RESOLVING_TYPE TYPE_NIOS2_CPU
#define cpu_gen_code cpu_nios2_gen_code #define cpu_gen_code cpu_nios2_gen_code
@ -239,8 +228,6 @@ void do_nios2_semihosting(CPUNios2State *env);
#define CPU_SAVE_VERSION 1 #define CPU_SAVE_VERSION 1
#define TARGET_PAGE_BITS 12
/* MMU modes definitions */ /* MMU modes definitions */
#define MMU_MODE0_SUFFIX _kernel #define MMU_MODE0_SUFFIX _kernel
#define MMU_MODE1_SUFFIX _user #define MMU_MODE1_SUFFIX _user

View File

@ -0,0 +1,17 @@
/*
* OpenRISC cpu parameters for qemu.
*
* Copyright (c) 2011-2012 Jia Liu <proljc@gmail.com>
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef OPENRISC_CPU_PARAM_H
#define OPENRISC_CPU_PARAM_H 1
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 13
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define NB_MMU_MODES 3
#endif

View File

@ -20,17 +20,15 @@
#ifndef OPENRISC_CPU_H #ifndef OPENRISC_CPU_H
#define OPENRISC_CPU_H #define OPENRISC_CPU_H
#define TARGET_LONG_BITS 32 #include "qemu-common.h"
#include "exec/cpu-defs.h"
#include "qom/cpu.h"
#define CPUArchState struct CPUOpenRISCState #define CPUArchState struct CPUOpenRISCState
/* cpu_openrisc_map_address_* in CPUOpenRISCTLBContext need this decl. */ /* cpu_openrisc_map_address_* in CPUOpenRISCTLBContext need this decl. */
struct OpenRISCCPU; struct OpenRISCCPU;
#include "qemu-common.h"
#include "exec/cpu-defs.h"
#include "qom/cpu.h"
#define TYPE_OPENRISC_CPU "or1k-cpu" #define TYPE_OPENRISC_CPU "or1k-cpu"
#define OPENRISC_CPU_CLASS(klass) \ #define OPENRISC_CPU_CLASS(klass) \
@ -56,7 +54,6 @@ typedef struct OpenRISCCPUClass {
void (*parent_reset)(CPUState *cpu); void (*parent_reset)(CPUState *cpu);
} OpenRISCCPUClass; } OpenRISCCPUClass;
#define NB_MMU_MODES 3
#define TARGET_INSN_START_EXTRA_WORDS 1 #define TARGET_INSN_START_EXTRA_WORDS 1
enum { enum {
@ -65,11 +62,6 @@ enum {
MMU_USER_IDX = 2, MMU_USER_IDX = 2,
}; };
#define TARGET_PAGE_BITS 13
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define SET_FP_CAUSE(reg, v) do {\ #define SET_FP_CAUSE(reg, v) do {\
(reg) = ((reg) & ~(0x3f << 12)) | \ (reg) = ((reg) & ~(0x3f << 12)) | \
((v & 0x3f) << 12);\ ((v & 0x3f) << 12);\

37
target/ppc/cpu-param.h Normal file
View File

@ -0,0 +1,37 @@
/*
* PowerPC cpu parameters for qemu.
*
* Copyright (c) 2007 Jocelyn Mayer
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef PPC_CPU_PARAM_H
#define PPC_CPU_PARAM_H 1
#ifdef TARGET_PPC64
# define TARGET_LONG_BITS 64
/*
* 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
* cpus we emulate at the system level.
*/
#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
* single process, which is all we're concerned with here.
*/
# ifdef TARGET_ABI32
# define TARGET_VIRT_ADDR_SPACE_BITS 32
# else
# define TARGET_VIRT_ADDR_SPACE_BITS 64
# endif
#else
# define TARGET_LONG_BITS 32
# define TARGET_PHYS_ADDR_SPACE_BITS 36
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#define TARGET_PAGE_BITS 12
#define NB_MMU_MODES 10
#endif

View File

@ -22,53 +22,20 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/int128.h" #include "qemu/int128.h"
#include "exec/cpu-defs.h"
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
#include "cpu-qom.h"
/* #define PPC_EMULATE_32BITS_HYPV */ /* #define PPC_EMULATE_32BITS_HYPV */
#if defined(TARGET_PPC64)
/* PowerPC 64 definitions */
#define TARGET_LONG_BITS 64
#define TARGET_PAGE_BITS 12
#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
* cpus we emulate at the system level.
*/
#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 single process, which is all we're concerned with
* here.
*/
#ifdef TARGET_ABI32
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#else
# define TARGET_VIRT_ADDR_SPACE_BITS 64
#endif
#define TARGET_PAGE_BITS_64K 16 #define TARGET_PAGE_BITS_64K 16
#define TARGET_PAGE_BITS_16M 24 #define TARGET_PAGE_BITS_16M 24
#else /* defined(TARGET_PPC64) */
/* PowerPC 32 definitions */
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 36
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif /* defined(TARGET_PPC64) */
#define CPUArchState struct CPUPPCState #define CPUArchState struct CPUPPCState
#include "exec/cpu-defs.h"
#include "cpu-qom.h"
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
#define PPC_ELF_MACHINE EM_PPC64 #define PPC_ELF_MACHINE EM_PPC64
#else #else
@ -974,7 +941,6 @@ struct ppc_radix_page_info {
* + real/paged mode combinations. The other two modes are for * + real/paged mode combinations. The other two modes are for
* external PID load/store. * external PID load/store.
*/ */
#define NB_MMU_MODES 10
#define MMU_MODE8_SUFFIX _epl #define MMU_MODE8_SUFFIX _epl
#define MMU_MODE9_SUFFIX _eps #define MMU_MODE9_SUFFIX _eps
#define PPC_TLB_EPID_LOAD 8 #define PPC_TLB_EPID_LOAD 8

23
target/riscv/cpu-param.h Normal file
View File

@ -0,0 +1,23 @@
/*
* RISC-V cpu parameters for qemu.
*
* Copyright (c) 2017-2018 SiFive, Inc.
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef RISCV_CPU_PARAM_H
#define RISCV_CPU_PARAM_H 1
#if defined(TARGET_RISCV64)
# define TARGET_LONG_BITS 64
# define TARGET_PHYS_ADDR_SPACE_BITS 56 /* 44-bit PPN */
# define TARGET_VIRT_ADDR_SPACE_BITS 48 /* sv48 */
#elif defined(TARGET_RISCV32)
# define TARGET_LONG_BITS 32
# define TARGET_PHYS_ADDR_SPACE_BITS 34 /* 22-bit PPN */
# define TARGET_VIRT_ADDR_SPACE_BITS 32 /* sv32 */
#endif
#define TARGET_PAGE_BITS 12 /* 4 KiB Pages */
#define NB_MMU_MODES 4
#endif

View File

@ -20,27 +20,15 @@
#ifndef RISCV_CPU_H #ifndef RISCV_CPU_H
#define RISCV_CPU_H #define RISCV_CPU_H
/* QEMU addressing/paging config */
#define TARGET_PAGE_BITS 12 /* 4 KiB Pages */
#if defined(TARGET_RISCV64)
#define TARGET_LONG_BITS 64
#define TARGET_PHYS_ADDR_SPACE_BITS 56 /* 44-bit PPN */
#define TARGET_VIRT_ADDR_SPACE_BITS 48 /* sv48 */
#elif defined(TARGET_RISCV32)
#define TARGET_LONG_BITS 32
#define TARGET_PHYS_ADDR_SPACE_BITS 34 /* 22-bit PPN */
#define TARGET_VIRT_ADDR_SPACE_BITS 32 /* sv32 */
#endif
#define TCG_GUEST_DEFAULT_MO 0
#define CPUArchState struct CPURISCVState
#include "qemu-common.h" #include "qemu-common.h"
#include "qom/cpu.h" #include "qom/cpu.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "fpu/softfloat.h" #include "fpu/softfloat.h"
#define TCG_GUEST_DEFAULT_MO 0
#define CPUArchState struct CPURISCVState
#define TYPE_RISCV_CPU "riscv-cpu" #define TYPE_RISCV_CPU "riscv-cpu"
#define RISCV_CPU_TYPE_SUFFIX "-" TYPE_RISCV_CPU #define RISCV_CPU_TYPE_SUFFIX "-" TYPE_RISCV_CPU
@ -98,7 +86,6 @@ enum {
#define TRANSLATE_FAIL 1 #define TRANSLATE_FAIL 1
#define TRANSLATE_SUCCESS 0 #define TRANSLATE_SUCCESS 0
#define NB_MMU_MODES 4
#define MMU_USER_IDX 3 #define MMU_USER_IDX 3
#define MAX_RISCV_PMPS (16) #define MAX_RISCV_PMPS (16)

17
target/s390x/cpu-param.h Normal file
View File

@ -0,0 +1,17 @@
/*
* S/390 cpu parameters for qemu.
*
* Copyright (c) 2009 Ulrich Hecht
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef S390_CPU_PARAM_H
#define S390_CPU_PARAM_H 1
#define TARGET_LONG_BITS 64
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 64
#define TARGET_VIRT_ADDR_SPACE_BITS 64
#define NB_MMU_MODES 4
#endif

View File

@ -24,26 +24,17 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "cpu_models.h" #include "cpu_models.h"
#include "exec/cpu-defs.h"
#define TARGET_LONG_BITS 64
#define ELF_MACHINE_UNAME "S390X" #define ELF_MACHINE_UNAME "S390X"
#define CPUArchState struct CPUS390XState #define CPUArchState struct CPUS390XState
#include "exec/cpu-defs.h"
/* The z/Architecture has a strong memory model with some store-after-load re-ordering */ /* The z/Architecture has a strong memory model with some store-after-load re-ordering */
#define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) #define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD)
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 64
#define TARGET_VIRT_ADDR_SPACE_BITS 64
#include "exec/cpu-all.h" #include "exec/cpu-all.h"
#define NB_MMU_MODES 4
#define TARGET_INSN_START_EXTRA_WORDS 1 #define TARGET_INSN_START_EXTRA_WORDS 1
#define MMU_MODE0_SUFFIX _primary #define MMU_MODE0_SUFFIX _primary

21
target/sh4/cpu-param.h Normal file
View File

@ -0,0 +1,21 @@
/*
* SH4 cpu parameters for qemu.
*
* Copyright (c) 2005 Samuel Tardieu
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef SH4_CPU_PARAM_H
#define SH4_CPU_PARAM_H 1
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12 /* 4k */
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#ifdef CONFIG_USER_ONLY
# define TARGET_VIRT_ADDR_SPACE_BITS 31
#else
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#define NB_MMU_MODES 2
#endif

View File

@ -22,8 +22,8 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/cpu-defs.h"
#define TARGET_LONG_BITS 32
#define ALIGNED_ONLY #define ALIGNED_ONLY
/* CPU Subtypes */ /* CPU Subtypes */
@ -38,17 +38,6 @@
#define CPUArchState struct CPUSH4State #define CPUArchState struct CPUSH4State
#include "exec/cpu-defs.h"
#define TARGET_PAGE_BITS 12 /* 4k XXXXX */
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#ifdef CONFIG_USER_ONLY
# define TARGET_VIRT_ADDR_SPACE_BITS 31
#else
# define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#define SR_MD 30 #define SR_MD 30
#define SR_RB 29 #define SR_RB 29
#define SR_BL 28 #define SR_BL 28
@ -132,7 +121,6 @@ typedef struct tlb_t {
#define UTLB_SIZE 64 #define UTLB_SIZE 64
#define ITLB_SIZE 4 #define ITLB_SIZE 4
#define NB_MMU_MODES 2
#define TARGET_INSN_START_EXTRA_WORDS 1 #define TARGET_INSN_START_EXTRA_WORDS 1
enum sh_features { enum sh_features {

28
target/sparc/cpu-param.h Normal file
View File

@ -0,0 +1,28 @@
/*
* Sparc cpu parameters for qemu.
*
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef SPARC_CPU_PARAM_H
#define SPARC_CPU_PARAM_H 1
#ifdef TARGET_SPARC64
# define TARGET_LONG_BITS 64
# define TARGET_PAGE_BITS 13 /* 8k */
# define TARGET_PHYS_ADDR_SPACE_BITS 41
# ifdef TARGET_ABI32
# define TARGET_VIRT_ADDR_SPACE_BITS 32
# else
# define TARGET_VIRT_ADDR_SPACE_BITS 44
# endif
# define NB_MMU_MODES 6
#else
# define TARGET_LONG_BITS 32
# define TARGET_PAGE_BITS 12 /* 4k */
# define TARGET_PHYS_ADDR_SPACE_BITS 36
# define TARGET_VIRT_ADDR_SPACE_BITS 32
# define NB_MMU_MODES 3
#endif
#endif

View File

@ -4,31 +4,18 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/bswap.h" #include "qemu/bswap.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/cpu-defs.h"
#define ALIGNED_ONLY #define ALIGNED_ONLY
#if !defined(TARGET_SPARC64) #if !defined(TARGET_SPARC64)
#define TARGET_LONG_BITS 32
#define TARGET_DPREGS 16 #define TARGET_DPREGS 16
#define TARGET_PAGE_BITS 12 /* 4k */
#define TARGET_PHYS_ADDR_SPACE_BITS 36
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#else #else
#define TARGET_LONG_BITS 64
#define TARGET_DPREGS 32 #define TARGET_DPREGS 32
#define TARGET_PAGE_BITS 13 /* 8k */
#define TARGET_PHYS_ADDR_SPACE_BITS 41
# ifdef TARGET_ABI32
# define TARGET_VIRT_ADDR_SPACE_BITS 32
# else
# define TARGET_VIRT_ADDR_SPACE_BITS 44
# endif
#endif #endif
#define CPUArchState struct CPUSPARCState #define CPUArchState struct CPUSPARCState
#include "exec/cpu-defs.h"
/*#define EXCP_INTERRUPT 0x100*/ /*#define EXCP_INTERRUPT 0x100*/
/* trap definitions */ /* trap definitions */
@ -225,10 +212,7 @@ enum {
#define MIN_NWINDOWS 3 #define MIN_NWINDOWS 3
#define MAX_NWINDOWS 32 #define MAX_NWINDOWS 32
#if !defined(TARGET_SPARC64) #ifdef TARGET_SPARC64
#define NB_MMU_MODES 3
#else
#define NB_MMU_MODES 6
typedef struct trap_state { typedef struct trap_state {
uint64_t tpc; uint64_t tpc;
uint64_t tnpc; uint64_t tnpc;

17
target/tilegx/cpu-param.h Normal file
View File

@ -0,0 +1,17 @@
/*
* TILE-Gx cpu parameters for qemu.
*
* Copyright (c) 2015 Chen Gang
* SPDX-License-Identifier: LGPL-2.0+
*/
#ifndef TILEGX_CPU_PARAM_H
#define TILEGX_CPU_PARAM_H 1
#define TARGET_LONG_BITS 64
#define TARGET_PAGE_BITS 16 /* TILE-Gx uses 64KB page size */
#define TARGET_PHYS_ADDR_SPACE_BITS 42
#define TARGET_VIRT_ADDR_SPACE_BITS 64
#define NB_MMU_MODES 1
#endif

View File

@ -21,13 +21,9 @@
#define TILEGX_CPU_H #define TILEGX_CPU_H
#include "qemu-common.h" #include "qemu-common.h"
#define TARGET_LONG_BITS 64
#define CPUArchState struct CPUTLGState
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#define CPUArchState struct CPUTLGState
/* TILE-Gx common register alias */ /* TILE-Gx common register alias */
#define TILEGX_R_RE 0 /* 0 register, for function/syscall return value */ #define TILEGX_R_RE 0 /* 0 register, for function/syscall return value */
@ -154,9 +150,6 @@ static inline TileGXCPU *tilegx_env_get_cpu(CPUTLGState *env)
#define ENV_OFFSET offsetof(TileGXCPU, env) #define ENV_OFFSET offsetof(TileGXCPU, env)
/* TILE-Gx memory attributes */ /* TILE-Gx memory attributes */
#define TARGET_PAGE_BITS 16 /* TILE-Gx uses 64KB page size */
#define TARGET_PHYS_ADDR_SPACE_BITS 42
#define TARGET_VIRT_ADDR_SPACE_BITS 64
#define MMU_USER_IDX 0 /* Current memory operation is in user mode */ #define MMU_USER_IDX 0 /* Current memory operation is in user mode */
#include "exec/cpu-all.h" #include "exec/cpu-all.h"

View File

@ -0,0 +1,17 @@
/*
* TriCore cpu parameters for qemu.
*
* Copyright (c) 2012-2014 Bastian Koppelmann C-Lab/University Paderborn
* SPDX-License-Identifier: LGPL-2.1+
*/
#ifndef TRICORE_CPU_PARAM_H
#define TRICORE_CPU_PARAM_H 1
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 14
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define NB_MMU_MODES 3
#endif

View File

@ -20,10 +20,10 @@
#ifndef TRICORE_CPU_H #ifndef TRICORE_CPU_H
#define TRICORE_CPU_H #define TRICORE_CPU_H
#include "tricore-defs.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "tricore-defs.h"
#define CPUArchState struct CPUTriCoreState #define CPUArchState struct CPUTriCoreState
@ -31,8 +31,6 @@ struct CPUTriCoreState;
struct tricore_boot_info; struct tricore_boot_info;
#define NB_MMU_MODES 3
typedef struct tricore_def_t tricore_def_t; typedef struct tricore_def_t tricore_def_t;
typedef struct CPUTriCoreState CPUTriCoreState; typedef struct CPUTriCoreState CPUTriCoreState;

View File

@ -18,11 +18,6 @@
#ifndef QEMU_TRICORE_DEFS_H #ifndef QEMU_TRICORE_DEFS_H
#define QEMU_TRICORE_DEFS_H #define QEMU_TRICORE_DEFS_H
#define TARGET_PAGE_BITS 14
#define TARGET_LONG_BITS 32
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define TRICORE_TLB_MAX 128 #define TRICORE_TLB_MAX 128
#endif /* QEMU_TRICORE_DEFS_H */ #endif /* QEMU_TRICORE_DEFS_H */

View File

@ -0,0 +1,17 @@
/*
* UniCore32 cpu parameters for qemu.
*
* Copyright (C) 2010-2012 Guan Xuetao
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef UNICORE32_CPU_PARAM_H
#define UNICORE32_CPU_PARAM_H 1
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define NB_MMU_MODES 2
#endif

View File

@ -12,19 +12,11 @@
#ifndef UNICORE32_CPU_H #ifndef UNICORE32_CPU_H
#define UNICORE32_CPU_H #define UNICORE32_CPU_H
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#define CPUArchState struct CPUUniCore32State
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#define NB_MMU_MODES 2 #define CPUArchState struct CPUUniCore32State
typedef struct CPUUniCore32State { typedef struct CPUUniCore32State {
/* Regs for current mode. */ /* Regs for current mode. */

21
target/xtensa/cpu-param.h Normal file
View File

@ -0,0 +1,21 @@
/*
* Xtensa cpu parameters for qemu.
*
* Copyright (c) 2011, Max Filippov, Open Source and Linux Lab.
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef XTENSA_CPU_PARAM_H
#define XTENSA_CPU_PARAM_H 1
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#ifdef CONFIG_USER_ONLY
#define TARGET_VIRT_ADDR_SPACE_BITS 30
#else
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#define NB_MMU_MODES 4
#endif

View File

@ -28,28 +28,17 @@
#ifndef XTENSA_CPU_H #ifndef XTENSA_CPU_H
#define XTENSA_CPU_H #define XTENSA_CPU_H
#define ALIGNED_ONLY
#define TARGET_LONG_BITS 32
/* Xtensa processors have a weak memory model */
#define TCG_GUEST_DEFAULT_MO (0)
#define CPUArchState struct CPUXtensaState
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu-qom.h" #include "cpu-qom.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "xtensa-isa.h" #include "xtensa-isa.h"
#define NB_MMU_MODES 4 #define ALIGNED_ONLY
#define TARGET_PHYS_ADDR_SPACE_BITS 32 /* Xtensa processors have a weak memory model */
#ifdef CONFIG_USER_ONLY #define TCG_GUEST_DEFAULT_MO (0)
#define TARGET_VIRT_ADDR_SPACE_BITS 30
#else #define CPUArchState struct CPUXtensaState
#define TARGET_VIRT_ADDR_SPACE_BITS 32
#endif
#define TARGET_PAGE_BITS 12
enum { enum {
/* Additional instructions */ /* Additional instructions */