From e4d58b41f9fb6d7ea8281fe42fd5e00db2fd1455 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 2 Jun 2010 17:26:56 -0700 Subject: [PATCH] tcg: Make some tcg-target.c routines static. Both tcg_target_init and tcg_target_qemu_prologue are unused outside of tcg.c. Signed-off-by: Richard Henderson Signed-off-by: Aurelien Jarno --- tcg/arm/tcg-target.c | 4 ++-- tcg/hppa/tcg-target.c | 4 ++-- tcg/i386/tcg-target.c | 4 ++-- tcg/ia64/tcg-target.c | 4 ++-- tcg/mips/tcg-target.c | 4 ++-- tcg/ppc/tcg-target.c | 4 ++-- tcg/ppc64/tcg-target.c | 4 ++-- tcg/s390/tcg-target.c | 4 ++-- tcg/sparc/tcg-target.c | 4 ++-- tcg/tcg.c | 2 ++ tcg/tcg.h | 3 --- tcg/x86_64/tcg-target.c | 4 ++-- 12 files changed, 22 insertions(+), 23 deletions(-) diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index b3169a9da6..a3af5b222e 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c @@ -1746,7 +1746,7 @@ static const TCGTargetOpDef arm_op_defs[] = { { -1 }, }; -void tcg_target_init(TCGContext *s) +static void tcg_target_init(TCGContext *s) { #if !defined(CONFIG_USER_ONLY) /* fail safe */ @@ -1809,7 +1809,7 @@ static inline void tcg_out_movi(TCGContext *s, TCGType type, tcg_out_movi32(s, COND_AL, ret, arg); } -void tcg_target_qemu_prologue(TCGContext *s) +static void tcg_target_qemu_prologue(TCGContext *s) { /* There is no need to save r7, it is used to store the address of the env structure and is not modified by GCC. */ diff --git a/tcg/hppa/tcg-target.c b/tcg/hppa/tcg-target.c index a5f2162e5d..7f4653e342 100644 --- a/tcg/hppa/tcg-target.c +++ b/tcg/hppa/tcg-target.c @@ -1600,7 +1600,7 @@ static int tcg_target_callee_save_regs[] = { TCG_REG_R18 }; -void tcg_target_qemu_prologue(TCGContext *s) +static void tcg_target_qemu_prologue(TCGContext *s) { int frame_size, i; @@ -1652,7 +1652,7 @@ void tcg_target_qemu_prologue(TCGContext *s) TCG_REG_SP, -frame_size, INSN_LDWM); } -void tcg_target_init(TCGContext *s) +static void tcg_target_init(TCGContext *s) { tcg_regset_set32(tcg_target_available_regs[TCG_TYPE_I32], 0, 0xffffffff); diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c index 8745ad188d..147ba1744f 100644 --- a/tcg/i386/tcg-target.c +++ b/tcg/i386/tcg-target.c @@ -1430,7 +1430,7 @@ static int tcg_target_callee_save_regs[] = { }; /* Generate global QEMU prologue and epilogue code */ -void tcg_target_qemu_prologue(TCGContext *s) +static void tcg_target_qemu_prologue(TCGContext *s) { int i, frame_size, push_size, stack_addend; @@ -1458,7 +1458,7 @@ void tcg_target_qemu_prologue(TCGContext *s) tcg_out_opc(s, OPC_RET); } -void tcg_target_init(TCGContext *s) +static void tcg_target_init(TCGContext *s) { #if !defined(CONFIG_USER_ONLY) /* fail safe */ diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.c index 0d275e92f4..a0f38771ee 100644 --- a/tcg/ia64/tcg-target.c +++ b/tcg/ia64/tcg-target.c @@ -2266,7 +2266,7 @@ static const TCGTargetOpDef ia64_op_defs[] = { }; /* Generate global QEMU prologue and epilogue code */ -void tcg_target_qemu_prologue(TCGContext *s) +static void tcg_target_qemu_prologue(TCGContext *s) { int frame_size; @@ -2321,7 +2321,7 @@ void tcg_target_qemu_prologue(TCGContext *s) TCG_REG_B0)); } -void tcg_target_init(TCGContext *s) +static void tcg_target_init(TCGContext *s) { tcg_regset_set(tcg_target_available_regs[TCG_TYPE_I32], 0xffffffffffffffffull); diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c index 8d9c12fa8d..2af7a2e818 100644 --- a/tcg/mips/tcg-target.c +++ b/tcg/mips/tcg-target.c @@ -1466,7 +1466,7 @@ static int tcg_target_callee_save_regs[] = { }; /* Generate global QEMU prologue and epilogue code */ -void tcg_target_qemu_prologue(TCGContext *s) +static void tcg_target_qemu_prologue(TCGContext *s) { int i, frame_size; @@ -1498,7 +1498,7 @@ void tcg_target_qemu_prologue(TCGContext *s) tcg_out_addi(s, TCG_REG_SP, frame_size); } -void tcg_target_init(TCGContext *s) +static void tcg_target_init(TCGContext *s) { tcg_regset_set(tcg_target_available_regs[TCG_TYPE_I32], 0xffffffff); tcg_regset_set(tcg_target_call_clobber_regs, diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c index ce078e47da..2e5bb9f884 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c @@ -900,7 +900,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc) #endif } -void tcg_target_qemu_prologue (TCGContext *s) +static void tcg_target_qemu_prologue (TCGContext *s) { int i, frame_size; @@ -1885,7 +1885,7 @@ static const TCGTargetOpDef ppc_op_defs[] = { { -1 }, }; -void tcg_target_init(TCGContext *s) +static void tcg_target_init(TCGContext *s) { tcg_regset_set32(tcg_target_available_regs[TCG_TYPE_I32], 0, 0xffffffff); tcg_regset_set32(tcg_target_call_clobber_regs, 0, diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 2d436a582e..0483d6bd78 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -860,7 +860,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc) #endif } -void tcg_target_qemu_prologue (TCGContext *s) +static void tcg_target_qemu_prologue (TCGContext *s) { int i, frame_size; #ifndef __APPLE__ @@ -1663,7 +1663,7 @@ static const TCGTargetOpDef ppc_op_defs[] = { { -1 }, }; -void tcg_target_init (TCGContext *s) +static void tcg_target_init (TCGContext *s) { tcg_regset_set32 (tcg_target_available_regs[TCG_TYPE_I32], 0, 0xffffffff); tcg_regset_set32 (tcg_target_available_regs[TCG_TYPE_I64], 0, 0xffffffff); diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c index 06b6db395f..6f08aa41d3 100644 --- a/tcg/s390/tcg-target.c +++ b/tcg/s390/tcg-target.c @@ -84,12 +84,12 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, tcg_abort(); } -void tcg_target_init(TCGContext *s) +static void tcg_target_init(TCGContext *s) { /* gets called with KVM */ } -void tcg_target_qemu_prologue(TCGContext *s) +static void tcg_target_qemu_prologue(TCGContext *s) { /* gets called with KVM */ } diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c index 9f970cd2b1..5f1353adf8 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c @@ -691,7 +691,7 @@ static void tcg_out_setcond2_i32(TCGContext *s, TCGCond cond, TCGArg ret, #endif /* Generate global QEMU prologue and epilogue code */ -void tcg_target_qemu_prologue(TCGContext *s) +static void tcg_target_qemu_prologue(TCGContext *s) { tcg_out32(s, SAVE | INSN_RD(TCG_REG_O6) | INSN_RS1(TCG_REG_O6) | INSN_IMM13(-TCG_TARGET_STACK_MINFRAME)); @@ -1533,7 +1533,7 @@ static const TCGTargetOpDef sparc_op_defs[] = { { -1 }, }; -void tcg_target_init(TCGContext *s) +static void tcg_target_init(TCGContext *s) { tcg_regset_set32(tcg_target_available_regs[TCG_TYPE_I32], 0, 0xffffffff); #if TCG_TARGET_REG_BITS == 64 diff --git a/tcg/tcg.c b/tcg/tcg.c index 32f9e17d99..3368d93a95 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -63,6 +63,8 @@ #error GUEST_BASE not supported on this host. #endif +static void tcg_target_init(TCGContext *s); +static void tcg_target_qemu_prologue(TCGContext *s); static void patch_reloc(uint8_t *code_ptr, int type, tcg_target_long value, tcg_target_long addend); diff --git a/tcg/tcg.h b/tcg/tcg.h index d6cb9e72c9..9134700cf0 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -435,9 +435,6 @@ typedef struct TCGTargetOpDef { const char *args_ct_str[TCG_MAX_OP_ARGS]; } TCGTargetOpDef; -void tcg_target_init(TCGContext *s); -void tcg_target_qemu_prologue(TCGContext *s); - #define tcg_abort() \ do {\ fprintf(stderr, "%s:%d: tcg fatal error\n", __FILE__, __LINE__);\ diff --git a/tcg/x86_64/tcg-target.c b/tcg/x86_64/tcg-target.c index 9844a5723c..490666ed60 100644 --- a/tcg/x86_64/tcg-target.c +++ b/tcg/x86_64/tcg-target.c @@ -1279,7 +1279,7 @@ static inline void tcg_out_pop(TCGContext *s, int reg) } /* Generate global QEMU prologue and epilogue code */ -void tcg_target_qemu_prologue(TCGContext *s) +static void tcg_target_qemu_prologue(TCGContext *s) { int i, frame_size, push_size, stack_addend; @@ -1417,7 +1417,7 @@ static const TCGTargetOpDef x86_64_op_defs[] = { { -1 }, }; -void tcg_target_init(TCGContext *s) +static void tcg_target_init(TCGContext *s) { #if !defined(CONFIG_USER_ONLY) /* fail safe */