aboutsummaryrefslogtreecommitdiff
path: root/target-alpha
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-09-18 15:31:27 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-09-18 15:31:27 +0000
commitb03d0971b3744cf5778264c9aedb4084f779c774 (patch)
tree6ca10d8e8c73769db7e234ad0b7f1c1ba609dee8 /target-alpha
parent04acd3072622097f343d16e2da2ec84d6ee1b840 (diff)
downloadqemu-b03d0971b3744cf5778264c9aedb4084f779c774.zip
qemu-b03d0971b3744cf5778264c9aedb4084f779c774.tar.gz
qemu-b03d0971b3744cf5778264c9aedb4084f779c774.tar.bz2
target-alpha: switch most load/store ops to TCG
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5255 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-alpha')
-rw-r--r--target-alpha/op_mem.h7
-rw-r--r--target-alpha/translate.c148
2 files changed, 128 insertions, 27 deletions
diff --git a/target-alpha/op_mem.h b/target-alpha/op_mem.h
index 5bf73af..63e59a6 100644
--- a/target-alpha/op_mem.h
+++ b/target-alpha/op_mem.h
@@ -80,18 +80,11 @@ void OPPROTO glue(glue(op_st, name), MEMSUFFIX) (void) \
RETURN(); \
}
-ALPHA_LD_OP(bu, ldub);
-ALPHA_ST_OP(b, stb);
-ALPHA_LD_OP(wu, lduw);
-ALPHA_ST_OP(w, stw);
ALPHA_LD_OP(l, ldl);
ALPHA_ST_OP(l, stl);
ALPHA_LD_OP(q, ldq);
ALPHA_ST_OP(q, stq);
-ALPHA_LD_OP(q_u, ldq);
-ALPHA_ST_OP(q_u, stq);
-
ALPHA_LD_OP(l_l, ldl_l);
ALPHA_LD_OP(q_l, ldq_l);
ALPHA_ST_OP(l_c, stl_c);
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 2ca1985..e0acba5 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -209,16 +209,10 @@ static always_inline void gen_st##width (DisasContext *ctx) \
(*gen_op_st##width[ctx->mem_idx])(); \
}
-GEN_LD(bu);
-GEN_ST(b);
-GEN_LD(wu);
-GEN_ST(w);
GEN_LD(l);
GEN_ST(l);
GEN_LD(q);
GEN_ST(q);
-GEN_LD(q_u);
-GEN_ST(q_u);
GEN_LD(l_l);
GEN_ST(l_c);
GEN_LD(q_l);
@@ -661,33 +655,103 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn)
/* LDBU */
if (!(ctx->amask & AMASK_BWX))
goto invalid_opc;
- gen_load_mem(ctx, &gen_ldbu, ra, rb, disp16, 0);
+ if (likely(ra != 31)) {
+ TCGv addr = tcg_temp_new(TCG_TYPE_I64);
+ if (rb != 31)
+ tcg_gen_addi_i64(addr, cpu_ir[rb], disp16);
+ else
+ tcg_gen_movi_i64(addr, disp16);
+ tcg_gen_qemu_ld8u(cpu_ir[ra], addr, ctx->mem_idx);
+ tcg_temp_free(addr);
+ }
break;
case 0x0B:
/* LDQ_U */
- gen_load_mem(ctx, &gen_ldq_u, ra, rb, disp16, 1);
+ if (likely(ra != 31)) {
+ TCGv addr = tcg_temp_new(TCG_TYPE_I64);
+ if (rb != 31) {
+ tcg_gen_addi_i64(addr, cpu_ir[rb], disp16);
+ tcg_gen_andi_i64(addr, addr, ~0x7);
+ } else
+ tcg_gen_movi_i64(addr, disp16 & ~0x7);
+ tcg_gen_qemu_ld64(cpu_ir[ra], addr, ctx->mem_idx);
+ tcg_temp_free(addr);
+ }
break;
case 0x0C:
/* LDWU */
if (!(ctx->amask & AMASK_BWX))
goto invalid_opc;
- gen_load_mem(ctx, &gen_ldwu, ra, rb, disp16, 0);
+ if (likely(ra != 31)) {
+ TCGv addr = tcg_temp_new(TCG_TYPE_I64);
+ if (rb != 31)
+ tcg_gen_addi_i64(addr, cpu_ir[rb], disp16);
+ else
+ tcg_gen_movi_i64(addr, disp16);
+ tcg_gen_qemu_ld16u(cpu_ir[ra], addr, ctx->mem_idx);
+ tcg_temp_free(addr);
+ }
break;
case 0x0D:
/* STW */
- if (!(ctx->amask & AMASK_BWX))
- goto invalid_opc;
- gen_store_mem(ctx, &gen_stw, ra, rb, disp16, 0);
+ {
+ TCGv addr;
+ if (!(ctx->amask & AMASK_BWX))
+ goto invalid_opc;
+ addr = tcg_temp_new(TCG_TYPE_I64);
+ if (rb != 31)
+ tcg_gen_addi_i64(addr, cpu_ir[rb], disp16);
+ else
+ tcg_gen_movi_i64(addr, disp16);
+ if (ra != 31)
+ tcg_gen_qemu_st16(cpu_ir[ra], addr, ctx->mem_idx);
+ else {
+ TCGv zero = tcg_const_i64(0);
+ tcg_gen_qemu_st16(zero, addr, ctx->mem_idx);
+ tcg_temp_free(zero);
+ }
+ tcg_temp_free(addr);
+ }
break;
case 0x0E:
/* STB */
- if (!(ctx->amask & AMASK_BWX))
- goto invalid_opc;
- gen_store_mem(ctx, &gen_stb, ra, rb, disp16, 0);
+ {
+ TCGv addr;
+ if (!(ctx->amask & AMASK_BWX))
+ goto invalid_opc;
+ addr = tcg_temp_new(TCG_TYPE_I64);
+ if (rb != 31)
+ tcg_gen_addi_i64(addr, cpu_ir[rb], disp16);
+ else
+ tcg_gen_movi_i64(addr, disp16);
+ if (ra != 31)
+ tcg_gen_qemu_st8(cpu_ir[ra], addr, ctx->mem_idx);
+ else {
+ TCGv zero = tcg_const_i64(0);
+ tcg_gen_qemu_st8(zero, addr, ctx->mem_idx);
+ tcg_temp_free(zero);
+ }
+ tcg_temp_free(addr);
+ }
break;
case 0x0F:
/* STQ_U */
- gen_store_mem(ctx, &gen_stq_u, ra, rb, disp16, 1);
+ {
+ TCGv addr = tcg_temp_new(TCG_TYPE_I64);
+ if (rb != 31) {
+ tcg_gen_addi_i64(addr, cpu_ir[rb], disp16);
+ tcg_gen_andi_i64(addr, addr, ~0x7);
+ } else
+ tcg_gen_movi_i64(addr, disp16 & ~0x7);
+ if (ra != 31)
+ tcg_gen_qemu_st64(cpu_ir[ra], addr, ctx->mem_idx);
+ else {
+ TCGv zero = tcg_const_i64(0);
+ tcg_gen_qemu_st64(zero, addr, ctx->mem_idx);
+ tcg_temp_free(zero);
+ }
+ tcg_temp_free(addr);
+ }
break;
case 0x10:
switch (fn7) {
@@ -2125,11 +2189,27 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn)
break;
case 0x28:
/* LDL */
- gen_load_mem(ctx, &gen_ldl, ra, rb, disp16, 0);
+ if (likely(ra != 31)) {
+ TCGv addr = tcg_temp_new(TCG_TYPE_I64);
+ if (rb != 31)
+ tcg_gen_addi_i64(addr, cpu_ir[rb], disp16);
+ else
+ tcg_gen_movi_i64(addr, disp16);
+ tcg_gen_qemu_ld32s(cpu_ir[ra], addr, ctx->mem_idx);
+ tcg_temp_free(addr);
+ }
break;
case 0x29:
/* LDQ */
- gen_load_mem(ctx, &gen_ldq, ra, rb, disp16, 0);
+ if (likely(ra != 31)) {
+ TCGv addr = tcg_temp_new(TCG_TYPE_I64);
+ if (rb != 31)
+ tcg_gen_addi_i64(addr, cpu_ir[rb], disp16);
+ else
+ tcg_gen_movi_i64(addr, disp16);
+ tcg_gen_qemu_ld64(cpu_ir[ra], addr, ctx->mem_idx);
+ tcg_temp_free(addr);
+ }
break;
case 0x2A:
/* LDL_L */
@@ -2141,11 +2221,39 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn)
break;
case 0x2C:
/* STL */
- gen_store_mem(ctx, &gen_stl, ra, rb, disp16, 0);
+ {
+ TCGv addr = tcg_temp_new(TCG_TYPE_I64);
+ if (rb != 31)
+ tcg_gen_addi_i64(addr, cpu_ir[rb], disp16);
+ else
+ tcg_gen_movi_i64(addr, disp16);
+ if (ra != 31)
+ tcg_gen_qemu_st32(cpu_ir[ra], addr, ctx->mem_idx);
+ else {
+ TCGv zero = tcg_const_i64(0);
+ tcg_gen_qemu_st32(zero, addr, ctx->mem_idx);
+ tcg_temp_free(zero);
+ }
+ tcg_temp_free(addr);
+ }
break;
case 0x2D:
/* STQ */
- gen_store_mem(ctx, &gen_stq, ra, rb, disp16, 0);
+ {
+ TCGv addr = tcg_temp_new(TCG_TYPE_I64);
+ if (rb != 31)
+ tcg_gen_addi_i64(addr, cpu_ir[rb], disp16);
+ else
+ tcg_gen_movi_i64(addr, disp16);
+ if (ra != 31)
+ tcg_gen_qemu_st64(cpu_ir[ra], addr, ctx->mem_idx);
+ else {
+ TCGv zero = tcg_const_i64(0);
+ tcg_gen_qemu_st64(zero, addr, ctx->mem_idx);
+ tcg_temp_free(zero);
+ }
+ tcg_temp_free(addr);
+ }
break;
case 0x2E:
/* STL_C */