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

tcg: Move size effects out of dh_arg 

Tidying the initialization of the args arrays at the same time.

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-08 08:53:28 -07:00
parent bbb8a1b455
commit 011209e19f
2 changed files with 39 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
include/exec/helper-gen.h
View File

@ -6,65 +6,54 @@
#include <exec/helper-head.h> #include <exec/helper-head.h>
#define DEF_HELPER_FLAGS_0(name, flags, ret) \ #define DEF_HELPER_FLAGS_0(name, flags, ret) \
static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \ static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \
{ \ { \
tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 0, NULL); \ tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 0, NULL); \
} }
#define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \ #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)) \ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
{ \ dh_arg_decl(t1, 1)) \
TCGArg args[1]; \ { \
dh_arg(t1, 1); \ TCGArg args[1] = { dh_arg(t1, 1) }; \
tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 1, args); \ tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 1, args); \
} }
#define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \ #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), \ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
dh_arg_decl(t2, 2)) \ dh_arg_decl(t1, 1), dh_arg_decl(t2, 2)) \
{ \ { \
TCGArg args[2]; \ TCGArg args[2] = { dh_arg(t1, 1), dh_arg(t2, 2) }; \
dh_arg(t1, 1); \ tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 2, args); \
dh_arg(t2, 2); \
tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 2, args); \
} }
#define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \ #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), \ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
dh_arg_decl(t2, 2), dh_arg_decl(t3, 3)) \ dh_arg_decl(t1, 1), dh_arg_decl(t2, 2), dh_arg_decl(t3, 3)) \
{ \ { \
TCGArg args[3]; \ TCGArg args[3] = { dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3) }; \
dh_arg(t1, 1); \ tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 3, args); \
dh_arg(t2, 2); \
dh_arg(t3, 3); \
tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 3, args); \
} }
#define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \ #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), \ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
dh_arg_decl(t2, 2), dh_arg_decl(t3, 3), dh_arg_decl(t4, 4)) \ dh_arg_decl(t1, 1), dh_arg_decl(t2, 2), \
{ \ dh_arg_decl(t3, 3), dh_arg_decl(t4, 4)) \
TCGArg args[4]; \ { \
dh_arg(t1, 1); \ TCGArg args[4] = { dh_arg(t1, 1), dh_arg(t2, 2), \
dh_arg(t2, 2); \ dh_arg(t3, 3), dh_arg(t4, 4) }; \
dh_arg(t3, 3); \ tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 4, args); \
dh_arg(t4, 4); \
tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 4, args); \
} }
#define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \ #define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \
static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \ 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(t1, 1), dh_arg_decl(t2, 2), dh_arg_decl(t3, 3), \
dh_arg_decl(t4, 4), dh_arg_decl(t5, 5)) \ dh_arg_decl(t4, 4), dh_arg_decl(t5, 5)) \
{ \ { \
TCGArg args[5]; \ TCGArg args[5] = { dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3), \
dh_arg(t1, 1); \ dh_arg(t4, 4), dh_arg(t5, 5) }; \
dh_arg(t2, 2); \ tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 5, args); \
dh_arg(t3, 3); \
dh_arg(t4, 4); \
dh_arg(t5, 5); \
tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 5, args); \
} }
#include "helper.h" #include "helper.h"

2
include/exec/helper-head.h
View File

@ -112,7 +112,7 @@
((dh_is_64bit(t) << (n*2)) | (dh_is_signed(t) << (n*2+1))) ((dh_is_64bit(t) << (n*2)) | (dh_is_signed(t) << (n*2+1)))
#define dh_arg(t, n) \ #define dh_arg(t, n) \
(args[n - 1] = glue(GET_TCGV_, dh_alias(t))(glue(arg, n))) glue(GET_TCGV_, dh_alias(t))(glue(arg, n))
#define dh_arg_decl(t, n) glue(TCGv_, dh_alias(t)) glue(arg, n) #define dh_arg_decl(t, n) glue(TCGv_, dh_alias(t)) glue(arg, n)