[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 10/18] tcg: Move size effects out of dh_arg
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL v2 10/18] tcg: Move size effects out of dh_arg |
Date: |
Tue, 27 May 2014 13:51:16 -0700 |
Tidying the initialization of the args arrays at the same time.
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
include/exec/helper-gen.h | 87 ++++++++++++++++++++--------------------------
include/exec/helper-head.h | 2 +-
2 files changed, 39 insertions(+), 50 deletions(-)
diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h
index 4d290b2..a04a034 100644
--- a/include/exec/helper-gen.h
+++ b/include/exec/helper-gen.h
@@ -6,65 +6,54 @@
#include <exec/helper-head.h>
-#define DEF_HELPER_FLAGS_0(name, flags, ret) \
-static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \
-{ \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 0, NULL); \
+#define DEF_HELPER_FLAGS_0(name, flags, ret) \
+static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \
+{ \
+ tcg_gen_callN(&tcg_ctx, HELPER(name), 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]; \
- dh_arg(t1, 1); \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 1, args); \
+#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] = { dh_arg(t1, 1) }; \
+ tcg_gen_callN(&tcg_ctx, HELPER(name), 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]; \
- dh_arg(t1, 1); \
- dh_arg(t2, 2); \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 2, 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] = { dh_arg(t1, 1), 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) \
-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]; \
- dh_arg(t1, 1); \
- dh_arg(t2, 2); \
- dh_arg(t3, 3); \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 3, 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] = { dh_arg(t1, 1), 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) \
-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]; \
- dh_arg(t1, 1); \
- dh_arg(t2, 2); \
- dh_arg(t3, 3); \
- dh_arg(t4, 4); \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 4, 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] = { dh_arg(t1, 1), dh_arg(t2, 2), \
+ dh_arg(t3, 3), 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) \
-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]; \
- dh_arg(t1, 1); \
- dh_arg(t2, 2); \
- dh_arg(t3, 3); \
- dh_arg(t4, 4); \
- dh_arg(t5, 5); \
- tcg_gen_callN(&tcg_ctx, HELPER(name), dh_retvar(ret), 5, 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] = { dh_arg(t1, 1), dh_arg(t2, 2), 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"
diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h
index 4c541ab..b009ccb 100644
--- a/include/exec/helper-head.h
+++ b/include/exec/helper-head.h
@@ -112,7 +112,7 @@
((dh_is_64bit(t) << (n*2)) | (dh_is_signed(t) << (n*2+1)))
#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)
--
1.9.3
- [Qemu-devel] [PULL v2 00/18] tcg patch queue, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 02/18] tcg: Invert the inclusion of helper.h, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 01/18] tcg: Optimize brcond2 and setcond2 ne/eq, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 03/18] tcg: Push tcg-runtime routines into exec/helper-*, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 05/18] tcg: Inline tcg_gen_helperN, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 04/18] tcg: Use helper-gen.h in tcg-op.h, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 07/18] tcg: Register the helper info struct rather than the name, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 06/18] tcg: Move side effects out of dh_sizemask, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 08/18] tcg: Save flags and computed sizemask in TCGHelperInfo, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 09/18] tcg: Remove sizemask and flags arguments to tcg_gen_callN, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 10/18] tcg: Move size effects out of dh_arg,
Richard Henderson <=
- [Qemu-devel] [PULL v2 12/18] tcg-i386: Make debug_frame const, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 11/18] tcg: Allow the debug_frame data structure to be constant, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 14/18] tcg-arm: Make debug_frame const, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 13/18] tcg-aarch64: Make debug_frame const, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 15/18] tcg-s390: Make debug_frame const, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 16/18] tcg-sparc: Make debug_frame const, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 17/18] tcg/optimize: Move updating of gen_opc_buf into tcg_opt_gen_mov*, Richard Henderson, 2014/05/27
- [Qemu-devel] [PULL v2 18/18] tcg/optimize: Remember garbage high bits for 32-bit ops, Richard Henderson, 2014/05/27
- Re: [Qemu-devel] [PULL v2 00/18] tcg patch queue, Peter Maydell, 2014/05/28