OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tcg: Allocate TCGTemp pairs in host memory order

Browse Source 
Allocate the first of a pair at the lower address, and the
second of a pair at the higher address.  This will make it
easier to find the beginning of the larger memory block.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-10-19 11:53:27 +10:00
parent f01847c251
commit aef8540290
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tcg/tcg-internal.h
View File

@ -62,11 +62,11 @@ static inline unsigned tcg_call_flags(TCGOp *op)
#if TCG_TARGET_REG_BITS == 32 #if TCG_TARGET_REG_BITS == 32
static inline TCGv_i32 TCGV_LOW(TCGv_i64 t) static inline TCGv_i32 TCGV_LOW(TCGv_i64 t)
{ {
return temp_tcgv_i32(tcgv_i64_temp(t)); return temp_tcgv_i32(tcgv_i64_temp(t) + HOST_BIG_ENDIAN);
} }
static inline TCGv_i32 TCGV_HIGH(TCGv_i64 t) static inline TCGv_i32 TCGV_HIGH(TCGv_i64 t)
{ {
return temp_tcgv_i32(tcgv_i64_temp(t) + 1); return temp_tcgv_i32(tcgv_i64_temp(t) + !HOST_BIG_ENDIAN);
} }
#else #else
extern TCGv_i32 TCGV_LOW(TCGv_i64) QEMU_ERROR("32-bit code path is reachable"); extern TCGv_i32 TCGV_LOW(TCGv_i64) QEMU_ERROR("32-bit code path is reachable");

58
tcg/tcg.c
View File

