Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LkJMF-0006WF-7k for qemu-devel@nongnu.org; Thu, 19 Mar 2009 10:36:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LkJMA-0006TO-GS for qemu-devel@nongnu.org; Thu, 19 Mar 2009 10:36:29 -0400 Received: from [199.232.76.173] (port=51970 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LkJM8-0006SL-5P for qemu-devel@nongnu.org; Thu, 19 Mar 2009 10:36:24 -0400 Received: from mel.act-europe.fr ([212.99.106.210]:59663) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LkJM7-0002Ly-Eq for qemu-devel@nongnu.org; Thu, 19 Mar 2009 10:36:23 -0400 From: Tristan Gingold Date: Thu, 19 Mar 2009 15:35:49 +0100 Message-Id: <1237473356-81422-18-git-send-email-gingold@adacore.com> In-Reply-To: <1237473356-81422-17-git-send-email-gingold@adacore.com> References: <1237473356-81422-1-git-send-email-gingold@adacore.com> <1237473356-81422-2-git-send-email-gingold@adacore.com> <1237473356-81422-3-git-send-email-gingold@adacore.com> <1237473356-81422-4-git-send-email-gingold@adacore.com> <1237473356-81422-5-git-send-email-gingold@adacore.com> <1237473356-81422-6-git-send-email-gingold@adacore.com> <1237473356-81422-7-git-send-email-gingold@adacore.com> <1237473356-81422-8-git-send-email-gingold@adacore.com> <1237473356-81422-9-git-send-email-gingold@adacore.com> <1237473356-81422-10-git-send-email-gingold@adacore.com> <1237473356-81422-11-git-send-email-gingold@adacore.com> <1237473356-81422-12-git-send-email-gingold@adacore.com> <1237473356-81422-13-git-send-email-gingold@adacore.com> <1237473356-81422-14-git-send-email-gingold@adacore.com> <1237473356-81422-15-git-send-email-gingold@adacore.com> <1237473356-81422-16-git-send-email-gingold@adacore.com> <1237473356-81422-17-git-send-email-gingold@adacore.com> Subject: [Qemu-devel] [PATCH 17/24] Add instruction name in comments for hw_ld opcode. 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 Cc: Tristan Gingold Make code slightly easier to read. Also unused hw_ld opcodes now generate an invalid opc fault. Signed-off-by: Tristan Gingold --- target-alpha/translate.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/target-alpha/translate.c b/target-alpha/translate.c index df50d1c..51a628c 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -1793,62 +1793,62 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) tcg_gen_movi_i64(addr, disp12); switch ((insn >> 12) & 0xF) { case 0x0: - /* Longword physical access */ + /* Longword physical access (hw_ldl/p) */ gen_helper_ldl_raw(cpu_ir[ra], addr); break; case 0x1: - /* Quadword physical access */ + /* Quadword physical access (hw_ldq/p) */ gen_helper_ldq_raw(cpu_ir[ra], addr); break; case 0x2: - /* Longword physical access with lock */ + /* Longword physical access with lock (hw_ldl_l/p) */ gen_helper_ldl_l_raw(cpu_ir[ra], addr); break; case 0x3: - /* Quadword physical access with lock */ + /* Quadword physical access with lock (hw_ldq_l/p) */ gen_helper_ldq_l_raw(cpu_ir[ra], addr); break; case 0x4: - /* Longword virtual PTE fetch */ - gen_helper_ldl_kernel(cpu_ir[ra], addr); + /* Longword virtual PTE fetch (hw_ldl/v) */ + tcg_gen_qemu_ld32s(cpu_ir[ra], addr, 0); break; case 0x5: - /* Quadword virtual PTE fetch */ - gen_helper_ldq_kernel(cpu_ir[ra], addr); + /* Quadword virtual PTE fetch (hw_ldq/v) */ + tcg_gen_qemu_ld64(cpu_ir[ra], addr, 0); break; case 0x6: /* Incpu_ir[ra]id */ - goto incpu_ir[ra]id_opc; + goto invalid_opc; case 0x7: /* Incpu_ir[ra]id */ - goto incpu_ir[ra]id_opc; + goto invalid_opc; case 0x8: - /* Longword virtual access */ + /* Longword virtual access (hw_ldl) */ gen_helper_st_virt_to_phys(addr, addr); gen_helper_ldl_raw(cpu_ir[ra], addr); break; case 0x9: - /* Quadword virtual access */ + /* Quadword virtual access (hw_ldq) */ gen_helper_st_virt_to_phys(addr, addr); gen_helper_ldq_raw(cpu_ir[ra], addr); break; case 0xA: - /* Longword virtual access with protection check */ - tcg_gen_qemu_ld32s(cpu_ir[ra], addr, ctx->flags); + /* Longword virtual access with protection check (hw_ldl/w) */ + tcg_gen_qemu_ld32s(cpu_ir[ra], addr, 0); break; case 0xB: - /* Quadword virtual access with protection check */ - tcg_gen_qemu_ld64(cpu_ir[ra], addr, ctx->flags); + /* Quadword virtual access with protection check (hw_ldq/w) */ + tcg_gen_qemu_ld64(cpu_ir[ra], addr, 0); break; case 0xC: - /* Longword virtual access with altenate access mode */ + /* Longword virtual access with alt access mode (hw_ldl/a)*/ gen_helper_set_alt_mode(); gen_helper_st_virt_to_phys(addr, addr); gen_helper_ldl_raw(cpu_ir[ra], addr); gen_helper_restore_mode(); break; case 0xD: - /* Quadword virtual access with altenate access mode */ + /* Quadword virtual access with alt access mode (hw_ldq/a) */ gen_helper_set_alt_mode(); gen_helper_st_virt_to_phys(addr, addr); gen_helper_ldq_raw(cpu_ir[ra], addr); @@ -1856,7 +1856,7 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) break; case 0xE: /* Longword virtual access with alternate access mode and - * protection checks + * protection checks (hw_ldl/wa) */ gen_helper_set_alt_mode(); gen_helper_ldl_data(cpu_ir[ra], addr); @@ -1864,7 +1864,7 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) break; case 0xF: /* Quadword virtual access with alternate access mode and - * protection checks + * protection checks (hw_ldq/wa) */ gen_helper_set_alt_mode(); gen_helper_ldq_data(cpu_ir[ra], addr); -- 1.6.2