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

tcg: Invert the inclusion of helper.h 

Rather than include helper.h with N values of GEN_HELPER, include a
secondary file that sets up the macros to include helper.h.  This
minimizes the files that must be rebuilt when changing the macros
for file N.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2014-04-07 22:31:41 -07:00
parent a763551ad5
commit 2ef6175aa7
100 changed files with 265 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
include/exec/helper-gen.h Normal file
View File

@ -0,0 +1,92 @@
/* Helper file for declaring TCG helper functions.
This one expands generation functions for tcg opcodes. */
#ifndef HELPER_GEN_H
#define HELPER_GEN_H 1
#include <exec/helper-head.h>
#define DEF_HELPER_FLAGS_0(name, flags, ret) \
static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \
{ \
int sizemask; \
sizemask = dh_is_64bit(ret); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 0, NULL); \
}
#define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1)) \
{ \
TCGArg args[1]; \
int sizemask = 0; \
dh_sizemask(ret, 0); \
dh_arg(t1, 1); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 1, args); \
}
#define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1), \
dh_arg_decl(t2, 2)) \
{ \
TCGArg args[2]; \
int sizemask = 0; \
dh_sizemask(ret, 0); \
dh_arg(t1, 1); \
dh_arg(t2, 2); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 2, args); \
}
#define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1), \
dh_arg_decl(t2, 2), dh_arg_decl(t3, 3)) \
{ \
TCGArg args[3]; \
int sizemask = 0; \
dh_sizemask(ret, 0); \
dh_arg(t1, 1); \
dh_arg(t2, 2); \
dh_arg(t3, 3); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 3, args); \
}
#define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1), \
dh_arg_decl(t2, 2), dh_arg_decl(t3, 3), dh_arg_decl(t4, 4)) \
{ \
TCGArg args[4]; \
int sizemask = 0; \
dh_sizemask(ret, 0); \
dh_arg(t1, 1); \
dh_arg(t2, 2); \
dh_arg(t3, 3); \
dh_arg(t4, 4); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 4, args); \
}
#define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
dh_arg_decl(t1, 1), dh_arg_decl(t2, 2), dh_arg_decl(t3, 3), \
dh_arg_decl(t4, 4), dh_arg_decl(t5, 5)) \
{ \
TCGArg args[5]; \
int sizemask = 0; \
dh_sizemask(ret, 0); \
dh_arg(t1, 1); \
dh_arg(t2, 2); \
dh_arg(t3, 3); \
dh_arg(t4, 4); \
dh_arg(t5, 5); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 5, args); \
}
#include "helper.h"
#undef DEF_HELPER_FLAGS_0
#undef DEF_HELPER_FLAGS_1
#undef DEF_HELPER_FLAGS_2
#undef DEF_HELPER_FLAGS_3
#undef DEF_HELPER_FLAGS_4
#undef DEF_HELPER_FLAGS_5
#undef GEN_HELPER
#endif /* HELPER_GEN_H */

144
include/exec/def-helper.h → include/exec/helper-head.h
View File

