From patchwork Sun Oct 4 11:13:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 526098 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CB21C1402B4 for ; Sun, 4 Oct 2015 22:14:30 +1100 (AEDT) Received: from localhost ([::1]:42070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZihFM-0003QC-Oa for incoming@patchwork.ozlabs.org; Sun, 04 Oct 2015 07:14:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZihEr-0002tR-LI for qemu-devel@nongnu.org; Sun, 04 Oct 2015 07:13:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZihEm-0003Xh-Hy for qemu-devel@nongnu.org; Sun, 04 Oct 2015 07:13:57 -0400 Received: from col004-omc2s8.hotmail.com ([65.55.34.82]:55425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZihEm-0003Xa-5g for qemu-devel@nongnu.org; Sun, 04 Oct 2015 07:13:52 -0400 Received: from COL130-W40 ([65.55.34.73]) by COL004-OMC2S8.hotmail.com over TLS secured channel with Microsoft SMTPSVC(7.5.7601.23008); Sun, 4 Oct 2015 04:13:51 -0700 X-TMN: [7MAAcWBZKUap75Y4NfhZx9NTZuaCGkSx] X-Originating-Email: [xili_gchen_5257@hotmail.com] Message-ID: From: Chen Gang To: "rth@twiddle.net" , Peter Maydell , Chris Metcalf Date: Sun, 4 Oct 2015 19:13:51 +0800 Importance: Normal MIME-Version: 1.0 X-OriginalArrivalTime: 04 Oct 2015 11:13:51.0466 (UTC) FILETIME=[BFC49CA0:01D0FE95] X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 65.55.34.82 Cc: qemu-devel Subject: [Qemu-devel] [PATCH v2] target-tilegx: Use TILEGX_EXCP_OPCODE_UNKNOWN and TILEGX_EXCP_OPCODE_UNIMPLEMENTED correctly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From 0f53a45b3c29e3355cc6b2183ee084e62b86e5fe Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Sun, 4 Oct 2015 13:34:33 +0800 Subject: [PATCH v2] target-tilegx: Use TILEGX_EXCP_OPCODE_UNKNOWN and TILEGX_EXCP_OPCODE_UNIMPLEMENTED correctly For some cases, they are for TILEGX_EXCP_OPCODE_UNKNOWN, not for TILEGX_EXCP_OPCODE_UNIMPLEMENTED. Also for some cases, they are for TILEGX_EXCP_OPCODE_UNIMPLEMENTED, not for TILEGX_EXCP_OPCODE_UNKNOWN. When analyzing issues, the correct printing information is necessary, e.g. grep UIMP in gcc testsuite output log for finding qemu tilegx umimplementation issues, grep UNKNOWN for finding unknown instructions. Signed-off-by: Chen Gang ---  target-tilegx/translate.c | 41 ++++++++++++++++++++++++-----------------  1 file changed, 24 insertions(+), 17 deletions(-) --  1.9.3 diff --git a/target-tilegx/translate.c b/target-tilegx/translate.c index eb2d0b1..ab3fc81 100644 --- a/target-tilegx/translate.c +++ b/target-tilegx/translate.c @@ -291,7 +291,7 @@ static TileExcp gen_st_opcode(DisasContext *dc, unsigned dest, unsigned srca,                                unsigned srcb, TCGMemOp memop, const char *name)  {      if (dest) { -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }        tcg_gen_qemu_st_tl(load_gr(dc, srcb), load_gr(dc, srca), @@ -538,7 +538,7 @@ static TileExcp gen_rr_opcode(DisasContext *dc, unsigned opext,          mnemonic = "swint1";      done0:          if (srca || dest) { -            return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +            return TILEGX_EXCP_OPCODE_UNKNOWN;          }          qemu_log_mask(CPU_LOG_TB_IN_ASM, "%s", mnemonic);          return ret; @@ -584,7 +584,7 @@ static TileExcp gen_rr_opcode(DisasContext *dc, unsigned opext,          tcg_gen_andi_tl(dc->jmp.dest, load_gr(dc, srca), ~7);      done1:          if (dest) { -            return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +            return TILEGX_EXCP_OPCODE_UNKNOWN;          }          qemu_log_mask(CPU_LOG_TB_IN_ASM, "%s %s", mnemonic, reg_names[srca]);          return ret; @@ -679,7 +679,7 @@ static TileExcp gen_rr_opcode(DisasContext *dc, unsigned opext,      case OE_RR_X1(LNK):      case OE_RR_Y1(LNK):          if (srca) { -            return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +            return TILEGX_EXCP_OPCODE_UNKNOWN;          }          tcg_gen_movi_tl(tdest, dc->pc + TILEGX_BUNDLE_SIZE_IN_BYTES);          mnemonic = "lnk"; @@ -723,7 +723,7 @@ static TileExcp gen_rr_opcode(DisasContext *dc, unsigned opext,          mnemonic = "tblidxb3";          break;      default: -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }        qemu_log_mask(CPU_LOG_TB_IN_ASM, "%s %s, %s", mnemonic, @@ -1453,7 +1453,7 @@ static TileExcp gen_rrr_opcode(DisasContext *dc, unsigned opext,          mnemonic = "xor";          break;      default: -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }        qemu_log_mask(CPU_LOG_TB_IN_ASM, "%s %s, %s, %s", mnemonic, @@ -1745,7 +1745,7 @@ static TileExcp gen_rri_opcode(DisasContext *dc, unsigned opext,          break;        default: -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }        qemu_log_mask(CPU_LOG_TB_IN_ASM, "%s %s, %s, %d", mnemonic, @@ -1839,7 +1839,7 @@ static TileExcp gen_bf_opcode_x0(DisasContext *dc, unsigned ext,          break;        default: -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }        qemu_log_mask(CPU_LOG_TB_IN_ASM, "%s %s, %s, %u, %u", mnemonic, @@ -1895,7 +1895,7 @@ static TileExcp gen_branch_opcode_x1(DisasContext *dc, unsigned ext,          mnemonic = "blbs";          break;      default: -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }        if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) { @@ -1962,7 +1962,7 @@ static TileExcp gen_mtspr_x1(DisasContext *dc, unsigned spr, unsigned srca)        if (def == NULL) {          qemu_log_mask(CPU_LOG_TB_IN_ASM, "mtspr spr[%u], %s", spr, reg_names[srca]); -        return TILEGX_EXCP_OPCODE_UNKNOWN; +        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED;      }        tsrca = load_gr(dc, srca); @@ -1982,7 +1982,7 @@ static TileExcp gen_mfspr_x1(DisasContext *dc, unsigned dest, unsigned spr)        if (def == NULL) {          qemu_log_mask(CPU_LOG_TB_IN_ASM, "mtspr %s, spr[%u]", reg_names[dest], spr); -        return TILEGX_EXCP_OPCODE_UNKNOWN; +        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED;      }        tdest = dest_gr(dc, dest); @@ -2037,7 +2037,7 @@ static TileExcp decode_y0(DisasContext *dc, tilegx_bundle_bits bundle)          return gen_rri_opcode(dc, OE(opc, 0, Y0), dest, srca, imm);        default: -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }  }   @@ -2081,7 +2081,7 @@ static TileExcp decode_y1(DisasContext *dc, tilegx_bundle_bits bundle)          return gen_rri_opcode(dc, OE(opc, 0, Y1), dest, srca, imm);        default: -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }  }   @@ -2139,7 +2139,7 @@ static TileExcp decode_y2(DisasContext *dc, tilegx_bundle_bits bundle)          return gen_st_opcode(dc, 0, srca, srcbdest, MO_TEQ, "st");        default: -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }  }   @@ -2184,7 +2184,7 @@ static TileExcp decode_x0(DisasContext *dc, tilegx_bundle_bits bundle)          return gen_rri_opcode(dc, OE(opc, 0, X0), dest, srca, imm);        default: -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }  }   @@ -2274,7 +2274,7 @@ static TileExcp decode_x1(DisasContext *dc, tilegx_bundle_bits bundle)          return gen_rri_opcode(dc, OE(opc, 0, X1), dest, srca, imm);        default: -        return TILEGX_EXCP_OPCODE_UNIMPLEMENTED; +        return TILEGX_EXCP_OPCODE_UNKNOWN;      }  }   @@ -2285,8 +2285,15 @@ static void notice_excp(DisasContext *dc, uint64_t bundle,          return;      }      gen_exception(dc, excp); -    if (excp == TILEGX_EXCP_OPCODE_UNIMPLEMENTED) { +    switch (excp) { +    case TILEGX_EXCP_OPCODE_UNIMPLEMENTED:          qemu_log_mask(LOG_UNIMP, "UNIMP %s, [" FMT64X "]\n", type, bundle); +        break; +    case TILEGX_EXCP_OPCODE_UNKNOWN: +        qemu_log_mask(LOG_UNIMP, "UNKNOWN %s, [" FMT64X "]\n", type, bundle); +        break; +    default: +        break;      }  }