diff options
Diffstat (limited to 'target-alpha')
-rw-r--r-- | target-alpha/exec.h | 9 | ||||
-rw-r--r-- | target-alpha/op_helper.c | 20 | ||||
-rw-r--r-- | target-alpha/translate.c | 90 |
3 files changed, 58 insertions, 61 deletions
diff --git a/target-alpha/exec.h b/target-alpha/exec.h index 35d6a16775..3533eb1719 100644 --- a/target-alpha/exec.h +++ b/target-alpha/exec.h @@ -39,20 +39,21 @@ register struct CPUAlphaState *env asm(AREG0); #include "softmmu_exec.h" #endif /* !defined(CONFIG_USER_ONLY) */ -static always_inline void env_to_regs(void) +static inline void env_to_regs(void) { } -static always_inline void regs_to_env(void) +static inline void regs_to_env(void) { } -static always_inline int cpu_has_work(CPUState *env) +static inline int cpu_has_work(CPUState *env) { return (env->interrupt_request & CPU_INTERRUPT_HARD); } -static always_inline int cpu_halted(CPUState *env) { +static inline int cpu_halted(CPUState *env) +{ if (!env->halted) return 0; if (cpu_has_work(env)) { diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index 22812ca469..e9d2732dfb 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -200,7 +200,7 @@ uint64_t helper_cttz (uint64_t arg) return ctz64(arg); } -static always_inline uint64_t byte_zap (uint64_t op, uint8_t mskb) +static inline uint64_t byte_zap(uint64_t op, uint8_t mskb) { uint64_t mask; @@ -322,7 +322,7 @@ uint64_t helper_cmpbge (uint64_t op1, uint64_t op2) /* Floating point helpers */ /* F floating (VAX) */ -static always_inline uint64_t float32_to_f (float32 fa) +static inline uint64_t float32_to_f(float32 fa) { uint64_t r, exp, mant, sig; CPU_FloatU a; @@ -355,7 +355,7 @@ static always_inline uint64_t float32_to_f (float32 fa) return r; } -static always_inline float32 f_to_float32 (uint64_t a) +static inline float32 f_to_float32(uint64_t a) { uint32_t exp, mant_sig; CPU_FloatU r; @@ -449,7 +449,7 @@ uint64_t helper_sqrtf (uint64_t t) /* G floating (VAX) */ -static always_inline uint64_t float64_to_g (float64 fa) +static inline uint64_t float64_to_g(float64 fa) { uint64_t r, exp, mant, sig; CPU_DoubleU a; @@ -482,7 +482,7 @@ static always_inline uint64_t float64_to_g (float64 fa) return r; } -static always_inline float64 g_to_float64 (uint64_t a) +static inline float64 g_to_float64(uint64_t a) { uint64_t exp, mant_sig; CPU_DoubleU r; @@ -576,7 +576,7 @@ uint64_t helper_sqrtg (uint64_t a) /* S floating (single) */ -static always_inline uint64_t float32_to_s (float32 fa) +static inline uint64_t float32_to_s(float32 fa) { CPU_FloatU a; uint64_t r; @@ -589,7 +589,7 @@ static always_inline uint64_t float32_to_s (float32 fa) return r; } -static always_inline float32 s_to_float32 (uint64_t a) +static inline float32 s_to_float32(uint64_t a) { CPU_FloatU r; r.l = ((a >> 32) & 0xc0000000) | ((a >> 29) & 0x3fffffff); @@ -660,7 +660,7 @@ uint64_t helper_sqrts (uint64_t a) /* T floating (double) */ -static always_inline float64 t_to_float64 (uint64_t a) +static inline float64 t_to_float64(uint64_t a) { /* Memory format is the same as float64 */ CPU_DoubleU r; @@ -668,7 +668,7 @@ static always_inline float64 t_to_float64 (uint64_t a) return r.d; } -static always_inline uint64_t float64_to_t (float64 fa) +static inline uint64_t float64_to_t(float64 fa) { /* Memory format is the same as float64 */ CPU_DoubleU r; @@ -939,7 +939,7 @@ uint64_t helper_cvtlq (uint64_t a) return (int64_t)((int32_t)((a >> 32) | ((a >> 29) & 0x3FFFFFFF))); } -static always_inline uint64_t __helper_cvtql (uint64_t a, int s, int v) +static inline uint64_t __helper_cvtql(uint64_t a, int s, int v) { uint64_t r; diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 1fc5119cb5..1dd85629b3 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -103,8 +103,7 @@ static void alpha_translate_init(void) done_init = 1; } -static always_inline void gen_excp (DisasContext *ctx, - int exception, int error_code) +static inline void gen_excp(DisasContext *ctx, int exception, int error_code) { TCGv_i32 tmp1, tmp2; @@ -116,12 +115,12 @@ static always_inline void gen_excp (DisasContext *ctx, tcg_temp_free_i32(tmp1); } -static always_inline void gen_invalid (DisasContext *ctx) +static inline void gen_invalid(DisasContext *ctx) { gen_excp(ctx, EXCP_OPCDEC, 0); } -static always_inline void gen_qemu_ldf (TCGv t0, TCGv t1, int flags) +static inline void gen_qemu_ldf(TCGv t0, TCGv t1, int flags) { TCGv tmp = tcg_temp_new(); TCGv_i32 tmp32 = tcg_temp_new_i32(); @@ -132,7 +131,7 @@ static always_inline void gen_qemu_ldf (TCGv t0, TCGv t1, int flags) tcg_temp_free(tmp); } -static always_inline void gen_qemu_ldg (TCGv t0, TCGv t1, int flags) +static inline void gen_qemu_ldg(TCGv t0, TCGv t1, int flags) { TCGv tmp = tcg_temp_new(); tcg_gen_qemu_ld64(tmp, t1, flags); @@ -140,7 +139,7 @@ static always_inline void gen_qemu_ldg (TCGv t0, TCGv t1, int flags) tcg_temp_free(tmp); } -static always_inline void gen_qemu_lds (TCGv t0, TCGv t1, int flags) +static inline void gen_qemu_lds(TCGv t0, TCGv t1, int flags) { TCGv tmp = tcg_temp_new(); TCGv_i32 tmp32 = tcg_temp_new_i32(); @@ -151,22 +150,23 @@ static always_inline void gen_qemu_lds (TCGv t0, TCGv t1, int flags) tcg_temp_free(tmp); } -static always_inline void gen_qemu_ldl_l (TCGv t0, TCGv t1, int flags) +static inline void gen_qemu_ldl_l(TCGv t0, TCGv t1, int flags) { tcg_gen_mov_i64(cpu_lock, t1); tcg_gen_qemu_ld32s(t0, t1, flags); } -static always_inline void gen_qemu_ldq_l (TCGv t0, TCGv t1, int flags) +static inline void gen_qemu_ldq_l(TCGv t0, TCGv t1, int flags) { tcg_gen_mov_i64(cpu_lock, t1); tcg_gen_qemu_ld64(t0, t1, flags); } -static always_inline void gen_load_mem (DisasContext *ctx, - void (*tcg_gen_qemu_load)(TCGv t0, TCGv t1, int flags), - int ra, int rb, int32_t disp16, - int fp, int clear) +static inline void gen_load_mem(DisasContext *ctx, + void (*tcg_gen_qemu_load)(TCGv t0, TCGv t1, + int flags), + int ra, int rb, int32_t disp16, int fp, + int clear) { TCGv addr; @@ -190,7 +190,7 @@ static always_inline void gen_load_mem (DisasContext *ctx, tcg_temp_free(addr); } -static always_inline void gen_qemu_stf (TCGv t0, TCGv t1, int flags) +static inline void gen_qemu_stf(TCGv t0, TCGv t1, int flags) { TCGv_i32 tmp32 = tcg_temp_new_i32(); TCGv tmp = tcg_temp_new(); @@ -201,7 +201,7 @@ static always_inline void gen_qemu_stf (TCGv t0, TCGv t1, int flags) tcg_temp_free_i32(tmp32); } -static always_inline void gen_qemu_stg (TCGv t0, TCGv t1, int flags) +static inline void gen_qemu_stg(TCGv t0, TCGv t1, int flags) { TCGv tmp = tcg_temp_new(); gen_helper_g_to_memory(tmp, t0); @@ -209,7 +209,7 @@ static always_inline void gen_qemu_stg (TCGv t0, TCGv t1, int flags) tcg_temp_free(tmp); } -static always_inline void gen_qemu_sts (TCGv t0, TCGv t1, int flags) +static inline void gen_qemu_sts(TCGv t0, TCGv t1, int flags) { TCGv_i32 tmp32 = tcg_temp_new_i32(); TCGv tmp = tcg_temp_new(); @@ -220,7 +220,7 @@ static always_inline void gen_qemu_sts (TCGv t0, TCGv t1, int flags) tcg_temp_free_i32(tmp32); } -static always_inline void gen_qemu_stl_c (TCGv t0, TCGv t1, int flags) +static inline void gen_qemu_stl_c(TCGv t0, TCGv t1, int flags) { int l1, l2; @@ -236,7 +236,7 @@ static always_inline void gen_qemu_stl_c (TCGv t0, TCGv t1, int flags) tcg_gen_movi_i64(cpu_lock, -1); } -static always_inline void gen_qemu_stq_c (TCGv t0, TCGv t1, int flags) +static inline void gen_qemu_stq_c(TCGv t0, TCGv t1, int flags) { int l1, l2; @@ -252,10 +252,11 @@ static always_inline void gen_qemu_stq_c (TCGv t0, TCGv t1, int flags) tcg_gen_movi_i64(cpu_lock, -1); } -static always_inline void gen_store_mem (DisasContext *ctx, - void (*tcg_gen_qemu_store)(TCGv t0, TCGv t1, int flags), - int ra, int rb, int32_t disp16, - int fp, int clear, int local) +static inline void gen_store_mem(DisasContext *ctx, + void (*tcg_gen_qemu_store)(TCGv t0, TCGv t1, + int flags), + int ra, int rb, int32_t disp16, int fp, + int clear, int local) { TCGv addr; if (local) @@ -288,9 +289,8 @@ static always_inline void gen_store_mem (DisasContext *ctx, tcg_temp_free(addr); } -static always_inline void gen_bcond (DisasContext *ctx, - TCGCond cond, - int ra, int32_t disp, int mask) +static inline void gen_bcond(DisasContext *ctx, TCGCond cond, int ra, + int32_t disp, int mask) { int l1, l2; @@ -317,8 +317,8 @@ static always_inline void gen_bcond (DisasContext *ctx, gen_set_label(l2); } -static always_inline void gen_fbcond (DisasContext *ctx, int opc, - int ra, int32_t disp16) +static inline void gen_fbcond(DisasContext *ctx, int opc, int ra, + int32_t disp16) { int l1, l2; TCGv tmp; @@ -363,9 +363,8 @@ static always_inline void gen_fbcond (DisasContext *ctx, int opc, gen_set_label(l2); } -static always_inline void gen_cmov (TCGCond inv_cond, - int ra, int rb, int rc, - int islit, uint8_t lit, int mask) +static inline void gen_cmov(TCGCond inv_cond, int ra, int rb, int rc, + int islit, uint8_t lit, int mask) { int l1; @@ -397,7 +396,7 @@ static always_inline void gen_cmov (TCGCond inv_cond, } #define FARITH2(name) \ -static always_inline void glue(gen_f, name)(int rb, int rc) \ +static inline void glue(gen_f, name)(int rb, int rc) \ { \ if (unlikely(rc == 31)) \ return; \ @@ -429,7 +428,7 @@ FARITH2(cvtqlv) FARITH2(cvtqlsv) #define FARITH3(name) \ -static always_inline void glue(gen_f, name) (int ra, int rb, int rc) \ +static inline void glue(gen_f, name)(int ra, int rb, int rc) \ { \ if (unlikely(rc == 31)) \ return; \ @@ -480,7 +479,7 @@ FARITH3(cpysn) FARITH3(cpyse) #define FCMOV(name) \ -static always_inline void glue(gen_f, name) (int ra, int rb, int rc) \ +static inline void glue(gen_f, name)(int ra, int rb, int rc) \ { \ int l1; \ TCGv tmp; \ @@ -512,9 +511,8 @@ FCMOV(cmpfle) FCMOV(cmpfgt) /* EXTWH, EXTWH, EXTLH, EXTQH */ -static always_inline void gen_ext_h(void (*tcg_gen_ext_i64)(TCGv t0, TCGv t1), - int ra, int rb, int rc, - int islit, uint8_t lit) +static inline void gen_ext_h(void(*tcg_gen_ext_i64)(TCGv t0, TCGv t1), + int ra, int rb, int rc, int islit, uint8_t lit) { if (unlikely(rc == 31)) return; @@ -543,9 +541,8 @@ static always_inline void gen_ext_h(void (*tcg_gen_ext_i64)(TCGv t0, TCGv t1), } /* EXTBL, EXTWL, EXTWL, EXTLL, EXTQL */ -static always_inline void gen_ext_l(void (*tcg_gen_ext_i64)(TCGv t0, TCGv t1), - int ra, int rb, int rc, - int islit, uint8_t lit) +static inline void gen_ext_l(void(*tcg_gen_ext_i64)(TCGv t0, TCGv t1), + int ra, int rb, int rc, int islit, uint8_t lit) { if (unlikely(rc == 31)) return; @@ -568,8 +565,8 @@ static always_inline void gen_ext_l(void (*tcg_gen_ext_i64)(TCGv t0, TCGv t1), /* Code to call arith3 helpers */ #define ARITH3(name) \ -static always_inline void glue(gen_, name) (int ra, int rb, int rc, \ - int islit, uint8_t lit) \ +static inline void glue(gen_, name)(int ra, int rb, int rc, int islit,\ + uint8_t lit) \ { \ if (unlikely(rc == 31)) \ return; \ @@ -617,9 +614,8 @@ ARITH3(umulh) ARITH3(mullv) ARITH3(mulqv) -static always_inline void gen_cmp(TCGCond cond, - int ra, int rb, int rc, - int islit, uint8_t lit) +static inline void gen_cmp(TCGCond cond, int ra, int rb, int rc, int islit, + uint8_t lit) { int l1, l2; TCGv tmp; @@ -647,7 +643,7 @@ static always_inline void gen_cmp(TCGCond cond, gen_set_label(l2); } -static always_inline int translate_one (DisasContext *ctx, uint32_t insn) +static inline int translate_one(DisasContext *ctx, uint32_t insn) { uint32_t palcode; int32_t disp21, disp16, disp12; @@ -2336,9 +2332,9 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) return ret; } -static always_inline void gen_intermediate_code_internal (CPUState *env, - TranslationBlock *tb, - int search_pc) +static inline void gen_intermediate_code_internal(CPUState *env, + TranslationBlock *tb, + int search_pc) { #if defined ALPHA_DEBUG_DISAS static int insn_count; |