@ -1,5 +1,5 @@
/* Helper file for declaring TCG helper functions.
Should be included at the start and end of target-foo/helper.h.
Used by other helper files.
Targets should use DEF_HELPER_N and DEF_HELPER_FLAGS_N to declare helper
functions. Names should be specified without the helper_ prefix, and
@ -114,7 +114,6 @@
#define dh_arg_decl(t, n) glue(TCGv_, dh_alias(t)) glue(arg, n)
#define DEF_HELPER_0(name, ret) \
DEF_HELPER_FLAGS_0(name, 0, ret)
#define DEF_HELPER_1(name, ret, t1) \
@ -131,144 +130,3 @@
/* MAX_OPC_PARAM_IARGS must be set to n if last entry is DEF_HELPER_FLAGS_n. */
#endif /* DEF_HELPER_H */
#ifndef GEN_HELPER
/* Function prototypes. */
#define DEF_HELPER_FLAGS_0(name, flags, ret) \
dh_ctype(ret) HELPER(name) (void);
#define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \
dh_ctype(ret) HELPER(name) (dh_ctype(t1));
#define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \
dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2));
#define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \
dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3));
#define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \
dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \
dh_ctype(t4));
#define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \
dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \
dh_ctype(t4), dh_ctype(t5));
#undef GEN_HELPER
#define GEN_HELPER -1
#elif GEN_HELPER == 1
/* Gen functions. */
#define DEF_HELPER_FLAGS_0(name, flags, ret) \
static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \
{ \
int sizemask; \
sizemask = dh_is_64bit(ret); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 0, NULL); \
}
#define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1)) \
{ \
TCGArg args[1]; \
int sizemask = 0; \
dh_sizemask(ret, 0); \
dh_arg(t1, 1); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 1, args); \
}
#define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1), \
dh_arg_decl(t2, 2)) \
{ \
TCGArg args[2]; \
int sizemask = 0; \
dh_sizemask(ret, 0); \
dh_arg(t1, 1); \
dh_arg(t2, 2); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 2, args); \
}
#define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1), \
dh_arg_decl(t2, 2), dh_arg_decl(t3, 3)) \
{ \
TCGArg args[3]; \
int sizemask = 0; \
dh_sizemask(ret, 0); \
dh_arg(t1, 1); \
dh_arg(t2, 2); \
dh_arg(t3, 3); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 3, args); \
}
#define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) dh_arg_decl(t1, 1), \
dh_arg_decl(t2, 2), dh_arg_decl(t3, 3), dh_arg_decl(t4, 4)) \
{ \
TCGArg args[4]; \
int sizemask = 0; \
dh_sizemask(ret, 0); \
dh_arg(t1, 1); \
dh_arg(t2, 2); \
dh_arg(t3, 3); \
dh_arg(t4, 4); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 4, args); \
}
#define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
dh_arg_decl(t1, 1), dh_arg_decl(t2, 2), dh_arg_decl(t3, 3), \
dh_arg_decl(t4, 4), dh_arg_decl(t5, 5)) \
{ \
TCGArg args[5]; \
int sizemask = 0; \
dh_sizemask(ret, 0); \
dh_arg(t1, 1); \
dh_arg(t2, 2); \
dh_arg(t3, 3); \
dh_arg(t4, 4); \
dh_arg(t5, 5); \
tcg_gen_helperN(HELPER(name), flags, sizemask, dh_retvar(ret), 5, args); \
}
#undef GEN_HELPER
#define GEN_HELPER -1
#elif GEN_HELPER == 2
/* Register helpers. */
#define DEF_HELPER_FLAGS_0(name, flags, ret) { HELPER(name), #name },
#define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \
DEF_HELPER_FLAGS_0(name, flags, ret)
#define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \
DEF_HELPER_FLAGS_0(name, flags, ret)
#define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \
DEF_HELPER_FLAGS_0(name, flags, ret)
#define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \
DEF_HELPER_FLAGS_0(name, flags, ret)
#define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \
DEF_HELPER_FLAGS_0(name, flags, ret)
#undef GEN_HELPER
#define GEN_HELPER -1
#elif GEN_HELPER == -1
/* Undefine macros. */
#undef DEF_HELPER_FLAGS_0
#undef DEF_HELPER_FLAGS_1
#undef DEF_HELPER_FLAGS_2
#undef DEF_HELPER_FLAGS_3
#undef DEF_HELPER_FLAGS_4
#undef DEF_HELPER_FLAGS_5
#undef GEN_HELPER
#endif

38
include/exec/helper-proto.h Normal file
View File

@ -0,0 +1,38 @@
/* Helper file for declaring TCG helper functions.
This one expands prototypes for the helper functions. */
#ifndef HELPER_PROTO_H
#define HELPER_PROTO_H 1
#include <exec/helper-head.h>
#define DEF_HELPER_FLAGS_0(name, flags, ret) \
dh_ctype(ret) HELPER(name) (void);
#define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \
dh_ctype(ret) HELPER(name) (dh_ctype(t1));
#define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \
dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2));
#define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \
dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3));
#define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \
dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \
dh_ctype(t4));
#define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \
dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \
dh_ctype(t4), dh_ctype(t5));
#include "helper.h"
#undef DEF_HELPER_FLAGS_0
#undef DEF_HELPER_FLAGS_1
#undef DEF_HELPER_FLAGS_2
#undef DEF_HELPER_FLAGS_3
#undef DEF_HELPER_FLAGS_4
#undef DEF_HELPER_FLAGS_5
#endif /* HELPER_PROTO_H */

