Commit 66226ffd authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3ee933c9 24666baf

include/exec/helper-gen.h

0 → 100644
+70 −0
Original line number Diff line number Diff line 
/* 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))        \

{                                                                       \

  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_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_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);       \

}



#include "helper.h"

#include "tcg-runtime.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 */

include/exec/def-helper.h→include/exec/helper-head.h

+134 −0
Original line number Diff line number Diff line 
/* 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
@@ -18,6 +18,8 @@ 
#ifndef DEF_HELPER_H

#define DEF_HELPER_H 1



#include "qemu/osdep.h"



#define HELPER(name) glue(helper_, name)



#define GET_TCGV_i32 GET_TCGV_I32
@@ -32,11 +34,13 @@ 
#define dh_alias_s64 i64

#define dh_alias_f32 i32

#define dh_alias_f64 i64

#ifdef TARGET_LONG_BITS

# if TARGET_LONG_BITS == 32

#  define dh_alias_tl i32

# else

#  define dh_alias_tl i64

# endif

#endif

#define dh_alias_ptr ptr

#define dh_alias_void void

#define dh_alias_noreturn noreturn
@@ -105,16 +109,13 @@ 
#define dh_is_signed(t) dh_is_signed_##t



#define dh_sizemask(t, n) \

  sizemask |= dh_is_64bit(t) << (n*2); \

  sizemask |= 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) \

  args[n - 1] = glue(GET_TCGV_, dh_alias(t))(glue(arg, n)); \

  dh_sizemask(t, 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 DEF_HELPER_0(name, ret) \

    DEF_HELPER_FLAGS_0(name, 0, ret)

#define DEF_HELPER_1(name, ret, t1) \
@@ -131,144 +132,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

include/exec/helper-proto.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/* 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"

#include "tcg-runtime.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 */

include/exec/helper-tcg.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/* 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) \

  { .func = HELPER(NAME), .name = #NAME, .flags = FLAGS, \

    .sizemask = dh_sizemask(ret, 0) },



#define DEF_HELPER_FLAGS_1(NAME, FLAGS, ret, t1) \

  { .func = HELPER(NAME), .name = #NAME, .flags = FLAGS, \

    .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) },



#define DEF_HELPER_FLAGS_2(NAME, FLAGS, ret, t1, t2) \

  { .func = HELPER(NAME), .name = #NAME, .flags = FLAGS, \

    .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \

    | dh_sizemask(t2, 2) },



#define DEF_HELPER_FLAGS_3(NAME, FLAGS, ret, t1, t2, t3) \

  { .func = HELPER(NAME), .name = #NAME, .flags = FLAGS, \

    .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \

    | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) },



#define DEF_HELPER_FLAGS_4(NAME, FLAGS, ret, t1, t2, t3, t4) \

  { .func = HELPER(NAME), .name = #NAME, .flags = FLAGS, \

    .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \

    | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) },



#define DEF_HELPER_FLAGS_5(NAME, FLAGS, ret, t1, t2, t3, t4, t5) \

  { .func = HELPER(NAME), .name = #NAME, .flags = FLAGS, \

    .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \

    | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) \

    | dh_sizemask(t5, 5) },



#include "helper.h"

#include "tcg-runtime.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 */

target-alpha/fpu_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -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)