From patchwork Thu Jun 17 17:43:15 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: 12329037 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,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 073DFC48BE5 for ; Thu, 17 Jun 2021 17:48:21 +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 A41F3613CB for ; Thu, 17 Jun 2021 17:48:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A41F3613CB 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]:42896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltw7n-0005us-Pi for qemu-devel@archiver.kernel.org; Thu, 17 Jun 2021 13:48:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltw3C-0005yV-TJ for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:34 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:36683) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltw39-00016U-Pz for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:34 -0400 Received: by mail-wm1-x331.google.com with SMTP id h11-20020a05600c350bb02901b59c28e8b4so6947720wmq.1 for ; Thu, 17 Jun 2021 10:43:31 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=OWUY/dG4dghXb308+v5XGfZ+xJXcTg6zhfiqLqE4gSg=; b=jGHgKeQEZHQm3HeZNE7vFQ2dPti8NDBScAhvG18KIugmickHzzVHcbrdKzH+2QD1FC 9/3l14g+kZYs/O2aiUbsqOQO0pVZBPKZQOz3ZzEHMH+VUZJup+2c8Dom7cER+z1ZRofP fYGWgVWuqWc/3+CY2Gk9/7Y+S6M4lZrBc8eIjLrqafJfVpFgrR4iFOSN8Isgf3Vlo3pg 6yHCsMPyH4O55UKkf7rtDtZbcsZV1xUwoUujTQJUo5NOVVJtFIaEtq9EYQDLdKYj64ws Z1F7b+ho0s5LCrdKJ8kzVI751aOE2+L/wA/ROuEhPtbCp06EEMLLB2g9Olo/VJ3WpC9P Y3DQ== 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=OWUY/dG4dghXb308+v5XGfZ+xJXcTg6zhfiqLqE4gSg=; b=G64RvB1LMeN9RymG3KWJLEwAIAw5fsmiqcBJNHsnOj8w7wwD7o3HUHypauMyn8QjQP +p9dy2I/X0DwaxQH7SY8/ae8dkcwLLyB3NP6TWNIrZf22Fmc0OJ/VWn5rgIwQkLnoT5G /L0DWYF7n+gObtqJaLBvgYZD4NAhBtt85za8rT4J+2jo9x5GhsWRXMNXh66Zs8K6Jl4J hSpKEwqhHwrjbRUKHIc3tT4AxRY/M9UJkFkfz5Rgr4uM7a9WM68XEWAfeM+6iMzi/83x 3Hehh2V1aCDAEwUlyBpiix+0B3iw/yaO/uZTg+oJ2obeSRf8Cfvm6FFaivkuErb25aTg rdTg== X-Gm-Message-State: AOAM5310vq0z67crMji7CMLPdy4VP056i5aXNaAqrGx2uD/EbjM8xP1N MCFq7EB2ykaxCamJ0/6MP2C9oWAMQoI6AQ== X-Google-Smtp-Source: ABdhPJwVewpujhAusmSvetR73dp2LL3wn2XrBuhQ3tKdb04/hoe+MYCXnrRuLtxOLywIe0QuyJexBw== X-Received: by 2002:a1c:5f87:: with SMTP id t129mr6495962wmb.86.1623951809862; Thu, 17 Jun 2021 10:43:29 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id k82sm8602873wmf.11.2021.06.17.10.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:43:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/9] target/mips: Do not abort on invalid instruction Date: Thu, 17 Jun 2021 19:43:15 +0200 Message-Id: <20210617174323.2900831-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174323.2900831-1-f4bug@amsat.org> References: <20210617174323.2900831-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x331.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.249, 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 , Richard Henderson , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On real hardware an invalid instruction doesn't halt the world, but usually triggers a RESERVED INSTRUCTION exception. TCG guest code shouldn't abort QEMU anyway. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/tcg/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 0954ce0dbc3..b92a473f870 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -12151,8 +12151,8 @@ static void gen_branch(DisasContext *ctx, int insn_bytes) tcg_gen_lookup_and_goto_ptr(); break; default: - fprintf(stderr, "unknown branch 0x%x\n", proc_hflags); - abort(); + LOG_DISAS("unknown branch 0x%x\n", proc_hflags); + gen_reserved_instruction(ctx); } } } From patchwork Thu Jun 17 17:43:16 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: 12329027 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,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 36DE8C2B9F4 for ; Thu, 17 Jun 2021 17:45:51 +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 B7612613CA for ; Thu, 17 Jun 2021 17:45:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B7612613CA 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]:34420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltw5L-0000C4-Vh for qemu-devel@archiver.kernel.org; Thu, 17 Jun 2021 13:45:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltw3G-00061k-7T for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:38 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:54148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltw3E-00019c-L0 for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:37 -0400 Received: by mail-wm1-x335.google.com with SMTP id j18so3795759wms.3 for ; Thu, 17 Jun 2021 10:43:36 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=rsoKZ7f8yxgrxqEHzFjGR/VAfd9jTxkbFGEdSqiHzIk=; b=cCI14Zw7Vkp/t5WEyU9NeRfTz0cNxvPdweVwtmJbWf1ZIkMA6+cmpn8pmyohTmspKD 77NXEP+CnzBpaneZim0VeQjJDzWFUyXi81C8HUxT1e8oCmcq3bRMWOyzIHqgVGSop+QX 9OqGfqaCeX0P3RNh49Fzj5xuoVgMhQoFCokTev7SnZZ+aA9wSxRT4M1RFvHXBQZCrFFA J6AkROKMyCtiobx3csOlrH6ejY7V/po4QI018/6CX56e3en1KBYuWAmXHhGBK0V8OwjC mqXmsrWZeikkIGThmi70uenCgDZU7ITLLMu+V7iGGGxeJt6HqXmPK7nCXvVuBbcri89t mMXA== 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=rsoKZ7f8yxgrxqEHzFjGR/VAfd9jTxkbFGEdSqiHzIk=; b=lBunwj//jF23bnx6RIa8RTd8X1741hBNnMC7a5gDa3qkluaSLrutW8TfNGUeBsCJ/X KWOC/D7cIXWf6TQ1lB7S9QjY3z8/HCkVFm/2UVbNDP+SY1RizE7jluhgNjgXZCZQDaqw vBS24yxplBo8Fw/F7b7IHVYuj0E9XZy+h4suOHOsNIeY4L9xyTxlXsnud94iB2YjMSYE Wq+JEH2gBYFiI/SnUKYjYajDqeoaI3GTi/PV8Au+16KOGE0jItyakFuEhPvs2/Y3DFmL 5g02S6Gr3N4Tp+DPG0xbmMUv2LJmCWhmE440Ml09yaXOVkLNcpqzzmC34yM4mr+/m0S8 yirQ== X-Gm-Message-State: AOAM531ovHInqEMgbAGOP03+6E26HIPNeYtRj/AA9GdM0Z9jd+fhoM1D EOgWolsiou10qgBS1hB6nNzd6Au3y5/1QQ== X-Google-Smtp-Source: ABdhPJzna0qcZF/xSrh1BtMaigLhorUoxNbeDAFr+vk9FeWQZB1kfnzQOC+NHuFJarOHWlgMlVeKvA== X-Received: by 2002:a7b:c405:: with SMTP id k5mr6571013wmi.34.1623951815005; Thu, 17 Jun 2021 10:43:35 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id o26sm5466004wms.27.2021.06.17.10.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:43:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/9] target/mips: Fix more TCG temporary leaks in gen_pool32a5_nanomips_insn Date: Thu, 17 Jun 2021 19:43:16 +0200 Message-Id: <20210617174323.2900831-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174323.2900831-1-f4bug@amsat.org> References: <20210617174323.2900831-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x335.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.249, 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 , Richard Henderson , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Fix multiple TCG temporary leaks in gen_pool32a5_nanomips_insn(). Fixes: 3285a3e4445 ("target/mips: Add emulation of DSP ASE for nanoMIPS - part 1") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/tcg/translate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index b92a473f870..4b7229a868a 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -20298,6 +20298,10 @@ static void gen_pool32a5_nanomips_insn(DisasContext *ctx, int opc, gen_reserved_instruction(ctx); break; } + + tcg_temp_free(v2_t); + tcg_temp_free(v1_t); + tcg_temp_free(t0); } static int decode_nanomips_32_48_opc(CPUMIPSState *env, DisasContext *ctx) From patchwork Thu Jun 17 17:43:17 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: 12329031 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,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 D2F75C2B9F4 for ; Thu, 17 Jun 2021 17:46:29 +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 79622613CB for ; Thu, 17 Jun 2021 17:46:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 79622613CB 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]:36298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltw60-0001Sr-7k for qemu-devel@archiver.kernel.org; Thu, 17 Jun 2021 13:46:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltw3K-0006Fd-QX for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:42 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:42860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltw3J-0001Cf-7C for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:42 -0400 Received: by mail-wr1-x429.google.com with SMTP id c5so7692033wrq.9 for ; Thu, 17 Jun 2021 10:43:40 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jc2qmXWDFJ8kQFMS9jZlt3xShTo6ocA1K1RvWad+d5Q=; b=VitH2s/DdnCniSQ76YAFM4o/8gtg3cCOAWqh/9xGsCITQ+I0457wQgyJ46DR6abKDF CyKtSjnX743LibFyOQ3qkUVLJ2MJ7a3iMB4r4Gi7Yb5JmKxXH4+znCcdSwLixsyf4kwb wXqqep0HnC0FuZvxY3FWBTm6LPkj9MEw13bEvd2zT6UcPKUKu1vGAhNtwKGT5fNFKclG roJdQ4n3UBgtGlmJQWSw970mhvrb8uGPzMbAjAzmXUfT/qLvlRkZytINHtik4uAIG6o8 Vrj20+j0KFQ3LrZDcG0+fRbhhZM7EOyBlVRtBvFUO4jRVtT+Ij8Veaa+GBaGoCw0pzZg WPcQ== 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=Jc2qmXWDFJ8kQFMS9jZlt3xShTo6ocA1K1RvWad+d5Q=; b=Oy26spBM4Edl/txoIGavdvYlsd+KFfXxdCO0lS+RCDCmrRHtRlVSNl8qECLUer28Hz lA/YjqXhr6hIYH0FsJ7gW6NLQx/oX1b4fL8YewIpemtKyNhr6DzyuwIwp+XQICs74UMY 5QQD5xbb30u++YiXWsVkr6YMLVm2lfNoVikL8jplLFRCs4nvUbm/TvlueMKOrn3sjPa4 9CwiCx40PLjLxE1kkdcsZRyD0ZChIpyO1Ty8UcqB3WdWbaKZSohTTtr42H+WIjJlW8CJ fMkk39UUyn9worUfpIGRIvE4tZOYXhO9mWkW0w7V/NWwnHVvG5Q3WJ0sB8hubgxyZ/dW by2Q== X-Gm-Message-State: AOAM533rBkpKUVLVEbK5pyqqgErgBrXH/iEiGbDONq9rS4sBS4gpZtS6 3uYtxkweR80BG43P8CIxghITp3bnNYs9Wg== X-Google-Smtp-Source: ABdhPJyRkX1gdvgaCjd7VXPlW3Pb6qCcMip+lEhVkj2gvhrm6zGYaJVLBnb3HpKXnwc4JtYUBFJC4Q== X-Received: by 2002:adf:9ccf:: with SMTP id h15mr7133290wre.217.1623951819647; Thu, 17 Jun 2021 10:43:39 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id f14sm8342507wmq.10.2021.06.17.10.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:43:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/9] target/mips: Move TCG trace events to tcg/ sub directory Date: Thu, 17 Jun 2021 19:43:17 +0200 Message-Id: <20210617174323.2900831-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174323.2900831-1-f4bug@amsat.org> References: <20210617174323.2900831-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x429.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.249, 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 , Richard Henderson , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Commit a2b0a27d33e ("target/mips: Move TCG source files under tcg/ sub directory") forgot to move the trace-event file. As it only contains TCG events, move it for consistency. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- meson.build | 2 +- target/mips/tcg/translate.c | 1 + target/mips/{ => tcg}/trace-events | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename target/mips/{ => tcg}/trace-events (100%) diff --git a/meson.build b/meson.build index a2311eda6ec..196adef6f8d 100644 --- a/meson.build +++ b/meson.build @@ -1882,7 +1882,7 @@ 'target/hppa', 'target/i386', 'target/i386/kvm', - 'target/mips', + 'target/mips/tcg', 'target/ppc', 'target/riscv', 'target/s390x', diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 4b7229a868a..a4cab66d338 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -33,6 +33,7 @@ #include "target/mips/trace.h" #include "trace-tcg.h" +#include "trace.h" #include "exec/translator.h" #include "exec/log.h" #include "qemu/qemu-print.h" diff --git a/target/mips/trace-events b/target/mips/tcg/trace-events similarity index 100% rename from target/mips/trace-events rename to target/mips/tcg/trace-events From patchwork Thu Jun 17 17:43:18 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: 12329045 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,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 5F1E3C2B9F4 for ; Thu, 17 Jun 2021 17:50:38 +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 E28C36101A for ; Thu, 17 Jun 2021 17:50:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E28C36101A 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]:51334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltwA1-00033m-2H for qemu-devel@archiver.kernel.org; Thu, 17 Jun 2021 13:50:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltw3S-0006PM-6Q for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:51 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:41756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltw3N-0001FY-W6 for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:47 -0400 Received: by mail-wm1-x330.google.com with SMTP id y13-20020a1c4b0d0000b02901c20173e165so4201866wma.0 for ; Thu, 17 Jun 2021 10:43:45 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=R7Xfsej5DEajIa18cawD/xf7U5trIsp041pqQxhlGvo=; b=MTa5Zh2uds1fP9AZai4ljx7+szq45+rbnFOkPqI82F1wNO6Rx6sN2TcGeDgsz+TnP7 LXcYitIDiOREQ4RXe04mkM0H4hTqIztTQ+Bnd+3lLfgzfeqkhCuNMdUmfFOlMAm8DBBq LzlxrGJ+l3YFuXCORmX/Kh5wqxAG3FY+S8+dVCGGMOK+rN4lNmuMzYtWtwwUtQKaV9eZ hjia+3vDR/y2033GTmDhClsbsQVHQ0GIvN8vX2HJh/uyrZfVvrpm5oConOR5K83DZ8K0 HomYj1NwPsRhQw2S9w8dH1VlnRlWj23FKtucRSpcRnb+2wMkfgHeRJEdMOrBG0EZZbDl pD6Q== 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=R7Xfsej5DEajIa18cawD/xf7U5trIsp041pqQxhlGvo=; b=haYJNAyls62b/zFMxQzll7EN5TpLXEPSx/4dP8GoOynksTT1llT4RtdbcvYhuDQ5f6 89cUsQn3yiKMM5qRR8IXhhZrr6GjKjlSkVSdr4izAqBO9aMGE7MNWXBsqYZif9Ngt8ku NB7k3C716I9MsRIsKMtKqkmvgEEI5WHyN1bPGE/aT/2zJXCYVjF0f5EqioFgNsN8X5T7 7d6xnWpbSx0LqGr1IvR+lXtxeT2E6tGJrb2BrTWF5Ahyzyx7shx4HCSpFNc2fJGrhDNd C4oRf1yEj2jGzqs5ZA37h29/QJDZ4XVXI61HdUU+7GnHKAdIljKeFmRsD06JQX4jRiTi +6nQ== X-Gm-Message-State: AOAM532xwoTKNeM5EoQG0syqYCGOeUsMoy1E+nbhgkn+ES79+REnVyj/ 03iM1Y3Lpo14epncqFTTczOWqGB6Vkufvg== X-Google-Smtp-Source: ABdhPJxxoWugCp2g4bWqeZnUedhbFJM1Cj6OzOhXD2tgNAQG/ODKVFUz3DCXecziNPZye9p8R+AEaw== X-Received: by 2002:a7b:c3da:: with SMTP id t26mr6411332wmj.63.1623951824297; Thu, 17 Jun 2021 10:43:44 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id n7sm8143605wmq.37.2021.06.17.10.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:43:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/9] target/mips: Move translate.h to tcg/ sub directory Date: Thu, 17 Jun 2021 19:43:18 +0200 Message-Id: <20210617174323.2900831-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174323.2900831-1-f4bug@amsat.org> References: <20210617174323.2900831-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x330.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.249, 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 , Richard Henderson , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We moved various TCG source files in commit a2b0a27d33e ("target/mips: Move TCG source files under tcg/ sub directory") but forgot to move the header declaring their prototypes. Do it now, since all it declares is TCG specific. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/{ => tcg}/translate.h | 0 target/mips/tcg/msa_translate.c | 2 +- target/mips/tcg/mxu_translate.c | 2 +- target/mips/tcg/rel6_translate.c | 2 +- target/mips/tcg/translate.c | 2 +- target/mips/tcg/translate_addr_const.c | 2 +- target/mips/tcg/tx79_translate.c | 2 +- target/mips/tcg/txx9_translate.c | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename target/mips/{ => tcg}/translate.h (100%) diff --git a/target/mips/translate.h b/target/mips/tcg/translate.h similarity index 100% rename from target/mips/translate.h rename to target/mips/tcg/translate.h diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translate.c index ae6587edf69..b3b06352bf2 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "tcg/tcg-op.h" #include "exec/helper-gen.h" -#include "translate.h" +#include "tcg/translate.h" #include "fpu_helper.h" #include "internal.h" diff --git a/target/mips/tcg/mxu_translate.c b/target/mips/tcg/mxu_translate.c index fb0a811af6c..f70a8ca59f4 100644 --- a/target/mips/tcg/mxu_translate.c +++ b/target/mips/tcg/mxu_translate.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "tcg/tcg-op.h" #include "exec/helper-gen.h" -#include "translate.h" +#include "tcg/translate.h" /* * diff --git a/target/mips/tcg/rel6_translate.c b/target/mips/tcg/rel6_translate.c index 0354370927d..8289263ada5 100644 --- a/target/mips/tcg/rel6_translate.c +++ b/target/mips/tcg/rel6_translate.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "tcg/tcg-op.h" #include "exec/helper-gen.h" -#include "translate.h" +#include "tcg/translate.h" /* Include the auto-generated decoder. */ #include "decode-mips32r6.c.inc" diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index a4cab66d338..f0738daa847 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -38,7 +38,7 @@ #include "exec/log.h" #include "qemu/qemu-print.h" #include "fpu_helper.h" -#include "translate.h" +#include "tcg/translate.h" /* * Many sysemu-only helpers are not reachable for user-only. diff --git a/target/mips/tcg/translate_addr_const.c b/target/mips/tcg/translate_addr_const.c index 96f483418eb..3a54749e3bc 100644 --- a/target/mips/tcg/translate_addr_const.c +++ b/target/mips/tcg/translate_addr_const.c @@ -12,7 +12,7 @@ */ #include "qemu/osdep.h" #include "tcg/tcg-op.h" -#include "translate.h" +#include "tcg/translate.h" bool gen_lsa(DisasContext *ctx, int rd, int rt, int rs, int sa) { diff --git a/target/mips/tcg/tx79_translate.c b/target/mips/tcg/tx79_translate.c index ad83774b977..967969b141a 100644 --- a/target/mips/tcg/tx79_translate.c +++ b/target/mips/tcg/tx79_translate.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "tcg/tcg-op.h" #include "exec/helper-gen.h" -#include "translate.h" +#include "tcg/translate.h" /* Include the auto-generated decoder. */ #include "decode-tx79.c.inc" diff --git a/target/mips/tcg/txx9_translate.c b/target/mips/tcg/txx9_translate.c index 8a2c0b766bd..5f147b89eef 100644 --- a/target/mips/tcg/txx9_translate.c +++ b/target/mips/tcg/txx9_translate.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "translate.h" +#include "tcg/translate.h" bool decode_ext_txx9(DisasContext *ctx, uint32_t insn) { From patchwork Thu Jun 17 17:43:19 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: 12329051 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,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 47E2DC49361 for ; Thu, 17 Jun 2021 17:53:10 +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 C1ECA613CB for ; Thu, 17 Jun 2021 17:53:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1ECA613CB 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]:58996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltwCT-0008E4-02 for qemu-devel@archiver.kernel.org; Thu, 17 Jun 2021 13:53:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltw3T-0006QL-UV for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:51 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:35758) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltw3S-0001Gw-Cg for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:51 -0400 Received: by mail-wr1-x430.google.com with SMTP id m18so7709989wrv.2 for ; Thu, 17 Jun 2021 10:43:50 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=unit4JgEQfUxC97CDRdybI6rtAIvnMfZCcJpKphtNpg=; b=J9Vpkm9G1T4lmDFD6yo2LhUyQ0vSvDJKGZSdzdZpbMG1GGLIU7eNICcbKMJD9zFRcU ow81eVV5ayQEUVB++eS1lq34x/molt0PpINzxIrN9Qj6YgrNqmsowdvv/+pJRIdEZ42L qtXwg/GW3WNkonrBHTSutNUO4X8tDaIFzLR5vejbASOCM+V/VVE3Wl8zTa7YxCKAAYgR 0LeM6vJA5ys8hZ+k4FfxIT6EuJWNFu2ZRV3G54eLbSe/IUUbpPCzjV257dR1rgIc3XU1 hzevHUQjOU8dZgn8V08i8ABovJf+gVgNNbNNBmQfI2gkpcsun6hPgUZxt3xMKH4u5Cz9 qOcQ== 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=unit4JgEQfUxC97CDRdybI6rtAIvnMfZCcJpKphtNpg=; b=oE+Zw0pan9ZYbamlp096ldHBuyx0je0qgDDlx/4t9zjbIAg3WD3aoAFNSmnZHEzBZi QFR+suKz1Yh6WwQ6ZBtMrFIbZhyOKejnoU0ntQ3M8tim88Eg3SiMHTEsnCZQyLTX6eph nBX5FGRmBYjEA0TV1R3lIWhzldWRII4kWJN2VYLcXE/uJKjpstSavRYY8XNXRbFb+h5s nsAeBuCWzP0zsB2yFuWzSHTCDVKyt6r2w/Im/IuL+nf0d89VtgjthhzdIjmLzCN+gibN C4U+mm16fwZ+hi4ZGtIFAYV/G9Wl29fcNCWNSZe5Fqz+EVv1KILDJec6lsCAXfhqtHGa HF5A== X-Gm-Message-State: AOAM533WikLG5Fjt28ZyUwWFNEACMG78b2QPAWJY8+hHHXdRy6yIxylY +A5S0HWmD/lbsNbX26JWMqfCBzsAakEOyQ== X-Google-Smtp-Source: ABdhPJzoawBpP6dRG8mB8IUJiQAxDP04knRuNV7zhmZx7rxtugGzfU8G21K8mjNyP2vpGXIOFfZcIQ== X-Received: by 2002:a5d:648a:: with SMTP id o10mr7245444wri.274.1623951828902; Thu, 17 Jun 2021 10:43:48 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id a9sm5942092wrv.37.2021.06.17.10.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:43:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/9] target/mips: Restrict some system specific declarations to sysemu Date: Thu, 17 Jun 2021 19:43:19 +0200 Message-Id: <20210617174323.2900831-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174323.2900831-1-f4bug@amsat.org> References: <20210617174323.2900831-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x430.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.249, 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 , Richard Henderson , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Commit 043715d1e0f ("target/mips: Update ITU to utilize SAARI and SAAR CP0 registers") declared itc_reconfigure() in public namespace, while it is restricted to system emulation. Similarly commit 5679479b9a1 ("target/mips: Move CP0 helpers to sysemu/cp0.c") restricted cpu_mips_soft_irq() definition to system emulation, but forgot to restrict its declaration. Commit a2b0a27d33e ("target/mips: Move TCG source files under tcg/ sub directory") restricted mips_cpu_do_unaligned_access() to system emulation but forgot to guard the declaration. To avoid polluting user-mode emulation with these declarations, restrict them to sysemu. Also restrict the sysemu ITU/ITC/IRQ fields from CPUMIPSState. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/cpu.h | 10 +++++++--- target/mips/tcg/tcg-internal.h | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 075c24abdad..1dfe69c6c0c 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1152,13 +1152,13 @@ struct CPUMIPSState { CPUMIPSMVPContext *mvp; #if !defined(CONFIG_USER_ONLY) CPUMIPSTLBContext *tlb; + void *irq[8]; + struct MIPSITUState *itu; + MemoryRegion *itc_tag; /* ITC Configuration Tags */ #endif const mips_def_t *cpu_model; - void *irq[8]; QEMUTimer *timer; /* Internal timer */ - struct MIPSITUState *itu; - MemoryRegion *itc_tag; /* ITC Configuration Tags */ target_ulong exception_base; /* ExceptionBase input to the core */ uint64_t cp0_count_ns; /* CP0_Count clock period (in nanoseconds) */ }; @@ -1316,12 +1316,16 @@ uint64_t cpu_mips_phys_to_kseg1(void *opaque, uint64_t addr); bool mips_um_ksegs_enabled(void); void mips_um_ksegs_enable(void); +#if !defined(CONFIG_USER_ONLY) + /* mips_int.c */ void cpu_mips_soft_irq(CPUMIPSState *env, int irq, int level); /* mips_itu.c */ void itc_reconfigure(struct MIPSITUState *tag); +#endif /* !CONFIG_USER_ONLY */ + /* helper.c */ target_ulong exception_resume_pc(CPUMIPSState *env); diff --git a/target/mips/tcg/tcg-internal.h b/target/mips/tcg/tcg-internal.h index 81b14eb219e..11d98a717f2 100644 --- a/target/mips/tcg/tcg-internal.h +++ b/target/mips/tcg/tcg-internal.h @@ -23,9 +23,6 @@ bool mips_cpu_exec_interrupt(CPUState *cpu, int int_req); bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); -void mips_cpu_do_unaligned_access(CPUState *cpu, vaddr addr, - MMUAccessType access_type, - int mmu_idx, uintptr_t retaddr); const char *mips_exception_name(int32_t exception); @@ -57,6 +54,9 @@ void mips_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, MMUAccessType access_type, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t retaddr); +void mips_cpu_do_unaligned_access(CPUState *cpu, vaddr addr, + MMUAccessType access_type, + int mmu_idx, uintptr_t retaddr); void cpu_mips_tlb_flush(CPUMIPSState *env); #endif /* !CONFIG_USER_ONLY */ From patchwork Thu Jun 17 17:43:20 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: 12329029 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,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 EC4A9C2B9F4 for ; Thu, 17 Jun 2021 17:46:10 +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 8C98C613BA for ; Thu, 17 Jun 2021 17:46:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C98C613BA 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]:35646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltw5g-00011T-Va for qemu-devel@archiver.kernel.org; Thu, 17 Jun 2021 13:46:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltw3Y-0006ct-Tp for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:57 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:42872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltw3X-0001K6-Bx for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:43:56 -0400 Received: by mail-wr1-x434.google.com with SMTP id c5so7692674wrq.9 for ; Thu, 17 Jun 2021 10:43:54 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=qof+yv8e9S7550YKz4Cn5HOdqyTeOFddruO/ErbyrOE=; b=cwrIXXp9tySunF5SKMayaYv+zyNkCsNoWd81muP5j/pERsxNuwGvzhZJERXbPezvhb vPQyhhJDVKxSSnoxDY0UDFXfSILDm8KV1FwfZrLieXc6W910r1Q3PyDyBkI/5amMUBKW 6ruEJ7DlG61ehX2No4PkhIQuebEVsi/4oXQaq1P9O8MqCE8hXEJQgU9YrokDPQdPbPNl AaemebfLGlz9+yCeeLaymGP/SFl042Xv04JEJNr3GjmgJtUAvVj6XJanLYmaBFyfPTYP 7XDJTV8xG/un8nLwpPXJDViTWOGHsbs1dDrgbRdG/kFFi/SNku/dOcIM2VvtXwcMOfNz MIxw== 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=qof+yv8e9S7550YKz4Cn5HOdqyTeOFddruO/ErbyrOE=; b=mATSfMwFpqvi/Np/wHNJQ+2YdLUxUmMjwXED8ZU1FiiGmSPrxIjz6mgA1Rds9k2yAb A0XhDFvqojC6eHSZVZm2898Ul/PWVspI5ey88uZ2p8uKgS/6uwtkKHvtBLTgouEkvFHD qqDcmQxXlWsJNY/aR/oIrmXBu3WFBivajurgSSCdxo22C2r/LJtgdhtkTz4E24ZvXrtA GAKBdY6dlv2oZN7JiXHNpIStTOS45TNnQrWnx4tWIhuTyOPsNHvw0ej6PxpWoxWN52T0 lEE+GXu4ZXt8oSRAwqckTaKpIlWjcmZ7FmvAdnijh3yHhehk1R/xNXqdRO5q8iE4Nk6U UZ2g== X-Gm-Message-State: AOAM533dBwq6MIAVawNytbYVSuxWPaK19G/HKvbADsRvDyeVtqPOf0Pp GO99Jyzh+aiFtj4gWeVMllRw4BDjQeXGTQ== X-Google-Smtp-Source: ABdhPJxrzJrIin1yAiluYi8B4fIS/0JforoINPnkyJ70FaFlcsxAaggY7qUuTutUQdCWMIk9BilNbg== X-Received: by 2002:a5d:5082:: with SMTP id a2mr7276211wrt.199.1623951833796; Thu, 17 Jun 2021 10:43:53 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id p13sm5105040wrt.89.2021.06.17.10.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:43:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 6/9] target/mips: Remove SmartMIPS / MDMX unuseful comments Date: Thu, 17 Jun 2021 19:43:20 +0200 Message-Id: <20210617174323.2900831-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174323.2900831-1-f4bug@amsat.org> References: <20210617174323.2900831-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x434.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.249, 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 , Richard Henderson , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" These placeholder comments for SmartMIPS and MDMX extensions have been added commit 3c824109da0 ("target-mips: microMIPS ASE support"). More than 11 years later it is safe to assume there won't be added soon, so remove these unuseful comments. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/tcg/translate.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index f0738daa847..47c7705f051 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -21579,14 +21579,6 @@ static int decode_nanomips_opc(CPUMIPSState *env, DisasContext *ctx) } -/* SmartMIPS extension to MIPS32 */ - -#if defined(TARGET_MIPS64) - -/* MDMX extension to MIPS64 */ - -#endif - /* MIPSDSP functions. */ static void gen_mipsdsp_ld(DisasContext *ctx, uint32_t opc, int rd, int base, int offset) From patchwork Thu Jun 17 17:43:21 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: 12329039 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,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 20AB1C2B9F4 for ; Thu, 17 Jun 2021 17:48:25 +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 C12846101A for ; Thu, 17 Jun 2021 17:48:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C12846101A 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]:43010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltw7r-0005z5-TR for qemu-devel@archiver.kernel.org; Thu, 17 Jun 2021 13:48:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltw3j-0006qp-3J for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:44:07 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:33308) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltw3g-0001Mg-1V for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:44:06 -0400 Received: by mail-wr1-x435.google.com with SMTP id d11so5335055wrm.0 for ; Thu, 17 Jun 2021 10:43:59 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=QQhnyJT7IqQiTtdyfsN9R/GF4TMQXLmBFDH1C75S2Y8=; b=OZ/74dMVEsOdFLewUxjSfBSqgE22ViKZop546vCdAhgg/ZsjTfZk4WhYuTEnbQyoMZ TqHzGUoGY8Hk+GAHpagGXddaFhFl0JMrSQGgiZZfwfqnkPqn8juQpLMkuJhZK+a9Zql1 9vS0VqAdv1qZGTZS5zuGxBFazwA+1fSolSmBj7vRrBo75bn3rqOwqECDoEGrNTsPz+eN rqJbyq5Esft2ZE1h1RM72od5iCSnpZVyPHoWz/O4eDzQ765k9LmhkIdWKjsMRjmktezb L8ERbmRxI11zO7WrNptBDIBJ3OqZIGUoMM/FzNCZpoQOA0TSpHlbXK8UM2ECgm0q90Ph BT4Q== 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=QQhnyJT7IqQiTtdyfsN9R/GF4TMQXLmBFDH1C75S2Y8=; b=jdVRQSiEAUOeRDQoqP3o1xZscKt/svrDPi0Zfsh7w2Jg0KX+uMT5gebj3si0wWg9h9 eZ2IvA7GmsqAJpvZ7gPAoQ17CFe1WEFF14obAyjmznO+LSrxIjaJclWbVKaOAI8FoJY8 MYB2egVGPS/SfSXYfculBOHQa48P/cyjSyKIhyumm0hQMKs8tJFwlry3mSySL7fWydhy N8L/yW85o4oQ3xT0z9kco9UOh196wMrLMOkz2OOqAyl5cSpzvpRTw5K5pfYz3uYYy99g /su5Od6AyZ8zp/F+aRKYsORla088TDHiDcFenFTmdDbJMMjBDgV/VrHPHGtH+luTLqGY N0OA== X-Gm-Message-State: AOAM532o4xzsG26guR+zzfEELG3hzsXs1aAnIqPSVCLNWAKpBba6PnGM LUL1XiDe/GEp9Wv+5cZkCWz/kQKCZ7Ef+A== X-Google-Smtp-Source: ABdhPJw0KDPjETB8KqTg2L7wX3/VrkmJgUcDiV6RRV1QCFlI7BClemxutP4dsuZMKRVnwdmyhlO+Iw== X-Received: by 2002:a5d:4752:: with SMTP id o18mr7152889wrs.323.1623951838775; Thu, 17 Jun 2021 10:43:58 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id h9sm8469142wmm.33.2021.06.17.10.43.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:43:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 7/9] target/mips: Remove microMIPS BPOSGE32 / BPOSGE64 unuseful cases Date: Thu, 17 Jun 2021 19:43:21 +0200 Message-Id: <20210617174323.2900831-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174323.2900831-1-f4bug@amsat.org> References: <20210617174323.2900831-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x435.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.249, 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 , Richard Henderson , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" These switch cases for the microMIPS BPOSGE32 / BPOSGE64 opcodes have been added commit 3c824109da0 ("target-mips: microMIPS ASE support"). More than 11 years later it is safe to assume there won't be added soon. The cases fall back to the default which generates a RESERVED INSTRUCTION, so it is safe to remove them. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/tcg/translate.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 47c7705f051..5d571d83c54 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -14077,8 +14077,6 @@ enum { BGEZALS = 0x13, BC2F = 0x14, BC2T = 0x15, - BPOSGE64 = 0x1a, - BPOSGE32 = 0x1b, /* These overlap and are distinguished by bit16 of the instruction */ BC1F = 0x1c, BC1T = 0x1d, @@ -16122,10 +16120,6 @@ static void decode_micromips32_opc(CPUMIPSState *env, DisasContext *ctx) generate_exception_err(ctx, EXCP_CpU, 1); } break; - case BPOSGE64: - case BPOSGE32: - /* MIPS DSP: not implemented */ - /* Fall through */ default: MIPS_INVAL("pool32i"); gen_reserved_instruction(ctx); From patchwork Thu Jun 17 17:43:22 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: 12329055 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,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 8D7B6C2B9F4 for ; Thu, 17 Jun 2021 17:54:20 +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 4A291613CE for ; Thu, 17 Jun 2021 17:54:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A291613CE 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]:35466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltwDb-0002vr-Gh for qemu-devel@archiver.kernel.org; Thu, 17 Jun 2021 13:54:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltw3j-0006rD-6l for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:44:07 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:34463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltw3h-0001OY-HM for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:44:06 -0400 Received: by mail-wm1-x32e.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso5279897wmc.1 for ; Thu, 17 Jun 2021 10:44:04 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=z+tQ+79u0v5Hqcb6NxLeyIdCtff9V34lJUP0h2IdROs=; b=W7aqm7R1Z2/GIxr9BhIHUWrmxcRVqb1INqfbf7Iavp6L3+WIKHUPd7B1rjn0cx+UW8 dAXjiV2Ueu0Hgnf4q3a7E17VnLujF1Gd+8j/nbCLO21C9oPUX8raDQUHxsWN7aJVoVSG UcKiQ5+I133qHsxaQ0l2HDek9d3nUN+16vYbe85tjtmsVagKaAweVescnY/LXiC9kU47 rZRRgSJ1bnhs8fD1JkcO4IMF3JDA27ztL2Vsk12vVS1rmUD9FwXPML3G4ZRZt5pdRSrv YhJKC1vkxW1vAnU0UYt3X/gCaxzp+H96DxDf6CQInhV+iQT5MSjEPmcZu2nfehgaeTdq +mkQ== 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=z+tQ+79u0v5Hqcb6NxLeyIdCtff9V34lJUP0h2IdROs=; b=aYrA6BAZxyoauQZLk/bf1Q9WrKJQC2KwJ+8vMU5s/WF22bVvOIk4Hp7z/BY89dGEIz CLsvGOCjYGQ5TLIeb0DkEhU3wfISmIgDAuMs0l2E7afgBJa+E7WnBoUYXSRYB4g2d9Is IUUixCPPt+/gfK85VBSvtMRCsoNjukOnNPk65OhNE1Mj74zpeEcB8Zq9atOudExdlbfg Q0dak8qnsbthRC3cm0I4tHS4QTGRXT/JTg4d6gFc9vRlsCMYUCCoFnWTGoD7/vFOhxUJ WEYHAtT/abJKqXWir85+npbmn+IYy2UEx2WUa+gHxZ8jEPuVz73HCsjdDDBKMVt28Hvc spbw== X-Gm-Message-State: AOAM533LSm8cqsq9wV//YO4DQwhkWccRrX4JwcIq3ZJIfcYE9x4kN8Vk RYMSyzFZ6x0wtoaSQRgRlmVL/CO0tSWn2Q== X-Google-Smtp-Source: ABdhPJxp9y2v3c9YVAeb1/osSH6nqfN8FCqznUXsM9loSLNi34jDVf185dZcUcwAJng0UxiQzDEqcw== X-Received: by 2002:a05:600c:4f90:: with SMTP id n16mr6467326wmq.139.1623951843312; Thu, 17 Jun 2021 10:44:03 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id c7sm6204017wrs.23.2021.06.17.10.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:44:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 8/9] target/mips: Constify host_to_mips_errno[] Date: Thu, 17 Jun 2021 19:43:22 +0200 Message-Id: <20210617174323.2900831-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174323.2900831-1-f4bug@amsat.org> References: <20210617174323.2900831-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32e.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.249, 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 , Richard Henderson , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Keep host_to_mips_errno[] in .rodata by marking the array const. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/tcg/sysemu/mips-semi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/mips/tcg/sysemu/mips-semi.c b/target/mips/tcg/sysemu/mips-semi.c index 6de60fa6dd7..77108b0b1a9 100644 --- a/target/mips/tcg/sysemu/mips-semi.c +++ b/target/mips/tcg/sysemu/mips-semi.c @@ -75,7 +75,7 @@ enum UHIOpenFlags { }; /* Errno values taken from asm-mips/errno.h */ -static uint16_t host_to_mips_errno[] = { +static const uint16_t host_to_mips_errno[] = { [ENAMETOOLONG] = 78, #ifdef EOVERFLOW [EOVERFLOW] = 79, From patchwork Thu Jun 17 17:43:23 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: 12329041 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,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 B4AB1C2B9F4 for ; Thu, 17 Jun 2021 17:48:36 +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 7923A6101A for ; Thu, 17 Jun 2021 17:48:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7923A6101A 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]:44204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltw83-0006m7-IT for qemu-devel@archiver.kernel.org; Thu, 17 Jun 2021 13:48:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltw3n-00073n-7r for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:44:11 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:35763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltw3l-0001Rq-Hy for qemu-devel@nongnu.org; Thu, 17 Jun 2021 13:44:10 -0400 Received: by mail-wr1-x432.google.com with SMTP id m18so7710956wrv.2 for ; Thu, 17 Jun 2021 10:44:09 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=RoU+7ht74MR+uFQU3Fe913vTah/u1fs34mzDvWBnykU=; b=PFWA+9fPatF/9NJ95kCiwTEH+SgOOZzRg+Z2TkfGcqNKBr++fRBZCHM2F1UafxCXFJ hgVqYgdO+dLdIm4yBvfws5mQo/9GZuMqwqgo1d7xWygtBqR4RiPxDfIVO+ZDJWvbjkJJ FvZNKoCRa48hF4MTnn/ByQvtHsFN/tOcQl03uTJkMp15qXYCDw+fQ8UqIyWY1jWBIiZF yUoJrIQ14QraJBkiWGLvlKpwWHEhAegXI0nc0S4Qwa1bngAip3wgMAlvDBgExMTFnLmB GkMN4LLm2vBxVqb7TW1OYeYHZ/eRCrMooZ8mJ6pWqXMLpxXNhRtFVrTee4f87e3P6sDk ZeQA== 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=RoU+7ht74MR+uFQU3Fe913vTah/u1fs34mzDvWBnykU=; b=qV0Dn9P2e5W2HGkAdkg3ISMY623th3uULNpB27tOjA52mdtE9UI7+qQDqfmeSSR+l3 fuhEQrc+OWRn1103kZo2wxGqROKFIQjtuccY7Ax7kRkJ+AJNGI8BLIVNG3+DGuoahdqF jB5hjhYsrZLSjH5wsx/W6LxZzrRS9IYfQSUARPk2fugd6glY5pPUCKOHYGLVMQGNQm1l qZnbnIW1E6mkGKu1XksMCn/pVadIMMpAPkH0n2vMLFqJBLyXOnMjPmfiS+w2Bu0hZL/h eepGyhRx89BrA65Bbon057MlU7lpQCrh6ew6zo3aHV2l5zrukMPrAmOAKVhdmDeBbEIX Q8vA== X-Gm-Message-State: AOAM531XV9M/AuJM9q2I1LFwYMRzPthQaaT1bmi9a5cGasHJ7tABPerk XThKOc9rG0eHknZql5OAOvDbwhX+IWzEGQ== X-Google-Smtp-Source: ABdhPJzM3qtaAu5eq0B0+9Uu2piNu4NBocIwXUSu57BL5+GFMsz83ivWyZfUSNP9b/LfGPgJfH5XBA== X-Received: by 2002:adf:a412:: with SMTP id d18mr7259901wra.49.1623951848000; Thu, 17 Jun 2021 10:44:08 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id v8sm6645721wrc.29.2021.06.17.10.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:44:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 9/9] target/mips: Optimize regnames[] arrays Date: Thu, 17 Jun 2021 19:43:23 +0200 Message-Id: <20210617174323.2900831-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174323.2900831-1-f4bug@amsat.org> References: <20210617174323.2900831-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x432.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.249, 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 , Richard Henderson , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Since all entries are no more than 3/4/6 bytes (including nul terminator), can save space and pie runtime relocations by declaring regnames[] as array of 3/4/6 const char. Inspired-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/internal.h | 2 +- target/mips/cpu.c | 2 +- target/mips/tcg/msa_translate.c | 2 +- target/mips/tcg/mxu_translate.c | 4 ++-- target/mips/tcg/translate.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 18d5da64a57..eecdd101169 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -74,7 +74,7 @@ struct mips_def_t { int32_t SAARP; }; -extern const char regnames[32][4]; +extern const char regnames[32][3]; extern const char fregnames[32][4]; extern const struct mips_def_t mips_defs[]; diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 96236abc006..d426918291a 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -35,7 +35,7 @@ #include "qapi/qapi-commands-machine-target.h" #include "fpu_helper.h" -const char regnames[32][4] = { +const char regnames[32][3] = { "r0", "at", "v0", "v1", "a0", "a1", "a2", "a3", "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translate.c index b3b06352bf2..a2f7d6a1e08 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -255,7 +255,7 @@ enum { OPC_BINSRI_df = (0x7 << 23) | OPC_MSA_BIT_09, }; -static const char * const msaregnames[] = { +static const char msaregnames[][6] = { "w0.d0", "w0.d1", "w1.d0", "w1.d1", "w2.d0", "w2.d1", "w3.d0", "w3.d1", "w4.d0", "w4.d1", "w5.d0", "w5.d1", diff --git a/target/mips/tcg/mxu_translate.c b/target/mips/tcg/mxu_translate.c index f70a8ca59f4..e336518cdea 100644 --- a/target/mips/tcg/mxu_translate.c +++ b/target/mips/tcg/mxu_translate.c @@ -447,9 +447,9 @@ enum { static TCGv mxu_gpr[NUMBER_OF_MXU_REGISTERS - 1]; static TCGv mxu_CR; -static const char * const mxuregnames[] = { +static const char mxuregnames[][4] = { "XR1", "XR2", "XR3", "XR4", "XR5", "XR6", "XR7", "XR8", - "XR9", "XR10", "XR11", "XR12", "XR13", "XR14", "XR15", "MXU_CR", + "XR9", "XR10", "XR11", "XR12", "XR13", "XR14", "XR15", "XCR", }; void mxu_translate_init(void) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 5d571d83c54..255f97fe9c1 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -1281,11 +1281,11 @@ TCGv_i64 fpu_f64[32]; #define DISAS_STOP DISAS_TARGET_0 #define DISAS_EXIT DISAS_TARGET_1 -static const char * const regnames_HI[] = { +static const char regnames_HI[][4] = { "HI0", "HI1", "HI2", "HI3", }; -static const char * const regnames_LO[] = { +static const char regnames_LO[][4] = { "LO0", "LO1", "LO2", "LO3", };