From patchwork Mon Oct 14 10:49:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 176186 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4387009ill; Mon, 14 Oct 2019 04:34:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqwh5jkoUKr1t4LZFoIyYsyFkf8qFiwXuoKuDPRDLUC2Z7VhT1sD+2g0ip9O44Nh0wWlkApC X-Received: by 2002:ac8:1732:: with SMTP id w47mr32583928qtj.167.1571052846122; Mon, 14 Oct 2019 04:34:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571052846; cv=none; d=google.com; s=arc-20160816; b=bcA/9pycaaHz6imxB13V+6soP0GfcPBQXN6jhDyN0VHSFcu3tES23LdAscVdhvr6Ey eCcETiIXyGvKIqH14u+HjLmIh/+t8H5YEu1NXvRDCioj6HE59lUUtpkBFnwOWZ4t1FO+ l/gsygrGtji2wsXm56apZY+Vk8RGdL4WKJCZC+pnUIFX3sAYPdU3AAwFRKcmGshkMAHy gXH6Bqvgm1X/JSx5bl0MZolJTYtRZlYTKzoY5fMQRGbWf3fjO+qXTjO/xogA9HiwVWdC YM/rUknt5Q+E8FCsyJg43/zQIYpTAk5vFDvoDlSqawCz9V1QMZwKcgGa5qa7ByGQ7stP iQDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=LYziuWTaDyCvsXZWL+7dYTQAPkm19wADCHnlP8tL2bI=; b=s3jc+0GNehPY52i/j8rNAie2WeRb5Pf4yE4IAHaim27Zq4PkyKKCFtR5z3R4BevW6L Q+Mzo6CgaW4+XVwKjCTsO908SYsrF3CJ8UOGRuttHE5v0KWcTa4zI/fc/aX2lpWKnqmZ G6BUh84H/bNcqqyhQPa2Ts2LykCW1p6nkxZj/huP+6gLfx/1pXFnXA+paE585vyqqLUx rQxHvWbJVfVzW8FIj+lBO8fzjgGH8aYbOastvqQOQfRgfjAIjq+dyivmkqFQe/L2BHX9 M+FwRflXec0uVW3lEBII+AgtXSZxzBmAuk6fAiLjbvxXIaN5o2+52QHxwS8obUxUc2Tb oXRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=brs8qxFc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c125si16029269qkb.283.2019.10.14.04.34.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Oct 2019 04:34:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=brs8qxFc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJyc1-000463-KI for patch@linaro.org; Mon, 14 Oct 2019 07:34:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45551) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJy2E-0006n0-OK for qemu-devel@nongnu.org; Mon, 14 Oct 2019 06:57:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJy2D-0005F5-E1 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 06:57:06 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40233) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iJy2C-0005Ce-Sm for qemu-devel@nongnu.org; Mon, 14 Oct 2019 06:57:05 -0400 Received: by mail-wr1-x444.google.com with SMTP id h4so19188014wrv.7 for ; Mon, 14 Oct 2019 03:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LYziuWTaDyCvsXZWL+7dYTQAPkm19wADCHnlP8tL2bI=; b=brs8qxFczQtTd/1c2IMBukmhANpiz8431JaxL0m9HQOdhzQUK7mHLY3XI6mSuSj8zE kc7kAE/EZMWbMAs9y3el0MIUQGljPoTEgE5GYBfn/ssxFhgNsYJpW07ox3nj98pnZxf2 kj9EZo3GGN8uSwObZiDpWgtYDrjMxAmJojgTs49PX/gr91nY+VMwHuAVa38qnkZwaJA0 69lzulNLbnF2J3zrYfEWdBvC8oQ12lWWT5d7IDPpumVa+tY5HWyizIDA30LiVb+pp8aG wUoh4kGNbj0Fe1UdfgEa1AmpakXUvqMsBkd4nHutk52kfNOgAYSxLNNmZJ3hmjMsl1/A ufiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LYziuWTaDyCvsXZWL+7dYTQAPkm19wADCHnlP8tL2bI=; b=f0N0trPzCW9fYlxlBDvrht/z5QqXzAj0psJNmxz3uGEuBTr+BLgzFyo7hp7IEdcLcv H+ERdPiCne9/xBOWu5eFELFs9yyb5NR6x2glGwJHVszGBaBLALJDBzJbQmdkp7aH40t4 aR5/bw2hXSmPif5yZDvO1Pl12fg3UtSiEz1owfL4ljtHEKWE2nhofMM4ZMWR51d8tOAV NpKuciTzUoFwnfmwoN7JyURS19NzP6Kt/5O+UejfjanH06GWR7SCUPnFRe48BtF8Oy00 X0fQ+JKceyALL1nyrE+rNIdIKvkjfNaIAYJ8tgaSKM/AKc3VNlWKmbDYxJojv4xG4HWS 525A== X-Gm-Message-State: APjAAAWnSQLl3BB8G/pWH2VgsQPzr9Ln1bqyrgRWok8WSkzkZzz7c1gG ut+s8vlptOdnellWUBX96ZoIlw== X-Received: by 2002:adf:e5cc:: with SMTP id a12mr11019845wrn.258.1571050622889; Mon, 14 Oct 2019 03:57:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u10sm17067030wmm.0.2019.10.14.03.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 03:56:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 482951FFB1; Mon, 14 Oct 2019 11:49:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v5 26/55] target/sh4: fetch code with translator_ld Date: Mon, 14 Oct 2019 11:49:19 +0100 Message-Id: <20191014104948.4291-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191014104948.4291-1-alex.bennee@linaro.org> References: <20191014104948.4291-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: robert.foley@futurewei.com, Richard Henderson , peter.puhov@futurewei.com, aaron@os.amperecomputing.com, cota@braap.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" There is a small wrinkle with the gUSA instruction. The translator effectively treats a (known) gUSA sequence as a single instruction. For the purposes of the plugin we end up with a long multi-instruction qemu_plugin_insn. If the known sequence isn't detected we shall never run this translation anyway. Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- target/sh4/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 5a7d8c4535..922785e225 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -1917,7 +1917,7 @@ static void decode_gusa(DisasContext *ctx, CPUSH4State *env) /* Read all of the insns for the region. */ for (i = 0; i < max_insns; ++i) { - insns[i] = cpu_lduw_code(env, pc + i * 2); + insns[i] = translator_lduw(env, pc + i * 2); } ld_adr = ld_dst = ld_mop = -1; @@ -2332,7 +2332,7 @@ static void sh4_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) } #endif - ctx->opcode = cpu_lduw_code(env, ctx->base.pc_next); + ctx->opcode = translator_lduw(env, ctx->base.pc_next); decode_opc(ctx); ctx->base.pc_next += 2; }