tcg: Move MAX_CODE_GEN_BUFFER_SIZE to tcg-target.h
Remove the ifdef ladder and move each define into the appropriate header file. Reviewed-by: Luis Pires <luis.pires@eldorado.org.br> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
0e2d61cf29
commit
26a75d12d3
|
@ -15,6 +15,7 @@
|
||||||
|
|
||||||
#define TCG_TARGET_INSN_UNIT_SIZE 4
|
#define TCG_TARGET_INSN_UNIT_SIZE 4
|
||||||
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 24
|
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 24
|
||||||
|
#define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB)
|
||||||
#undef TCG_TARGET_STACK_GROWSUP
|
#undef TCG_TARGET_STACK_GROWSUP
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
|
|
@ -60,6 +60,7 @@ extern int arm_arch;
|
||||||
#undef TCG_TARGET_STACK_GROWSUP
|
#undef TCG_TARGET_STACK_GROWSUP
|
||||||
#define TCG_TARGET_INSN_UNIT_SIZE 4
|
#define TCG_TARGET_INSN_UNIT_SIZE 4
|
||||||
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 16
|
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 16
|
||||||
|
#define MAX_CODE_GEN_BUFFER_SIZE UINT32_MAX
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
TCG_REG_R0 = 0,
|
TCG_REG_R0 = 0,
|
||||||
|
|
|
@ -31,9 +31,11 @@
|
||||||
#ifdef __x86_64__
|
#ifdef __x86_64__
|
||||||
# define TCG_TARGET_REG_BITS 64
|
# define TCG_TARGET_REG_BITS 64
|
||||||
# define TCG_TARGET_NB_REGS 32
|
# define TCG_TARGET_NB_REGS 32
|
||||||
|
# define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB)
|
||||||
#else
|
#else
|
||||||
# define TCG_TARGET_REG_BITS 32
|
# define TCG_TARGET_REG_BITS 32
|
||||||
# define TCG_TARGET_NB_REGS 24
|
# define TCG_TARGET_NB_REGS 24
|
||||||
|
# define MAX_CODE_GEN_BUFFER_SIZE UINT32_MAX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
|
|
@ -39,6 +39,12 @@
|
||||||
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 16
|
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 16
|
||||||
#define TCG_TARGET_NB_REGS 32
|
#define TCG_TARGET_NB_REGS 32
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We have a 256MB branch region, but leave room to make sure the
|
||||||
|
* main executable is also within that region.
|
||||||
|
*/
|
||||||
|
#define MAX_CODE_GEN_BUFFER_SIZE (128 * MiB)
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
TCG_REG_ZERO = 0,
|
TCG_REG_ZERO = 0,
|
||||||
TCG_REG_AT,
|
TCG_REG_AT,
|
||||||
|
|
|
@ -27,8 +27,10 @@
|
||||||
|
|
||||||
#ifdef _ARCH_PPC64
|
#ifdef _ARCH_PPC64
|
||||||
# define TCG_TARGET_REG_BITS 64
|
# define TCG_TARGET_REG_BITS 64
|
||||||
|
# define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB)
|
||||||
#else
|
#else
|
||||||
# define TCG_TARGET_REG_BITS 32
|
# define TCG_TARGET_REG_BITS 32
|
||||||
|
# define MAX_CODE_GEN_BUFFER_SIZE (32 * MiB)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define TCG_TARGET_NB_REGS 64
|
#define TCG_TARGET_NB_REGS 64
|
||||||
|
|
33
tcg/region.c
33
tcg/region.c
|
@ -401,37 +401,14 @@ static size_t tcg_n_regions(unsigned max_cpus)
|
||||||
/*
|
/*
|
||||||
* Minimum size of the code gen buffer. This number is randomly chosen,
|
* Minimum size of the code gen buffer. This number is randomly chosen,
|
||||||
* but not so small that we can't have a fair number of TB's live.
|
* but not so small that we can't have a fair number of TB's live.
|
||||||
|
*
|
||||||
|
* Maximum size, MAX_CODE_GEN_BUFFER_SIZE, is defined in tcg-target.h.
|
||||||
|
* Unless otherwise indicated, this is constrained by the range of
|
||||||
|
* direct branches on the host cpu, as used by the TCG implementation
|
||||||
|
* of goto_tb.
|
||||||
*/
|
*/
|
||||||
#define MIN_CODE_GEN_BUFFER_SIZE (1 * MiB)
|
#define MIN_CODE_GEN_BUFFER_SIZE (1 * MiB)
|
||||||
|
|
||||||
/*
|
|
||||||
* Maximum size of the code gen buffer we'd like to use. Unless otherwise
|
|
||||||
* indicated, this is constrained by the range of direct branches on the
|
|
||||||
* host cpu, as used by the TCG implementation of goto_tb.
|
|
||||||
*/
|
|
||||||
#if defined(__x86_64__)
|
|
||||||
# define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB)
|
|
||||||
#elif defined(__sparc__)
|
|
||||||
# define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB)
|
|
||||||
#elif defined(__powerpc64__)
|
|
||||||
# define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB)
|
|
||||||
#elif defined(__powerpc__)
|
|
||||||
# define MAX_CODE_GEN_BUFFER_SIZE (32 * MiB)
|
|
||||||
#elif defined(__aarch64__)
|
|
||||||
# define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB)
|
|
||||||
#elif defined(__s390x__)
|
|
||||||
/* We have a +- 4GB range on the branches; leave some slop. */
|
|
||||||
# define MAX_CODE_GEN_BUFFER_SIZE (3 * GiB)
|
|
||||||
#elif defined(__mips__)
|
|
||||||
/*
|
|
||||||
* We have a 256MB branch region, but leave room to make sure the
|
|
||||||
* main executable is also within that region.
|
|
||||||
*/
|
|
||||||
# define MAX_CODE_GEN_BUFFER_SIZE (128 * MiB)
|
|
||||||
#else
|
|
||||||
# define MAX_CODE_GEN_BUFFER_SIZE ((size_t)-1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if TCG_TARGET_REG_BITS == 32
|
#if TCG_TARGET_REG_BITS == 32
|
||||||
#define DEFAULT_CODE_GEN_BUFFER_SIZE_1 (32 * MiB)
|
#define DEFAULT_CODE_GEN_BUFFER_SIZE_1 (32 * MiB)
|
||||||
#ifdef CONFIG_USER_ONLY
|
#ifdef CONFIG_USER_ONLY
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#define TCG_TARGET_INSN_UNIT_SIZE 4
|
#define TCG_TARGET_INSN_UNIT_SIZE 4
|
||||||
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 20
|
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 20
|
||||||
#define TCG_TARGET_NB_REGS 32
|
#define TCG_TARGET_NB_REGS 32
|
||||||
|
#define MAX_CODE_GEN_BUFFER_SIZE ((size_t)-1)
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
TCG_REG_ZERO,
|
TCG_REG_ZERO,
|
||||||
|
|
|
@ -28,6 +28,9 @@
|
||||||
#define TCG_TARGET_INSN_UNIT_SIZE 2
|
#define TCG_TARGET_INSN_UNIT_SIZE 2
|
||||||
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 19
|
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 19
|
||||||
|
|
||||||
|
/* We have a +- 4GB range on the branches; leave some slop. */
|
||||||
|
#define MAX_CODE_GEN_BUFFER_SIZE (3 * GiB)
|
||||||
|
|
||||||
typedef enum TCGReg {
|
typedef enum TCGReg {
|
||||||
TCG_REG_R0 = 0,
|
TCG_REG_R0 = 0,
|
||||||
TCG_REG_R1,
|
TCG_REG_R1,
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
#define TCG_TARGET_INSN_UNIT_SIZE 4
|
#define TCG_TARGET_INSN_UNIT_SIZE 4
|
||||||
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 32
|
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 32
|
||||||
#define TCG_TARGET_NB_REGS 32
|
#define TCG_TARGET_NB_REGS 32
|
||||||
|
#define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB)
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
TCG_REG_G0 = 0,
|
TCG_REG_G0 = 0,
|
||||||
|
|
|
@ -43,6 +43,7 @@
|
||||||
#define TCG_TARGET_INTERPRETER 1
|
#define TCG_TARGET_INTERPRETER 1
|
||||||
#define TCG_TARGET_INSN_UNIT_SIZE 1
|
#define TCG_TARGET_INSN_UNIT_SIZE 1
|
||||||
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 32
|
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 32
|
||||||
|
#define MAX_CODE_GEN_BUFFER_SIZE ((size_t)-1)
|
||||||
|
|
||||||
#if UINTPTR_MAX == UINT32_MAX
|
#if UINTPTR_MAX == UINT32_MAX
|
||||||
# define TCG_TARGET_REG_BITS 32
|
# define TCG_TARGET_REG_BITS 32
|
||||||
|
|
Loading…
Reference in a new issue