From patchwork Sat May 29 16:54:43 2021 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: 12287977 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6632DC47082 for ; Sat, 29 May 2021 16:56:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D34D1610CE for ; Sat, 29 May 2021 16:56:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D34D1610CE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ln2Fk-0001Kx-NU for qemu-devel@archiver.kernel.org; Sat, 29 May 2021 12:56:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ln2Ee-00005k-UW for qemu-devel@nongnu.org; Sat, 29 May 2021 12:54:53 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:45015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ln2Eb-0004kz-Ta for qemu-devel@nongnu.org; Sat, 29 May 2021 12:54:51 -0400 Received: by mail-wr1-x436.google.com with SMTP id r10so6289514wrj.11 for ; Sat, 29 May 2021 09:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H/j00hEbe6+E9TUrgGoJ4busYCQdPM+IW6semZPtYG4=; b=sn+YCOf2BhZB8M9EYzyu/HdkiwbgV6ZGIp9ABRQf+EfCOZsMEGEXRJhH0y+D7Hntfl S0mHaf/uOyCbQ1aAU5+eG48u6UWOVcyj0se9aExnrLXRE03Br80dbt6MZZ/0g0lgv98I /WCxIFoP++0JPRgfAKq+ZeTXJt06nIdeATXWr+GVoWYoRcmHCz3NxpxzjUtPv0I3sfFb V8TvskGMSsyqrADP0Dl2sWYmevuCXsWRi7npVevL1T2Nzhf4UpOmgO906055R2yAi1hS ms1/sAcV+IhjeJ4a57FLbTmh4x0HPyfnFfj4ho9IaLOiRL2B6WV44FuidhnTLLT+l0Q8 tbHg== 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 :mime-version:content-transfer-encoding; bh=H/j00hEbe6+E9TUrgGoJ4busYCQdPM+IW6semZPtYG4=; b=IJNPboTtW0nog6/4j+PgyuFoP2VZjuPsA5qGADzgvuLjTJja+a4BJvrdoHk+ZnXqBn MlYkHu8sWfhFyhX+Qlgv2THrE82Cpg8bN8wfC/cJmxv/4cG0swTNu0H4A8rPV9TSb/ya aDelgEFD4lQHFS0if84lmKnRoQvc7P9GCCXUZOdeKJ9jR8XMzuRM011+YHmOfRJzRZKQ VR9xwdnnuKyz/wLFW9QTNwbMFr2058TZ5fRk/wmBeI3E5NP1bgY0jJyjMUzI2QHbUZqC v7ZJTs5KTZZfHim53rBySIuuXl19g6rEc8ebVPNjxrDwCDWW2KaIO7dLWMbgrgpBfmPC ATzw== X-Gm-Message-State: AOAM530juP3XqngFi5eP+q2fNbqvLFDE+3qvCO0JqAywzg9NvcS3rIer 4ss5RuZnqsBd5zxsVsQK6yJEoMzaJVC1lQ== X-Google-Smtp-Source: ABdhPJztxKmfKDOS6oU8LX+ghLTQOBdrkBDnKaGu19rQPqY/bx6L0iLzgH/tj6e8SZHDi0X+yXOqFw== X-Received: by 2002:a5d:5745:: with SMTP id q5mr14447900wrw.56.1622307285906; Sat, 29 May 2021 09:54:45 -0700 (PDT) Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id z5sm10956187wrn.69.2021.05.29.09.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 09:54:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] target/mips: Raise exception when DINSV opcode used with DSP disabled Date: Sat, 29 May 2021 18:54:43 +0200 Message-Id: <20210529165443.1114402-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Aleksandar Rikalo , Jia Liu , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Per the "MIPS® DSP Module for MIPS64 Architecture" manual, rev. 3.02, Table 5.3 "SPECIAL3 Encoding of Function Field for DSP Module": If the Module/ASE is not implemented, executing such an instruction must cause a Reserved Instruction Exception. The DINSV instruction lists the following exceptions: - Reserved Instruction - DSP Disabled If the MIPS core doesn't support the DSP module, or the DSP is disabled, do not handle the '$rt = $0' case as a no-op but raise the proper exception instead. Cc: Jia Liu Fixes: 1cb6686cf92 ("target-mips: Add ASE DSP bit/manipulation instructions") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/tcg/translate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index c03a8ae1fed..6ccba34c050 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -24373,10 +24373,11 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) { TCGv t0, t1; + check_dsp(ctx); + if (rt == 0) { break; } - check_dsp(ctx); t0 = tcg_temp_new(); t1 = tcg_temp_new();