mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-24 19:33:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

target/loongarch: Extract make_address_x() helper

Browse Source 
Signed-off-by: Jiajie Chen <c@jia.je>
Co-authored-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230822032724.1353391-6-gaosong@loongson.cn>
[PMD: Extract helper from bigger patch]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230822071405.35386-6-philmd@linaro.org>
This commit is contained in:
Jiajie Chen 2023-08-22 09:13:51 +02:00 committed by Song Gao
parent 3966582099
commit 34423c0194
No known key found for this signature in database
GPG Key ID: 40A2FFF239263EDF
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/loongarch/insn_trans/trans_fmemory.c.inc
View File

@ -57,8 +57,7 @@ static bool gen_floadx(DisasContext *ctx, arg_frr *a, MemOp mop)
CHECK_FPE; CHECK_FPE;
addr = tcg_temp_new(); addr = make_address_x(ctx, src1, src2);
tcg_gen_add_tl(addr, src1, src2);
tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop);
maybe_nanbox_load(dest, mop); maybe_nanbox_load(dest, mop);
set_fpr(a->fd, dest); set_fpr(a->fd, dest);
@ -75,8 +74,7 @@ static bool gen_fstorex(DisasContext *ctx, arg_frr *a, MemOp mop)
CHECK_FPE; CHECK_FPE;
addr = tcg_temp_new(); addr = make_address_x(ctx, src1, src2);
tcg_gen_add_tl(addr, src1, src2);
tcg_gen_qemu_st_tl(src3, addr, ctx->mem_idx, mop); tcg_gen_qemu_st_tl(src3, addr, ctx->mem_idx, mop);
return true; return true;
@ -91,9 +89,8 @@ static bool gen_fload_gt(DisasContext *ctx, arg_frr *a, MemOp mop)
CHECK_FPE; CHECK_FPE;
addr = tcg_temp_new();
gen_helper_asrtgt_d(cpu_env, src1, src2); gen_helper_asrtgt_d(cpu_env, src1, src2);
tcg_gen_add_tl(addr, src1, src2); addr = make_address_x(ctx, src1, src2);
tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop);
maybe_nanbox_load(dest, mop); maybe_nanbox_load(dest, mop);
set_fpr(a->fd, dest); set_fpr(a->fd, dest);
@ -110,9 +107,8 @@ static bool gen_fstore_gt(DisasContext *ctx, arg_frr *a, MemOp mop)
CHECK_FPE; CHECK_FPE;
addr = tcg_temp_new();
gen_helper_asrtgt_d(cpu_env, src1, src2); gen_helper_asrtgt_d(cpu_env, src1, src2);
tcg_gen_add_tl(addr, src1, src2); addr = make_address_x(ctx, src1, src2);
tcg_gen_qemu_st_tl(src3, addr, ctx->mem_idx, mop); tcg_gen_qemu_st_tl(src3, addr, ctx->mem_idx, mop);
return true; return true;
@ -127,9 +123,8 @@ static bool gen_fload_le(DisasContext *ctx, arg_frr *a, MemOp mop)
CHECK_FPE; CHECK_FPE;
addr = tcg_temp_new();
gen_helper_asrtle_d(cpu_env, src1, src2); gen_helper_asrtle_d(cpu_env, src1, src2);
tcg_gen_add_tl(addr, src1, src2); addr = make_address_x(ctx, src1, src2);
tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop);
maybe_nanbox_load(dest, mop); maybe_nanbox_load(dest, mop);
set_fpr(a->fd, dest); set_fpr(a->fd, dest);
@ -146,9 +141,8 @@ static bool gen_fstore_le(DisasContext *ctx, arg_frr *a, MemOp mop)
CHECK_FPE; CHECK_FPE;
addr = tcg_temp_new();
gen_helper_asrtle_d(cpu_env, src1, src2); gen_helper_asrtle_d(cpu_env, src1, src2);
tcg_gen_add_tl(addr, src1, src2); addr = make_address_x(ctx, src1, src2);
tcg_gen_qemu_st_tl(src3, addr, ctx->mem_idx, mop); tcg_gen_qemu_st_tl(src3, addr, ctx->mem_idx, mop);
return true; return true;

6
target/loongarch/insn_trans/trans_lsx.c.inc
View File

