[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/8] tcg: Merge tcg_register_helper into tcg_context
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 8/8] tcg: Merge tcg_register_helper into tcg_context_init |
Date: |
Sat, 14 Sep 2013 17:03:54 -0700 |
Eliminates the repeated checks for having created
the s->helpers hash table.
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/tcg.c | 21 ++++++---------------
tcg/tcg.h | 1 -
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/tcg/tcg.c b/tcg/tcg.c
index bf4edfd..f401044 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -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(). */
diff --git a/tcg/tcg.h b/tcg/tcg.h
index 8c5eb42..f67fdb6 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -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);
--
1.8.1.4
- [Qemu-devel] [PATCH 2/8] tcg: Use a GHashTable for tcg_find_helper, (continued)
- [Qemu-devel] [PATCH 2/8] tcg: Use a GHashTable for tcg_find_helper, Richard Henderson, 2013/09/14
- [Qemu-devel] [PATCH 3/8] target-m68k: Rename helpers.h to helper.h, Richard Henderson, 2013/09/14
- [Qemu-devel] [PATCH 4/8] tcg: Move helper registration into tcg_context_init, Richard Henderson, 2013/09/14
- [Qemu-devel] [PATCH 5/8] tcg: Remove stray semi-colons from target-*/helper.h, Richard Henderson, 2013/09/14
- [Qemu-devel] [PATCH 6/8] tcg: Put target helper data into an array., Richard Henderson, 2013/09/14
- [Qemu-devel] [PATCH 7/8] tcg: Add tcg-runtime.c helpers to all_helpers, Richard Henderson, 2013/09/14
- [Qemu-devel] [PATCH 8/8] tcg: Merge tcg_register_helper into tcg_context_init,
Richard Henderson <=