35
include/exec/helper-tcg.h Normal file
View File

@ -0,0 +1,35 @@
/* Helper file for declaring TCG helper functions.
This one defines data structures private to tcg.c. */
#ifndef HELPER_TCG_H
#define HELPER_TCG_H 1
#include <exec/helper-head.h>
#define DEF_HELPER_FLAGS_0(name, flags, ret) { HELPER(name), #name },
#define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \
DEF_HELPER_FLAGS_0(name, flags, ret)
#define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \
DEF_HELPER_FLAGS_0(name, flags, ret)
#define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \
DEF_HELPER_FLAGS_0(name, flags, ret)
#define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \
DEF_HELPER_FLAGS_0(name, flags, ret)
#define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \
DEF_HELPER_FLAGS_0(name, flags, ret)
#include "helper.h"
#undef DEF_HELPER_FLAGS_0
#undef DEF_HELPER_FLAGS_1
#undef DEF_HELPER_FLAGS_2
#undef DEF_HELPER_FLAGS_3
#undef DEF_HELPER_FLAGS_4
#undef DEF_HELPER_FLAGS_5
#endif /* HELPER_TCG_H */

2
target-alpha/fpu_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "fpu/softfloat.h"
#define FP_STATUS (env->fp_status)

2
target-alpha/helper.c
View File