@ -887,10 +887,7 @@ TCGTemp *tcg_global_mem_new_internal(TCGType type, TCGv_ptr base,
TCGContext *s = tcg_ctx; TCGContext *s = tcg_ctx;
TCGTemp *base_ts = tcgv_ptr_temp(base); TCGTemp *base_ts = tcgv_ptr_temp(base);
TCGTemp *ts = tcg_global_alloc(s); TCGTemp *ts = tcg_global_alloc(s);
int indirect_reg = 0, bigendian = 0; int indirect_reg = 0;
#if HOST_BIG_ENDIAN
bigendian = 1;
#endif
switch (base_ts->kind) { switch (base_ts->kind) {
case TEMP_FIXED: case TEMP_FIXED:
@ -916,7 +913,7 @@ TCGTemp *tcg_global_mem_new_internal(TCGType type, TCGv_ptr base,
ts->indirect_reg = indirect_reg; ts->indirect_reg = indirect_reg;
ts->mem_allocated = 1; ts->mem_allocated = 1;
ts->mem_base = base_ts; ts->mem_base = base_ts;
ts->mem_offset = offset + bigendian * 4; ts->mem_offset = offset;
pstrcpy(buf, sizeof(buf), name); pstrcpy(buf, sizeof(buf), name);
pstrcat(buf, sizeof(buf), "_0"); pstrcat(buf, sizeof(buf), "_0");
ts->name = strdup(buf); ts->name = strdup(buf);
@ -927,7 +924,7 @@ TCGTemp *tcg_global_mem_new_internal(TCGType type, TCGv_ptr base,
ts2->indirect_reg = indirect_reg; ts2->indirect_reg = indirect_reg;
ts2->mem_allocated = 1; ts2->mem_allocated = 1;
ts2->mem_base = base_ts; ts2->mem_base = base_ts;
ts2->mem_offset = offset + (1 - bigendian) * 4; ts2->mem_offset = offset + 4;
ts2->temp_subindex = 1; ts2->temp_subindex = 1;
pstrcpy(buf, sizeof(buf), name); pstrcpy(buf, sizeof(buf), name);
pstrcat(buf, sizeof(buf), "_1"); pstrcat(buf, sizeof(buf), "_1");
@ -1073,37 +1070,43 @@ TCGTemp *tcg_constant_internal(TCGType type, int64_t val)
ts = g_hash_table_lookup(h, &val); ts = g_hash_table_lookup(h, &val);
if (ts == NULL) { if (ts == NULL) {
int64_t *val_ptr;
ts = tcg_temp_alloc(s); ts = tcg_temp_alloc(s);
if (TCG_TARGET_REG_BITS == 32 && type == TCG_TYPE_I64) { if (TCG_TARGET_REG_BITS == 32 && type == TCG_TYPE_I64) {
TCGTemp *ts2 = tcg_temp_alloc(s); TCGTemp *ts2 = tcg_temp_alloc(s);
tcg_debug_assert(ts2 == ts + 1);
ts->base_type = TCG_TYPE_I64; ts->base_type = TCG_TYPE_I64;
ts->type = TCG_TYPE_I32; ts->type = TCG_TYPE_I32;
ts->kind = TEMP_CONST; ts->kind = TEMP_CONST;
ts->temp_allocated = 1; ts->temp_allocated = 1;
/*
* Retain the full value of the 64-bit constant in the low
* part, so that the hash table works. Actual uses will
* truncate the value to the low part.
*/
ts->val = val;
tcg_debug_assert(ts2 == ts + 1);
ts2->base_type = TCG_TYPE_I64; ts2->base_type = TCG_TYPE_I64;
ts2->type = TCG_TYPE_I32; ts2->type = TCG_TYPE_I32;
ts2->kind = TEMP_CONST; ts2->kind = TEMP_CONST;
ts2->temp_allocated = 1; ts2->temp_allocated = 1;
ts2->temp_subindex = 1; ts2->temp_subindex = 1;
ts2->val = val >> 32;
/*
* Retain the full value of the 64-bit constant in the low
* part, so that the hash table works. Actual uses will
* truncate the value to the low part.
*/
ts[HOST_BIG_ENDIAN].val = val;
ts[!HOST_BIG_ENDIAN].val = val >> 32;
val_ptr = &ts[HOST_BIG_ENDIAN].val;
} else { } else {
ts->base_type = type; ts->base_type = type;
ts->type = type; ts->type = type;
ts->kind = TEMP_CONST; ts->kind = TEMP_CONST;
ts->temp_allocated = 1; ts->temp_allocated = 1;
ts->val = val; ts->val = val;
val_ptr = &ts->val;
} }
g_hash_table_insert(h, &ts->val, ts); g_hash_table_insert(h, val_ptr, ts);
} }
return ts; return ts;
@ -1515,13 +1518,8 @@ void tcg_gen_callN(void *func, TCGTemp *ret, int nargs, TCGTemp **args)
pi = 0; pi = 0;
if (ret != NULL) { if (ret != NULL) {
if (TCG_TARGET_REG_BITS < 64 && (typemask & 6) == dh_typecode_i64) { if (TCG_TARGET_REG_BITS < 64 && (typemask & 6) == dh_typecode_i64) {
#if HOST_BIG_ENDIAN
op->args[pi++] = temp_arg(ret + 1);
op->args[pi++] = temp_arg(ret);
#else
op->args[pi++] = temp_arg(ret); op->args[pi++] = temp_arg(ret);
op->args[pi++] = temp_arg(ret + 1); op->args[pi++] = temp_arg(ret + 1);
#endif
nb_rets = 2; nb_rets = 2;
} else { } else {
op->args[pi++] = temp_arg(ret); op->args[pi++] = temp_arg(ret);
@ -1555,8 +1553,8 @@ void tcg_gen_callN(void *func, TCGTemp *ret, int nargs, TCGTemp **args)
} }
if (TCG_TARGET_REG_BITS < 64 && is_64bit) { if (TCG_TARGET_REG_BITS < 64 && is_64bit) {
op->args[pi++] = temp_arg(args[i] + HOST_BIG_ENDIAN); op->args[pi++] = temp_arg(args[i]);
op->args[pi++] = temp_arg(args[i] + !HOST_BIG_ENDIAN); op->args[pi++] = temp_arg(args[i] + 1);
real_args += 2; real_args += 2;
continue; continue;
} }
@ -4082,14 +4080,14 @@ static bool tcg_reg_alloc_dup2(TCGContext *s, const TCGOp *op)
} }
/* If the two inputs form one 64-bit value, try dupm_vec. */ /* If the two inputs form one 64-bit value, try dupm_vec. */
if (itsl + 1 == itsh && itsl->base_type == TCG_TYPE_I64) { if (itsl->temp_subindex == HOST_BIG_ENDIAN &&
temp_sync(s, itsl, s->reserved_regs, 0, 0); itsh->temp_subindex == !HOST_BIG_ENDIAN &&
temp_sync(s, itsh, s->reserved_regs, 0, 0); itsl == itsh + (HOST_BIG_ENDIAN ? 1 : -1)) {
#if HOST_BIG_ENDIAN TCGTemp *its = itsl - HOST_BIG_ENDIAN;
TCGTemp *its = itsh;
#else temp_sync(s, its + 0, s->reserved_regs, 0, 0);
TCGTemp *its = itsl; temp_sync(s, its + 1, s->reserved_regs, 0, 0);
#endif
if (tcg_out_dupm_vec(s, vtype, MO_64, ots->reg, if (tcg_out_dupm_vec(s, vtype, MO_64, ots->reg,
its->mem_base->reg, its->mem_offset)) { its->mem_base->reg, its->mem_offset)) {
goto done; goto done;