@ -4315,14 +4315,13 @@ static bool trans_vldx(DisasContext *ctx, arg_vrr *a)
CHECK_SXE; CHECK_SXE;
addr = tcg_temp_new();
src1 = gpr_src(ctx, a->rj, EXT_NONE); src1 = gpr_src(ctx, a->rj, EXT_NONE);
src2 = gpr_src(ctx, a->rk, EXT_NONE); src2 = gpr_src(ctx, a->rk, EXT_NONE);
val = tcg_temp_new_i128(); val = tcg_temp_new_i128();
rl = tcg_temp_new_i64(); rl = tcg_temp_new_i64();
rh = tcg_temp_new_i64(); rh = tcg_temp_new_i64();
tcg_gen_add_tl(addr, src1, src2); addr = make_address_x(ctx, src1, src2);
tcg_gen_qemu_ld_i128(val, addr, ctx->mem_idx, MO_128 | MO_TE); tcg_gen_qemu_ld_i128(val, addr, ctx->mem_idx, MO_128 | MO_TE);
tcg_gen_extr_i128_i64(rl, rh, val); tcg_gen_extr_i128_i64(rl, rh, val);
set_vreg64(rh, a->vd, 1); set_vreg64(rh, a->vd, 1);
@ -4339,14 +4338,13 @@ static bool trans_vstx(DisasContext *ctx, arg_vrr *a)
CHECK_SXE; CHECK_SXE;
addr = tcg_temp_new();
src1 = gpr_src(ctx, a->rj, EXT_NONE); src1 = gpr_src(ctx, a->rj, EXT_NONE);
src2 = gpr_src(ctx, a->rk, EXT_NONE); src2 = gpr_src(ctx, a->rk, EXT_NONE);
val = tcg_temp_new_i128(); val = tcg_temp_new_i128();
ah = tcg_temp_new_i64(); ah = tcg_temp_new_i64();
al = tcg_temp_new_i64(); al = tcg_temp_new_i64();
tcg_gen_add_tl(addr, src1, src2); addr = make_address_x(ctx, src1, src2);
get_vreg64(ah, a->vd, 1); get_vreg64(ah, a->vd, 1);
get_vreg64(al, a->vd, 0); get_vreg64(al, a->vd, 0);
tcg_gen_concat_i64_i128(val, al, ah); tcg_gen_concat_i64_i128(val, al, ah);

6
target/loongarch/insn_trans/trans_memory.c.inc
View File

@ -39,9 +39,8 @@ static bool gen_loadx(DisasContext *ctx, arg_rrr *a, MemOp mop)
TCGv dest = gpr_dst(ctx, a->rd, EXT_NONE); TCGv dest = gpr_dst(ctx, a->rd, EXT_NONE);
TCGv src1 = gpr_src(ctx, a->rj, EXT_NONE); TCGv src1 = gpr_src(ctx, a->rj, EXT_NONE);
TCGv src2 = gpr_src(ctx, a->rk, EXT_NONE); TCGv src2 = gpr_src(ctx, a->rk, EXT_NONE);
TCGv addr = tcg_temp_new(); TCGv addr = make_address_x(ctx, src1, src2);
tcg_gen_add_tl(addr, src1, src2);
tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop); tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, mop);
gen_set_gpr(a->rd, dest, EXT_NONE); gen_set_gpr(a->rd, dest, EXT_NONE);
@ -53,9 +52,8 @@ static bool gen_storex(DisasContext *ctx, arg_rrr *a, MemOp mop)
TCGv data = gpr_src(ctx, a->rd, EXT_NONE); TCGv data = gpr_src(ctx, a->rd, EXT_NONE);
TCGv src1 = gpr_src(ctx, a->rj, EXT_NONE); TCGv src1 = gpr_src(ctx, a->rj, EXT_NONE);
TCGv src2 = gpr_src(ctx, a->rk, EXT_NONE); TCGv src2 = gpr_src(ctx, a->rk, EXT_NONE);
TCGv addr = tcg_temp_new(); TCGv addr = make_address_x(ctx, src1, src2);
tcg_gen_add_tl(addr, src1, src2);
tcg_gen_qemu_st_tl(data, addr, ctx->mem_idx, mop); tcg_gen_qemu_st_tl(data, addr, ctx->mem_idx, mop);
return true; return true;

12
target/loongarch/translate.c
View File

@ -208,6 +208,18 @@ static void set_fpr(int reg_num, TCGv val)
offsetof(CPULoongArchState, fpr[reg_num].vreg.D(0))); offsetof(CPULoongArchState, fpr[reg_num].vreg.D(0)));
} }
static TCGv make_address_x(DisasContext *ctx, TCGv base, TCGv addend)
{
TCGv temp = NULL;
if (addend) {
temp = tcg_temp_new();
tcg_gen_add_tl(temp, base, addend);
base = temp;
}
return base;
}
#include "decode-insns.c.inc" #include "decode-insns.c.inc"
#include "insn_trans/trans_arith.c.inc" #include "insn_trans/trans_arith.c.inc"
#include "insn_trans/trans_shift.c.inc" #include "insn_trans/trans_shift.c.inc"