Replaces previous calls to tcg_global_mem_new*() with a declarative
global array of cpu_mapping structs. This array can be used to
initialize all TCG globals with one function call from the target, and
may additionally be used from LLVM based tools to map between offsets
into a struct and a mapped TCGv global.
Signed-off-by: Anton Johansson <anjo@rev.ng>
---
target/hexagon/translate.c | 116 +++++++++++++++++++++----------------
1 file changed, 65 insertions(+), 51 deletions(-)
diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c
index 4b1bee3c6d..f9a9de35fe 100644
--- a/target/hexagon/translate.c
+++ b/target/hexagon/translate.c
@@ -15,6 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/typedefs.h"
#define QEMU_GENERATE
#include "qemu/osdep.h"
#include "cpu.h"
@@ -32,6 +33,7 @@
#include "translate.h"
#include "genptr.h"
#include "printinsn.h"
+#include "tcg/tcg-global-mappings.h"
#define HELPER_H "helper.h"
#include "exec/helper-info.c.inc"
@@ -1093,7 +1095,6 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int *max_insns,
}
#define NAME_LEN 64
-static char reg_written_names[TOTAL_PER_THREAD_REGS][NAME_LEN];
static char store_addr_names[STORES_MAX][NAME_LEN];
static char store_width_names[STORES_MAX][NAME_LEN];
static char store_val32_names[STORES_MAX][NAME_LEN];
@@ -1101,63 +1102,73 @@ static char store_val64_names[STORES_MAX][NAME_LEN];
static char vstore_addr_names[VSTORES_MAX][NAME_LEN];
static char vstore_size_names[VSTORES_MAX][NAME_LEN];
static char vstore_pending_names[VSTORES_MAX][NAME_LEN];
+#if HEX_DEBUG
+static const char *reg_written_names_ptr[TOTAL_PER_THREAD_REGS];
+#endif
+static const char *store_addr_names_ptr[STORES_MAX];
+static const char *store_width_names_ptr[STORES_MAX];
+static const char *store_val32_names_ptr[STORES_MAX];
+static const char *store_val64_names_ptr[STORES_MAX];
+
+cpu_tcg_mapping tcg_global_mappings[] = {
+ /* General purpose and predicate registers */
+ CPU_TCG_MAP_ARRAY(CPUArchState, hex_gpr, gpr, hexagon_regnames),
+ CPU_TCG_MAP_ARRAY(CPUArchState, hex_pred, pred, hexagon_prednames),
+
+ /* Misc */
+ CPU_TCG_MAP(CPUArchState, hex_new_value_usr, new_value_usr, "new_value_usr"),
+ CPU_TCG_MAP(CPUArchState, hex_slot_cancelled, slot_cancelled, "slot_cancelled"),
+ CPU_TCG_MAP(CPUArchState, hex_llsc_addr, llsc_addr, "llsc_addr"),
+ CPU_TCG_MAP(CPUArchState, hex_llsc_val, llsc_val, "llsc_val"),
+ CPU_TCG_MAP(CPUArchState, hex_llsc_val_i64, llsc_val_i64, "llsc_val_i64"),
-void hexagon_translate_init(void)
-{
- int i;
-
- opcode_init();
-
- for (i = 0; i < TOTAL_PER_THREAD_REGS; i++) {
- hex_gpr[i] = tcg_global_mem_new(tcg_env,
- offsetof(CPUHexagonState, gpr[i]),
- hexagon_regnames[i]);
-
- if (HEX_DEBUG) {
- snprintf(reg_written_names[i], NAME_LEN, "reg_written_%s",
- hexagon_regnames[i]);
- hex_reg_written[i] = tcg_global_mem_new(tcg_env,
- offsetof(CPUHexagonState, reg_written[i]),
- reg_written_names[i]);
- }
- }
- hex_new_value_usr = tcg_global_mem_new(tcg_env,
- offsetof(CPUHexagonState, new_value_usr), "new_value_usr");
+ /*
+ * New general purpose and predicate register values,
+ * and reg_written used in debugging
+ */
+#if HEX_DEBUG
+ CPU_TCG_MAP_ARRAY(hex_reg_written, reg_written, reg_written_names_ptr),
+#endif
+
+ /* Logging stores */
+ CPU_TCG_MAP_ARRAY_OF_STRUCTS(CPUArchState, hex_store_addr, mem_log_stores, va, store_addr_names_ptr),
+ CPU_TCG_MAP_ARRAY_OF_STRUCTS(CPUArchState, hex_store_width, mem_log_stores, width, store_width_names_ptr),
+ CPU_TCG_MAP_ARRAY_OF_STRUCTS(CPUArchState, hex_store_val32, mem_log_stores, data32, store_val32_names_ptr),
+ CPU_TCG_MAP_ARRAY_OF_STRUCTS(CPUArchState, hex_store_val64, mem_log_stores, data64, store_val64_names_ptr),
+};
- for (i = 0; i < NUM_PREGS; i++) {
- hex_pred[i] = tcg_global_mem_new(tcg_env,
- offsetof(CPUHexagonState, pred[i]),
- hexagon_prednames[i]);
- }
- hex_slot_cancelled = tcg_global_mem_new(tcg_env,
- offsetof(CPUHexagonState, slot_cancelled), "slot_cancelled");
- hex_llsc_addr = tcg_global_mem_new(tcg_env,
- offsetof(CPUHexagonState, llsc_addr), "llsc_addr");
- hex_llsc_val = tcg_global_mem_new(tcg_env,
- offsetof(CPUHexagonState, llsc_val), "llsc_val");
- hex_llsc_val_i64 = tcg_global_mem_new_i64(tcg_env,
- offsetof(CPUHexagonState, llsc_val_i64), "llsc_val_i64");
- for (i = 0; i < STORES_MAX; i++) {
- snprintf(store_addr_names[i], NAME_LEN, "store_addr_%d", i);
- hex_store_addr[i] = tcg_global_mem_new(tcg_env,
- offsetof(CPUHexagonState, mem_log_stores[i].va),
- store_addr_names[i]);
+size_t tcg_global_mapping_count = ARRAY_SIZE(tcg_global_mappings);
+static void init_cpu_reg_names(void) {
+ /*
+ * Create register names and store them in `*_names`,
+ * then copy to and array of pointers in `*_names_ptr`
+ * which is easier to pass around.
+ */
+#if HEX_DEBUG
+ for (int i = 0; i < TOTAL_PER_THREAD_REGS; ++i) {
+ snprintf(reg_written_names[i], NAME_LEN, "reg_written_%s", hexagon_regnames[i]);
+ reg_written_names_ptr[i] = reg_written_names[i];
+ }
+#endif
+ for (int i = 0; i < STORES_MAX; ++i) {
+ snprintf(store_addr_names[i], NAME_LEN, "store_addr_%d", i);
snprintf(store_width_names[i], NAME_LEN, "store_width_%d", i);
- hex_store_width[i] = tcg_global_mem_new(tcg_env,
- offsetof(CPUHexagonState, mem_log_stores[i].width),
- store_width_names[i]);
-
snprintf(store_val32_names[i], NAME_LEN, "store_val32_%d", i);
- hex_store_val32[i] = tcg_global_mem_new(tcg_env,
- offsetof(CPUHexagonState, mem_log_stores[i].data32),
- store_val32_names[i]);
-
snprintf(store_val64_names[i], NAME_LEN, "store_val64_%d", i);
- hex_store_val64[i] = tcg_global_mem_new_i64(tcg_env,
- offsetof(CPUHexagonState, mem_log_stores[i].data64),
- store_val64_names[i]);
+ store_addr_names_ptr[i] = store_addr_names[i];
+ store_width_names_ptr[i] = store_width_names[i];
+ store_val32_names_ptr[i] = store_val32_names[i];
+ store_val64_names_ptr[i] = store_val64_names[i];
}
+}
+
+void hexagon_translate_init(void)
+{
+ int i;
+
+ opcode_init();
+
for (i = 0; i < VSTORES_MAX; i++) {
snprintf(vstore_addr_names[i], NAME_LEN, "vstore_addr_%d", i);
hex_vstore_addr[i] = tcg_global_mem_new(tcg_env,
@@ -1174,4 +1185,7 @@ void hexagon_translate_init(void)
offsetof(CPUHexagonState, vstore_pending[i]),
vstore_pending_names[i]);
}
+
+ init_cpu_reg_names();
+ init_cpu_tcg_mappings(tcg_global_mappings, tcg_global_mapping_count);
}
--
2.45.2