From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KkMR0-00025R-Qw for qemu-devel@nongnu.org; Mon, 29 Sep 2008 13:21:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KkMR0-00024a-2B for qemu-devel@nongnu.org; Mon, 29 Sep 2008 13:21:22 -0400 Received: from [199.232.76.173] (port=42067 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KkMQz-00024S-U6 for qemu-devel@nongnu.org; Mon, 29 Sep 2008 13:21:21 -0400 Received: from savannah.gnu.org ([199.232.41.3]:45162 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KkMQz-0005Wr-LD for qemu-devel@nongnu.org; Mon, 29 Sep 2008 13:21:21 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KkMQy-0001vA-2f for qemu-devel@nongnu.org; Mon, 29 Sep 2008 17:21:20 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KkMQx-0001v2-0N for qemu-devel@nongnu.org; Mon, 29 Sep 2008 17:21:19 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Mon, 29 Sep 2008 17:21:19 +0000 Subject: [Qemu-devel] [5353] target-alpha: factorize load/store code Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5353 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5353 Author: aurel32 Date: 2008-09-29 17:21:17 +0000 (Mon, 29 Sep 2008) Log Message: ----------- target-alpha: factorize load/store code Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/target-alpha/translate.c Modified: trunk/target-alpha/translate.c =================================================================== --- trunk/target-alpha/translate.c 2008-09-29 16:25:16 UTC (rev 5352) +++ trunk/target-alpha/translate.c 2008-09-29 17:21:17 UTC (rev 5353) @@ -256,7 +256,7 @@ gen_excp(ctx, EXCP_OPCDEC, 0); } -static always_inline void gen_load_mem (DisasContext *ctx, +static always_inline void gen_load_mem_dyngen (DisasContext *ctx, void (*gen_load_op)(DisasContext *ctx), int ra, int rb, int32_t disp16, int clear) @@ -277,7 +277,31 @@ } } -static always_inline void gen_store_mem (DisasContext *ctx, +static always_inline void gen_load_mem (DisasContext *ctx, + void (*tcg_gen_qemu_load)(TCGv t0, TCGv t1, int flags), + int ra, int rb, int32_t disp16, + int clear) +{ + TCGv addr; + + if (unlikely(ra == 31)) + return; + + addr = tcg_temp_new(TCG_TYPE_I64); + if (rb != 31) { + tcg_gen_addi_i64(addr, cpu_ir[rb], disp16); + if (clear) + tcg_gen_andi_i64(addr, addr, ~0x7); + } else { + if (clear) + disp16 &= ~0x7; + tcg_gen_movi_i64(addr, disp16); + } + tcg_gen_qemu_load(cpu_ir[ra], addr, ctx->mem_idx); + tcg_temp_free(addr); +} + +static always_inline void gen_store_mem_dyngen (DisasContext *ctx, void (*gen_store_op)(DisasContext *ctx), int ra, int rb, int32_t disp16, int clear) @@ -295,6 +319,31 @@ (*gen_store_op)(ctx); } +static always_inline void gen_store_mem (DisasContext *ctx, + void (*tcg_gen_qemu_store)(TCGv t0, TCGv t1, int flags), + int ra, int rb, int32_t disp16, + int clear) +{ + TCGv addr = tcg_temp_new(TCG_TYPE_I64); + if (rb != 31) { + tcg_gen_addi_i64(addr, cpu_ir[rb], disp16); + if (clear) + tcg_gen_andi_i64(addr, addr, ~0x7); + } else { + if (clear) + disp16 &= ~0x7; + tcg_gen_movi_i64(addr, disp16); + } + if (ra != 31) + tcg_gen_qemu_store(cpu_ir[ra], addr, ctx->mem_idx); + else { + TCGv zero = tcg_const_i64(0); + tcg_gen_qemu_store(zero, addr, ctx->mem_idx); + tcg_temp_free(zero); + } + tcg_temp_free(addr); +} + static always_inline void gen_load_fmem (DisasContext *ctx, void (*gen_load_fop)(DisasContext *ctx), int ra, int rb, int32_t disp16) @@ -655,103 +704,29 @@ /* LDBU */ if (!(ctx->amask & AMASK_BWX)) goto invalid_opc; - 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); - } + gen_load_mem(ctx, &tcg_gen_qemu_ld8u, ra, rb, disp16, 0); break; case 0x0B: /* LDQ_U */ - 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); - } + gen_load_mem(ctx, &tcg_gen_qemu_ld64, ra, rb, disp16, 1); break; case 0x0C: /* LDWU */ if (!(ctx->amask & AMASK_BWX)) goto invalid_opc; - 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); - } + gen_load_mem(ctx, &tcg_gen_qemu_ld16u, ra, rb, disp16, 1); break; case 0x0D: /* STW */ - { - 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); - } + gen_store_mem(ctx, &tcg_gen_qemu_st16, ra, rb, disp16, 0); break; case 0x0E: /* STB */ - { - 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); - } + gen_store_mem(ctx, &tcg_gen_qemu_st8, ra, rb, disp16, 0); break; case 0x0F: /* STQ_U */ - { - 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); - } + gen_store_mem(ctx, &tcg_gen_qemu_st64, ra, rb, disp16, 1); break; case 0x10: switch (fn7) { @@ -2189,79 +2164,35 @@ break; case 0x28: /* LDL */ - 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); - } + gen_load_mem(ctx, &tcg_gen_qemu_ld32s, ra, rb, disp16, 0); break; case 0x29: /* LDQ */ - 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); - } + gen_load_mem(ctx, &tcg_gen_qemu_ld64, ra, rb, disp16, 0); break; case 0x2A: /* LDL_L */ - gen_load_mem(ctx, &gen_ldl_l, ra, rb, disp16, 0); + gen_load_mem_dyngen(ctx, &gen_ldl_l, ra, rb, disp16, 0); break; case 0x2B: /* LDQ_L */ - gen_load_mem(ctx, &gen_ldq_l, ra, rb, disp16, 0); + gen_load_mem_dyngen(ctx, &gen_ldq_l, ra, rb, disp16, 0); break; case 0x2C: /* STL */ - { - 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); - } + gen_store_mem(ctx, &tcg_gen_qemu_st32, ra, rb, disp16, 0); break; case 0x2D: /* STQ */ - { - 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); - } + gen_store_mem(ctx, &tcg_gen_qemu_st64, ra, rb, disp16, 0); break; case 0x2E: /* STL_C */ - gen_store_mem(ctx, &gen_stl_c, ra, rb, disp16, 0); + gen_store_mem_dyngen(ctx, &gen_stl_c, ra, rb, disp16, 0); break; case 0x2F: /* STQ_C */ - gen_store_mem(ctx, &gen_stq_c, ra, rb, disp16, 0); + gen_store_mem_dyngen(ctx, &gen_stq_c, ra, rb, disp16, 0); break; case 0x30: /* BR */