@ -23,7 +23,7 @@
#include "cpu.h"
#include "fpu/softfloat.h"
#include "helper.h"
#include "exec/helper-proto.h"
uint64_t cpu_alpha_load_fpcr (CPUAlphaState *env)
{

4
target-alpha/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_3(excp, noreturn, env, int, int)
DEF_HELPER_FLAGS_1(load_pcc, TCG_CALL_NO_RWG_SE, i64, env)
@ -121,5 +119,3 @@ DEF_HELPER_FLAGS_0(get_vmtime, TCG_CALL_NO_RWG, i64)
DEF_HELPER_FLAGS_0(get_walltime, TCG_CALL_NO_RWG, i64)
DEF_HELPER_FLAGS_2(set_alarm, TCG_CALL_NO_RWG, void, env, i64)
#endif
#include "exec/def-helper.h"

2
target-alpha/int_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"

2
target-alpha/mem_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
/* Softmmu support */

2
target-alpha/sys_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"

5
target-alpha/translate.c
View File

@ -22,9 +22,8 @@
#include "qemu/host-utils.h"
#include "tcg-op.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
#undef ALPHA_DEBUG_DISAS
#define CONFIG_SOFTFLOAT_INLINE

2
target-arm/crypto_helper.c
View File

@ -13,7 +13,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "helper.h"
#include "exec/helper-proto.h"
union AES_STATE {
uint8_t bytes[16];

2
target-arm/helper-a64.c
View File

@ -19,7 +19,7 @@
#include "cpu.h"
#include "exec/gdbstub.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
#include "sysemu/sysemu.h"
#include "qemu/bitops.h"

2
target-arm/helper.c
View File

@ -1,7 +1,7 @@
#include "cpu.h"
#include "internals.h"
#include "exec/gdbstub.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
#include "sysemu/arch_init.h"
#include "sysemu/sysemu.h"

4
target-arm/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_FLAGS_1(clz, TCG_CALL_NO_RWG_SE, i32, i32)
DEF_HELPER_FLAGS_1(sxtb16, TCG_CALL_NO_RWG_SE, i32, i32)
DEF_HELPER_FLAGS_1(uxtb16, TCG_CALL_NO_RWG_SE, i32, i32)
@ -521,5 +519,3 @@ DEF_HELPER_2(dc_zva, void, env, i64)
#ifdef TARGET_AARCH64
#include "helper-a64.h"
#endif
#include "exec/def-helper.h"

2
target-arm/iwmmxt_helper.c
View File

@ -24,7 +24,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "helper.h"
#include "exec/helper-proto.h"
/* iwMMXt macros extracted from GNU gdb. */

2
target-arm/neon_helper.c
View File

@ -11,7 +11,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "helper.h"
#include "exec/helper-proto.h"
#define SIGNBIT (uint32_t)0x80000000
#define SIGNBIT64 ((uint64_t)1 << 63)

2
target-arm/op_helper.c
View File

@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "internals.h"
#define SIGNBIT (uint32_t)0x80000000

5
target-arm/translate-a64.c
View File

@ -31,9 +31,8 @@
#include "exec/gen-icount.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
static TCGv_i64 cpu_X[32];
static TCGv_i64 cpu_pc;

5
target-arm/translate.c
View File

@ -31,9 +31,8 @@
#include "qemu/log.h"
#include "qemu/bitops.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
#define ENABLE_ARCH_4T arm_feature(env, ARM_FEATURE_V4T)
#define ENABLE_ARCH_5 arm_feature(env, ARM_FEATURE_V5)

4
target-cris/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_2(raise_exception, void, env, i32)
DEF_HELPER_2(tlb_flush_pid, void, env, i32)
DEF_HELPER_2(spc_write, void, env, i32)
@ -25,5 +23,3 @@ DEF_HELPER_FLAGS_3(evaluate_flags_move_4, TCG_CALL_NO_SE, i32, env, i32, i32)
DEF_HELPER_FLAGS_3(evaluate_flags_move_2, TCG_CALL_NO_SE, i32, env, i32, i32)
DEF_HELPER_1(evaluate_flags, void, env)
DEF_HELPER_1(top_evaluate_flags, void, env)
#include "exec/def-helper.h"

2
target-cris/op_helper.c
View File

@ -20,7 +20,7 @@
#include "cpu.h"
#include "mmu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
//#define CRIS_OP_HELPER_DEBUG

5
target-cris/translate.c
View File

@ -26,12 +26,11 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "mmu.h"
#include "crisv32-decode.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-gen.h"
#define DISAS_CRIS 0
#if DISAS_CRIS

2
target-i386/cc_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
const uint8_t parity_table[256] = {
CC_P, 0, 0, CC_P, 0, CC_P, CC_P, 0,

2
target-i386/excp_helper.c
View File

@ -20,7 +20,7 @@
#include "cpu.h"
#include "qemu/log.h"
#include "sysemu/sysemu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#if 0
#define raise_exception_err(env, a, b) \

2
target-i386/fpu_helper.c
View File

@ -19,7 +19,7 @@
#include <math.h>
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/aes.h"
#include "qemu/host-utils.h"

4
target-i386/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_FLAGS_4(cc_compute_all, TCG_CALL_NO_RWG_SE, tl, tl, tl, tl, int)
DEF_HELPER_FLAGS_4(cc_compute_c, TCG_CALL_NO_RWG_SE, tl, tl, tl, tl, int)
@ -219,5 +217,3 @@ DEF_HELPER_3(rcrl, tl, env, tl, tl)
DEF_HELPER_3(rclq, tl, env, tl, tl)
DEF_HELPER_3(rcrq, tl, env, tl, tl)
#endif
#include "exec/def-helper.h"

2
target-i386/int_helper.c
View File

@ -19,7 +19,7 @@
#include "cpu.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include "exec/helper-proto.h"
//#define DEBUG_MULDIV

2
target-i386/mem_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#if !defined(CONFIG_USER_ONLY)
#include "exec/softmmu_exec.h"

2
target-i386/misc_helper.c
View File

@ -19,7 +19,7 @@
#include "cpu.h"
#include "exec/ioport.h"
#include "helper.h"
#include "exec/helper-proto.h"
#if !defined(CONFIG_USER_ONLY)
#include "exec/softmmu_exec.h"

2
target-i386/seg_helper.c
View File

@ -20,7 +20,7 @@
#include "cpu.h"
#include "qemu/log.h"
#include "helper.h"
#include "exec/helper-proto.h"
//#define DEBUG_PCALL

2
target-i386/smm_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
/* SMM support */

2
target-i386/svm_helper.c
View File

@ -19,7 +19,7 @@
#include "cpu.h"
#include "exec/cpu-all.h"
#include "helper.h"
#include "exec/helper-proto.h"
#if !defined(CONFIG_USER_ONLY)
#include "exec/softmmu_exec.h"

5
target-i386/translate.c
View File

@ -28,9 +28,8 @@
#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
#define PREFIX_REPZ 0x01
#define PREFIX_REPNZ 0x02

4
target-lm32/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_2(raise_exception, void, env, i32)
DEF_HELPER_1(hlt, void, env)
DEF_HELPER_3(wcsr_bp, void, env, i32, i32)
@ -14,5 +12,3 @@ DEF_HELPER_1(rcsr_ip, i32, env)
DEF_HELPER_1(rcsr_jtx, i32, env)
DEF_HELPER_1(rcsr_jrx, i32, env)
DEF_HELPER_1(ill, void, env)
#include "exec/def-helper.h"

2
target-lm32/lm32-semi.c
View File

@ -15,7 +15,7 @@
#include <string.h>
#include <stddef.h>
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/log.h"
#include "exec/softmmu-semi.h"

2
target-lm32/op_helper.c
View File

@ -1,6 +1,6 @@
#include <assert.h>
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
#include "hw/lm32/lm32_pic.h"

5
target-lm32/translate.c
View File

@ -19,13 +19,12 @@
#include "cpu.h"
#include "disas/disas.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "tcg-op.h"
#include "hw/lm32/lm32_pic.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-gen.h"
#define DISAS_LM32 1
#if DISAS_LM32

2
target-m68k/helper.c
View File

@ -21,7 +21,7 @@
#include "cpu.h"
#include "exec/gdbstub.h"
#include "helper.h"
#include "exec/helper-proto.h"
#define SIGNBIT (1u << 31)

4
target-m68k/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_1(bitrev, i32, i32)
DEF_HELPER_1(ff1, i32, i32)
DEF_HELPER_2(sats, i32, i32, i32)
@ -50,5 +48,3 @@ DEF_HELPER_3(set_mac_extu, void, env, i32, i32)
DEF_HELPER_2(flush_flags, void, env, i32)
DEF_HELPER_2(raise_exception, void, env, i32)
#include "exec/def-helper.h"

2
target-m68k/op_helper.c
View File

@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#if defined(CONFIG_USER_ONLY)

5
target-m68k/translate.c
View File

@ -23,9 +23,8 @@
#include "tcg-op.h"
#include "qemu/log.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
//#define DEBUG_DISPATCH 1

4
target-microblaze/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_2(raise_exception, void, env, i32)
DEF_HELPER_1(debug, void, env)
DEF_HELPER_FLAGS_3(carry, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32)
@ -37,5 +35,3 @@ DEF_HELPER_2(stackprot, void, env, i32)
DEF_HELPER_2(get, i32, i32, i32)
DEF_HELPER_3(put, void, i32, i32, i32)
#include "exec/def-helper.h"

2
target-microblaze/op_helper.c
View File

@ -20,7 +20,7 @@
#include <assert.h>
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
#define D(x)

6
target-microblaze/translate.c
View File

@ -21,11 +21,9 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "microblaze-decode.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-gen.h"
#define SIM_COMPAT 0
#define DISAS_GNU 1

2
target-mips/dsp_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/bitops.h"
/* As the byte ordering doesn't matter, i.e. all columns are treated

6
target-mips/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_3(raise_exception_err, noreturn, env, i32, int)
DEF_HELPER_2(raise_exception, noreturn, env, i32)
@ -691,7 +689,3 @@ DEF_HELPER_FLAGS_3(dmthlip, 0, void, tl, tl, env)
#endif
DEF_HELPER_FLAGS_3(wrdsp, 0, void, tl, tl, env)
DEF_HELPER_FLAGS_2(rddsp, 0, tl, tl, env)
#include "exec/def-helper.h"

2
target-mips/lmi_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
/* If the byte ordering doesn't matter, i.e. all columns are treated
identically, then this union can be used directly. If byte ordering

2
target-mips/op_helper.c
View File

@ -20,7 +20,7 @@
#include "cpu.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include "exec/helper-proto.h"
#if !defined(CONFIG_USER_ONLY)
#include "exec/softmmu_exec.h"

5
target-mips/translate.c
View File

@ -25,9 +25,8 @@
#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
#define MIPS_DEBUG_DISAS 0
//#define MIPS_DEBUG_SIGN_EXTENSIONS

2
target-moxie/helper.c
View File

@ -27,7 +27,7 @@
#include "exec/exec-all.h"
#include "exec/softmmu_exec.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include "exec/helper-proto.h"
#define MMUSUFFIX _mmu

4
target-moxie/helper.h
View File

@ -1,9 +1,5 @@
#include "exec/def-helper.h"
DEF_HELPER_2(raise_exception, void, env, int)
DEF_HELPER_1(debug, void, env)
DEF_HELPER_FLAGS_3(div, TCG_CALL_NO_WG, i32, env, i32, i32)
DEF_HELPER_FLAGS_3(udiv, TCG_CALL_NO_WG, i32, env, i32, i32)
#include "exec/def-helper.h"

5
target-moxie/translate.c
View File

@ -33,9 +33,8 @@
#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
/* This is the state at translation time. */
typedef struct DisasContext {

2
target-openrisc/exception_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "exception.h"
void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp)

2
target-openrisc/fpu_helper.c
View File

@ -19,7 +19,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "exception.h"
static inline uint32_t ieee_ex_to_openrisc(OpenRISCCPU *cpu, int fexcp)

4
target-openrisc/helper.h
View File

@ -17,8 +17,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "exec/def-helper.h"
/* exception */
DEF_HELPER_FLAGS_2(exception, 0, void, env, i32)
@ -66,5 +64,3 @@ DEF_HELPER_FLAGS_1(rfe, 0, void, env)
/* sys */
DEF_HELPER_FLAGS_4(mtspr, 0, void, env, tl, tl, tl)
DEF_HELPER_FLAGS_4(mfspr, 0, tl, env, tl, tl, tl)
#include "exec/def-helper.h"

2
target-openrisc/int_helper.c
View File

@ -19,7 +19,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "exception.h"
#include "qemu/host-utils.h"

2
target-openrisc/interrupt_helper.c
View File

@ -19,7 +19,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
void HELPER(rfe)(CPUOpenRISCState *env)
{

2
target-openrisc/sys_helper.c
View File

@ -19,7 +19,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#define TO_SPR(group, number) (((group) << 11) + (number))

5
target-openrisc/translate.c
View File

@ -27,9 +27,8 @@
#include "config.h"
#include "qemu/bitops.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
#define OPENRISC_DISAS

2
target-ppc/excp_helper.c
View File

@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "helper_regs.h"

2
target-ppc/fpu_helper.c
View File

@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
/*****************************************************************************/
/* Floating point operations helpers */

4
target-ppc/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_3(raise_exception_err, void, env, i32, i32)
DEF_HELPER_2(raise_exception, void, env, i32)
DEF_HELPER_4(tw, void, env, tl, tl, i32)
@ -613,5 +611,3 @@ DEF_HELPER_3(store_dbatu, void, env, i32, tl)
DEF_HELPER_3(store_601_batl, void, env, i32, tl)
DEF_HELPER_3(store_601_batu, void, env, i32, tl)
#endif
#include "exec/def-helper.h"

2
target-ppc/int_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "helper_regs.h"
/*****************************************************************************/

2
target-ppc/mem_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "helper_regs.h"

2
target-ppc/misc_helper.c
View File

@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "helper_regs.h"

2
target-ppc/mmu-hash32.c
View File

@ -19,7 +19,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "mmu-hash32.h"

2
target-ppc/mmu-hash64.c
View File

@ -18,7 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "mmu-hash64.h"

2
target-ppc/mmu_helper.c
View File

@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "mmu-hash64.h"

2
target-ppc/timebase_helper.c
View File

@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
/*****************************************************************************/
/* SPR accesses */

5
target-ppc/translate.c
View File

@ -23,9 +23,8 @@
#include "tcg-op.h"
#include "qemu/host-utils.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
#define CPU_SINGLE_STEP 0x1
#define CPU_BRANCH_STEP 0x2

2
target-s390x/cc_helper.c
View File

@ -19,7 +19,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
/* #define DEBUG_HELPER */

2
target-s390x/fpu_helper.c
View File

@ -19,7 +19,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#if !defined(CONFIG_USER_ONLY)
#include "exec/softmmu_exec.h"

4
target-s390x/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_2(exception, noreturn, env, i32)
DEF_HELPER_FLAGS_4(nc, TCG_CALL_NO_WG, i32, env, i32, i64, i64)
DEF_HELPER_FLAGS_4(oc, TCG_CALL_NO_WG, i32, env, i32, i64, i64)
@ -115,5 +113,3 @@ DEF_HELPER_FLAGS_1(ptlb, TCG_CALL_NO_RWG, void, env)
DEF_HELPER_2(lra, i64, env, i64)
DEF_HELPER_FLAGS_3(stura, TCG_CALL_NO_WG, void, env, i64, i64)
#endif
#include "exec/def-helper.h"

2
target-s390x/int_helper.c
View File

@ -20,7 +20,7 @@
#include "cpu.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include "exec/helper-proto.h"
/* #define DEBUG_HELPER */
#ifdef DEBUG_HELPER

2
target-s390x/mem_helper.c
View File

@ -19,7 +19,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
/*****************************************************************************/
/* Softmmu support */

2
target-s390x/misc_helper.c
View File

@ -21,7 +21,7 @@
#include "cpu.h"
#include "exec/memory.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include <string.h>
#include "sysemu/kvm.h"
#include "qemu/timer.h"

5
target-s390x/translate.c
View File

@ -38,9 +38,8 @@
static TCGv_ptr cpu_env;
#include "exec/gen-icount.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
/* Information that (most) every instruction needs to manipulate. */

4
target-sh4/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_1(ldtlb, void, env)
DEF_HELPER_1(raise_illegal_instruction, noreturn, env)
DEF_HELPER_1(raise_slot_illegal_instruction, noreturn, env)
@ -46,5 +44,3 @@ DEF_HELPER_2(ftrc_FT, i32, env, f32)
DEF_HELPER_2(ftrc_DT, i32, env, f64)
DEF_HELPER_3(fipr, void, env, i32, i32)
DEF_HELPER_2(ftrv, void, env, i32)
#include "exec/def-helper.h"

2
target-sh4/op_helper.c
View File

@ -19,7 +19,7 @@
#include <assert.h>
#include <stdlib.h>
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#ifndef CONFIG_USER_ONLY
#include "exec/softmmu_exec.h"

5
target-sh4/translate.c
View File

@ -24,9 +24,8 @@
#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
typedef struct DisasContext {
struct TranslationBlock *tb;

2
target-sparc/cc_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
static uint32_t compute_all_flags(CPUSPARCState *env)
{

2
target-sparc/fop_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#define QT0 (env->qt0)
#define QT1 (env->qt1)

2
target-sparc/helper.c
View File

@ -19,7 +19,7 @@
#include "cpu.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "sysemu/sysemu.h"
void helper_raise_exception(CPUSPARCState *env, int tt)

4
target-sparc/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
#ifndef TARGET_SPARC64
DEF_HELPER_1(rett, void, env)
DEF_HELPER_2(wrpsr, void, env, tl)
@ -175,5 +173,3 @@ VIS_CMPHELPER(cmpne)
#undef VIS_CMPHELPER
DEF_HELPER_1(compute_psr, void, env)
DEF_HELPER_1(compute_C_icc, i32, env)
#include "exec/def-helper.h"

2
target-sparc/int64_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "trace.h"
#define DEBUG_PCALL

2
target-sparc/ldst_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
//#define DEBUG_MMU
//#define DEBUG_MXCC

5
target-sparc/translate.c
View File

@ -26,11 +26,10 @@
#include "cpu.h"
#include "disas/disas.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "tcg-op.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-gen.h"
#define DEBUG_DISAS

2
target-sparc/vis_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
/* This function uses non-native bit order */
#define GET_FIELD(X, FROM, TO) \

2
target-sparc/win_helper.c
View File

@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "trace.h"
static inline void memcpy32(target_ulong *dst, const target_ulong *src)

2
target-unicore32/helper.c
View File

@ -11,7 +11,7 @@
#include "cpu.h"
#include "exec/gdbstub.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
#ifndef CONFIG_USER_ONLY
#include "ui/console.h"

3
target-unicore32/helper.h
View File

@ -6,7 +6,6 @@
* published by the Free Software Foundation, or (at your option) any
* later version. See the COPYING file in the top-level directory.
*/
#include "exec/def-helper.h"
#ifndef CONFIG_USER_ONLY
DEF_HELPER_4(cp0_set, void, env, i32, i32, i32)
@ -64,5 +63,3 @@ DEF_HELPER_2(ucf64_si2df, f64, f32, env)
DEF_HELPER_2(ucf64_sf2si, f32, f32, env)
DEF_HELPER_2(ucf64_df2si, f32, f64, env)
#include "exec/def-helper.h"

2
target-unicore32/op_helper.c
View File

@ -9,7 +9,7 @@
* later version. See the COPYING file in the top-level directory.
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#define SIGNBIT (uint32_t)0x80000000
#define SIGNBIT64 ((uint64_t)1 << 63)

5
target-unicore32/translate.c
View File

@ -19,9 +19,8 @@
#include "tcg-op.h"
#include "qemu/log.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
/* internal defines */
typedef struct DisasContext {

2
target-unicore32/ucf64_helper.c
View File

@ -9,7 +9,7 @@
* See the COPYING file in the top-level directory.
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
/*
* The convention used for UniCore-F64 instructions:

4
target-xtensa/helper.h
View File

@ -1,5 +1,3 @@
#include "exec/def-helper.h"
DEF_HELPER_2(exception, noreturn, env, i32)
DEF_HELPER_3(exception_cause, noreturn, env, i32, i32)
DEF_HELPER_4(exception_cause_vaddr, noreturn, env, i32, i32, i32)
@ -58,5 +56,3 @@ DEF_HELPER_4(olt_s, void, env, i32, f32, f32)
DEF_HELPER_4(ult_s, void, env, i32, f32, f32)
DEF_HELPER_4(ole_s, void, env, i32, f32, f32)
DEF_HELPER_4(ule_s, void, env, i32, f32, f32)
#include "exec/def-helper.h"

2
target-xtensa/op_helper.c
View File

@ -26,7 +26,7 @@
*/
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
#include "exec/softmmu_exec.h"
#include "exec/address-spaces.h"

5
target-xtensa/translate.c
View File

@ -37,9 +37,8 @@
#include "qemu/log.h"
#include "sysemu/sysemu.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
typedef struct DisasContext {
const XtensaConfig *config;

2
target-xtensa/xtensa-semi.c
View File

@ -30,7 +30,7 @@
#include <string.h>
#include <stddef.h>
#include "cpu.h"
#include "helper.h"
#include "exec/helper-proto.h"
#include "qemu/log.h"
enum {

7
tcg/tcg.c
View File

@ -307,16 +307,15 @@ void tcg_pool_reset(TCGContext *s)
s->pool_current = NULL;
}
#include "helper.h"
typedef struct TCGHelperInfo {
void *func;
const char *name;
} TCGHelperInfo;
#include "exec/helper-proto.h"
static const TCGHelperInfo all_helpers[] = {
#define GEN_HELPER 2
#include "helper.h"
#include "exec/helper-tcg.h"
/* Include tcg-runtime.c functions. */
{ tcg_helper_div_i32, "div_i32" },