From patchwork Sat Mar 4 18:56:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 735323 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 3vbFkv30zdz9s7f for ; Sun, 5 Mar 2017 06:01:11 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HQ3z9XXg"; dkim-atps=neutral Received: from localhost ([::1]:36304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckEvU-0000ha-RC for incoming@patchwork.ozlabs.org; Sat, 04 Mar 2017 14:01:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckEs4-0006tD-Ov for qemu-devel@nongnu.org; Sat, 04 Mar 2017 13:57:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ckEs3-0008Fx-P6 for qemu-devel@nongnu.org; Sat, 04 Mar 2017 13:57:36 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:36165) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ckEs3-0008Fo-K3 for qemu-devel@nongnu.org; Sat, 04 Mar 2017 13:57:35 -0500 Received: by mail-qk0-x244.google.com with SMTP id n141so11289041qke.3 for ; Sat, 04 Mar 2017 10:57:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cZ/jmbE6hqOCkd4CfcY/kyL0OmTuT3QsE6ayM5Z9SoU=; b=HQ3z9XXgl+JC5hOaUUSfQ2/5g9TrHr7zrM6Ywnp5AKYZlU/Itqo6UZMNpBmB1bMV+0 lGRJcVTyS+l01qsP8o5JLn5wmeQi7wNNqBTr7EzJXtOu21tNNwzt/1GFNGuvFSB/kH6p TV3yOI5Iu3q5zzXny5ofLxiOraedr1s8FjOHy2fabKccbwjgYY82D0FvpZFO9msj97k5 QURabe5X+iwAOMaZOElQiRCVAS8Z5Qk5xdgzHrYZ2U9Xb9GuoWalJ9DzqQCPLBDKzVnT x4rnyDNiLatlo5YlhziAaeP2rOrB550eN2VssIsSGh5xZE5diDx/QUqJvj0nU26ZcsIC Cp1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cZ/jmbE6hqOCkd4CfcY/kyL0OmTuT3QsE6ayM5Z9SoU=; b=PIm6jM4tN5opdWVWDKhk80vstDRP17hoW36ar5sqHBqqwJUJhssTEiRF0VMktBbKJk grmVrkdJWv9oZm7mvnqjHNg3ffnjKs8q/12ID1oEZNp13WBW/Peuy3k7Dvkpyz3MYUpm Btm5evHcTVgiiiK7lZeQZl7FKDe2atRrzvptLw+IOAwaO47E7oIq6hRRbcnNz9jIHDmy RFeKmkq/RiIWvohyBnVdCHvHKi/rwuXTjeu3+X8nqSuEO93POqqWlsG+zomBwlucQe5v G2gDq5F3vMyKbiv2a/6/kx6jiUaPSK6dpW6ez5dW3L1bREpOlUWb7r8LhzBdx3N2v51g 763Q== X-Gm-Message-State: AMke39lxroketBhP5lW0lwndL7zidC6YdhIkS9zuhk6jl3EazdtHEEocj4v6ISWiqBvesA== X-Received: by 10.200.46.27 with SMTP id r27mr9261657qta.221.1488653855049; Sat, 04 Mar 2017 10:57:35 -0800 (PST) Received: from yoga.lan ([138.117.48.226]) by smtp.gmail.com with ESMTPSA id k8sm10048006qke.54.2017.03.04.10.57.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Mar 2017 10:57:34 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Yongbok Kim Date: Sat, 4 Mar 2017 15:56:52 -0300 Message-Id: <20170304185652.10675-6-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170304185652.10675-1-f4bug@amsat.org> References: <20170304185652.10675-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH 5/5] target-mips: replace few LOG_DISAS() with trace points X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yongbok Kim --- Makefile.objs | 1 + target/mips/trace-events | 5 +++++ target/mips/translate.c | 25 +++++++++++-------------- 3 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 target/mips/trace-events diff --git a/Makefile.objs b/Makefile.objs index e740500e2d..6167e7b17d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -157,6 +157,7 @@ trace-events-subdirs += audio trace-events-subdirs += net trace-events-subdirs += target/arm trace-events-subdirs += target/i386 +trace-events-subdirs += target/mips trace-events-subdirs += target/sparc trace-events-subdirs += target/s390x trace-events-subdirs += target/ppc diff --git a/target/mips/trace-events b/target/mips/trace-events new file mode 100644 index 0000000000..43824089b3 --- /dev/null +++ b/target/mips/trace-events @@ -0,0 +1,5 @@ +# See docs/tracing.txt for syntax documentation. + +# target/mips/translate.c +mips_translate_c0(const char *instr, const char *rn, int reg, int sel) "%s %s (reg %d sel %d)" +mips_translate_tr(const char *instr, int rt, int u, int sel, int h) "%s (reg %d u %d sel %d h %d)" diff --git a/target/mips/translate.c b/target/mips/translate.c index fc11e15a17..78b7264add 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -33,6 +33,7 @@ #include "sysemu/kvm.h" #include "exec/semihost.h" +#include "target/mips/trace.h" #include "trace-tcg.h" #include "exec/log.h" @@ -4866,9 +4867,7 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel) default: goto cp0_unimplemented; } - - (void)rn; /* avoid a compiler warning */ - LOG_DISAS("mfhc0 %s (reg %d sel %d)\n", rn, reg, sel); + trace_mips_translate_c0("mfhc0", rn, reg, sel); return; cp0_unimplemented: @@ -4941,8 +4940,8 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, int reg, int sel) default: goto cp0_unimplemented; } + trace_mips_translate_c0("mthc0", rn, reg, sel); - (void)rn; /* avoid a compiler warning */ cp0_unimplemented: qemu_log_mask(LOG_UNIMP, "mthc0 %s (reg %d sel %d)\n", rn, reg, sel); } @@ -5622,8 +5621,7 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel) default: goto cp0_unimplemented; } - (void)rn; /* avoid a compiler warning */ - LOG_DISAS("mfc0 %s (reg %d sel %d)\n", rn, reg, sel); + trace_mips_translate_c0("mfc0", rn, reg, sel); return; cp0_unimplemented: @@ -6284,8 +6282,8 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel) default: goto cp0_unimplemented; } - (void)rn; /* avoid a compiler warning */ - LOG_DISAS("mtc0 %s (reg %d sel %d)\n", rn, reg, sel); + trace_mips_translate_c0("mtc0", rn, reg, sel); + /* For simplicity assume that all writes can cause interrupts. */ if (ctx->tb->cflags & CF_USE_ICOUNT) { gen_io_end(); @@ -6923,8 +6921,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, int reg, int sel) default: goto cp0_unimplemented; } - (void)rn; /* avoid a compiler warning */ - LOG_DISAS("dmfc0 %s (reg %d sel %d)\n", rn, reg, sel); + trace_mips_translate_c0("dmfc0", rn, reg, sel); return; cp0_unimplemented: @@ -7583,8 +7580,8 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel) default: goto cp0_unimplemented; } - (void)rn; /* avoid a compiler warning */ - LOG_DISAS("dmtc0 %s (reg %d sel %d)\n", rn, reg, sel); + trace_mips_translate_c0("dmtc0", rn, reg, sel); + /* For simplicity assume that all writes can cause interrupts. */ if (ctx->tb->cflags & CF_USE_ICOUNT) { gen_io_end(); @@ -7803,7 +7800,7 @@ static void gen_mftr(CPUMIPSState *env, DisasContext *ctx, int rt, int rd, default: goto die; } - LOG_DISAS("mftr (reg %d u %d sel %d h %d)\n", rt, u, sel, h); + trace_mips_translate_tr("mftr", rt, u, sel, h); gen_store_gpr(t0, rd); tcg_temp_free(t0); return; @@ -8008,7 +8005,7 @@ static void gen_mttr(CPUMIPSState *env, DisasContext *ctx, int rd, int rt, default: goto die; } - LOG_DISAS("mttr (reg %d u %d sel %d h %d)\n", rd, u, sel, h); + trace_mips_translate_tr("mttr", rd, u, sel, h); tcg_temp_free(t0); return;