Skip to content

Commit

Permalink
tcg: take .helpers out of TCGContext
Browse files Browse the repository at this point in the history
Groundwork for supporting multiple TCG contexts.

The hash table becomes read-only after it is filled in,
so we can save space by keeping just a global pointer to it.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
cota authored and rth7680 committed Oct 10, 2017
1 parent 5e75150 commit 619205f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
10 changes: 5 additions & 5 deletions tcg/tcg.c
Expand Up @@ -318,6 +318,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);
Expand All @@ -328,7 +329,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;
Expand Down Expand Up @@ -356,7 +356,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,
Expand Down Expand Up @@ -982,7 +982,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;

Expand Down Expand Up @@ -1211,8 +1211,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;
}
Expand Down
2 changes: 0 additions & 2 deletions tcg/tcg.h
Expand Up @@ -656,8 +656,6 @@ struct TCGContext {

tcg_insn_unit *code_ptr;

GHashTable *helpers;

#ifdef CONFIG_PROFILER
/* profiling info */
int64_t tb_count1;
Expand Down

0 comments on commit 619205f

Please sign in to comment.