diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-28 17:44:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-28 17:44:45 +0100 |
| commit | 66226ffd056d85a6b86034dd4bbec687e66ded24 (patch) | |
| tree | 483e0effddf60aaa26253899d8f1af6baf0a21bc /target-unicore32/translate.c | |
| parent | 3ee933c9d4869891a5614fba4815a3857dc3ef8f (diff) | |
| parent | 24666baf1f0a0be454d7c64497dca6d9becc3f40 (diff) | |
Merge remote-tracking branch 'remotes/rth/tcg-next' into staging
* remotes/rth/tcg-next:
tcg/optimize: Remember garbage high bits for 32-bit ops
tcg/optimize: Move updating of gen_opc_buf into tcg_opt_gen_mov*
tcg-sparc: Make debug_frame const
tcg-s390: Make debug_frame const
tcg-arm: Make debug_frame const
tcg-aarch64: Make debug_frame const
tcg-i386: Make debug_frame const
tcg: Allow the debug_frame data structure to be constant
tcg: Move size effects out of dh_arg
tcg: Remove sizemask and flags arguments to tcg_gen_callN
tcg: Save flags and computed sizemask in TCGHelperInfo
tcg: Register the helper info struct rather than the name
tcg: Move side effects out of dh_sizemask
tcg: Inline tcg_gen_helperN
tcg: Use helper-gen.h in tcg-op.h
tcg: Push tcg-runtime routines into exec/helper-*
tcg: Invert the inclusion of helper.h
tcg: Optimize brcond2 and setcond2 ne/eq
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-unicore32/translate.c')
| -rw-r--r-- | target-unicore32/translate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c index c2402cf942..3cccafe5ad 100644 --- a/target-unicore32/translate.c +++ b/target-unicore32/translate.c @@ -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 { |