Re: [Qemu-devel] [PATCH 14/22] tcg: take .helpers out of TCGContext

[Alex Bennée]

Emilio G. Cota <address@hidden> writes:

> Before TCGContext is made thread-local.
>
> The hash table becomes read-only after it is filled in,
> so we can save space by keeping just a global pointer to it.
>
> Signed-off-by: Emilio G. Cota <address@hidden>

Reviewed-by: Alex Bennée <address@hidden>

> ---
>  tcg/tcg.h |  2 --
>  tcg/tcg.c | 10 +++++-----
>  2 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/tcg/tcg.h b/tcg/tcg.h
> index ad2d959..4f57878 100644
> --- a/tcg/tcg.h
> +++ b/tcg/tcg.h
> @@ -663,8 +663,6 @@ struct TCGContext {
>
>      tcg_insn_unit *code_ptr;
>
> -    GHashTable *helpers;
> -
>  #ifdef CONFIG_PROFILER
>      /* profiling info */
>      int64_t tb_count1;
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index 3559829..d9b083a 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -319,6 +319,7 @@ typedef struct TCGHelperInfo {
>  static const TCGHelperInfo all_helpers[] = {
>  #include "exec/helper-tcg.h"
>  };
> +static GHashTable *helper_table;
>
>  static int indirect_reg_alloc_order[ARRAY_SIZE(tcg_target_reg_alloc_order)];
>  static void process_op_defs(TCGContext *s);
> @@ -329,7 +330,6 @@ void tcg_context_init(TCGContext *s)
>      TCGOpDef *def;
>      TCGArgConstraint *args_ct;
>      int *sorted_args;
> -    GHashTable *helper_table;
>
>      memset(s, 0, sizeof(*s));
>      s->nb_globals = 0;
> @@ -357,7 +357,7 @@ void tcg_context_init(TCGContext *s)
>
>      /* Register helpers.  */
>      /* Use g_direct_hash/equal for direct pointer comparisons on func.  */
> -    s->helpers = helper_table = g_hash_table_new(NULL, NULL);
> +    helper_table = g_hash_table_new(NULL, NULL);
>
>      for (i = 0; i < ARRAY_SIZE(all_helpers); ++i) {
>          g_hash_table_insert(helper_table, (gpointer)all_helpers[i].func,
> @@ -761,7 +761,7 @@ void tcg_gen_callN(TCGContext *s, void *func, TCGArg ret,
>      unsigned sizemask, flags;
>      TCGHelperInfo *info;
>
> -    info = g_hash_table_lookup(s->helpers, (gpointer)func);
> +    info = g_hash_table_lookup(helper_table, (gpointer)func);
>      flags = info->flags;
>      sizemask = info->sizemask;
>
> @@ -990,8 +990,8 @@ static char *tcg_get_arg_str_idx(TCGContext *s, char *buf,
>  static inline const char *tcg_find_helper(TCGContext *s, uintptr_t val)
>  {
>      const char *ret = NULL;
> -    if (s->helpers) {
> -        TCGHelperInfo *info = g_hash_table_lookup(s->helpers, (gpointer)val);
> +    if (helper_table) {
> +        TCGHelperInfo *info = g_hash_table_lookup(helper_table, 
> (gpointer)val);
>          if (info) {
>              ret = info->name;
>          }


--
Alex Bennée