diff options
author | Richard Henderson <rth@twiddle.net> | 2013-09-14 16:44:31 -0700 |
---|---|---|
committer | Richard Henderson <rth@twiddle.net> | 2013-10-10 11:44:25 -0700 |
commit | 84fd9dd3f78ced9d41e1160d43862bb620cb462a (patch) | |
tree | 73872fab2cb9999e4e53f4f4557dd2197b9840a7 | |
parent | 4953ee62711bd11a55e58b26c8c71b302198363c (diff) | |
download | qemu-84fd9dd3f78ced9d41e1160d43862bb620cb462a.zip qemu-84fd9dd3f78ced9d41e1160d43862bb620cb462a.tar.gz qemu-84fd9dd3f78ced9d41e1160d43862bb620cb462a.tar.bz2 |
tcg: Merge tcg_register_helper into tcg_context_init
Eliminates the repeated checks for having created
the s->helpers hash table.
Signed-off-by: Richard Henderson <rth@twiddle.net>
-rw-r--r-- | tcg/tcg.c | 21 | ||||
-rw-r--r-- | tcg/tcg.h | 1 |
2 files changed, 6 insertions, 16 deletions
@@ -288,6 +288,7 @@ 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; @@ -314,8 +315,12 @@ 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); + for (i = 0; i < ARRAY_SIZE(all_helpers); ++i) { - tcg_register_helper(all_helpers[i].func, all_helpers[i].name); + g_hash_table_insert(helper_table, (gpointer)all_helpers[i].func, + (gpointer)all_helpers[i].name); } tcg_target_init(s); @@ -653,20 +658,6 @@ int tcg_check_temp_count(void) } #endif -void tcg_register_helper(void *func, const char *name) -{ - TCGContext *s = &tcg_ctx; - GHashTable *table = s->helpers; - - if (table == NULL) { - /* Use g_direct_hash/equal for direct pointer comparisons on func. */ - table = g_hash_table_new(NULL, NULL); - s->helpers = table; - } - - g_hash_table_insert(table, (gpointer)func, (gpointer)name); -} - /* Note: we convert the 64 bit args to 32 bit and do some alignment and endian swap. Maybe it would be better to do the alignment and endian swap in tcg_reg_alloc_call(). */ @@ -672,7 +672,6 @@ TCGArg *tcg_optimize(TCGContext *s, uint16_t *tcg_opc_ptr, TCGArg *args, TCGOpDef *tcg_op_def); /* only used for debugging purposes */ -void tcg_register_helper(void *func, const char *name); void tcg_dump_ops(TCGContext *s); void dump_ops(const uint16_t *opc_buf, const TCGArg *opparam_buf); |