From nobody Mon May 6 23:44:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623951811; cv=none; d=zohomail.com; s=zohoarc; b=FfjhvfNKe9GGs+nailnw2E5AXf1esn9juEcnpNUUGJurs1HC6JxIb5wDMgaStFP5HrZqIf5juIPNUFYI6J5MaID3QRcrMKBXlmevrmkCgsV+kcbwK9eFPks/St3KC7rUwavYbvDbfoQEKku/qnY0GSQJC8tFy1kcuaWs9KBY3uI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623951811; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OWUY/dG4dghXb308+v5XGfZ+xJXcTg6zhfiqLqE4gSg=; b=n0Egkk804LuEu2vp1B6lQORO5DiO86lM3UQSbEWkFI+ltEfzI1ARPKfZ2xF2E1lj3HML+TH4JNK332Tds3lQHvwA7Hfcqg5N5hwDOlr78nT+8Yl0e72SL/TceL0csnYhsTmHDbzMoA3VoqUkp8azoOvMFoLk6CwrecpBvpD2UuI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1623951811554637.7385261396373; Thu, 17 Jun 2021 10:43:31 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id 3-20020a05600c0243b029019f2f9b2b8aso4164736wmj.2 for ; Thu, 17 Jun 2021 10:43:31 -0700 (PDT) Return-Path: Return-Path: 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) 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=sKSliPuKuY4g+gT8VLr9EHNMI7IV4QpspGCNRtYKMqMxAzBNksGPKypjs7wbNjehGk qngyFIJWJh7UbB6iH74BNMdjsvZv8fSqpZ6OJqnxkEK1gh3IVDF9AXHojkPJlfdGPW9P pxdT4pLIAAB+/L64lpkqlFTHoLXbhhCR3AeUeNVJr/sLB6ZIh9GPlkIg435qN2O5mNko ArTi3rSNIzW9MhrDYB7MLw3gdMp7wyh6RAfQawawItbTPiFC8pyRtpz1FuB8azgZgOEy EdzRRL71gzPbl+X1qkFi6ReHOc4Nr/xUWRao1PiQS17A4UeS8XR233AYiuBuF/keAkLJ IFig== X-Gm-Message-State: AOAM531F3w15eKUDILdO+SlYn9GW+zp6yrK7l2/exst7ggvxMe2zDMi1 sTHYYcLeYkr79K/7M8GLQUw= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Richard Henderson , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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); } } } --=20 2.31.1 From nobody Mon May 6 23:44:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623951816; cv=none; d=zohomail.com; s=zohoarc; b=MtW/rMqPvsqSNrgrH2KU4+cSe6GdAzW+9f2DjB6tjwjuKQrn7dJ7oQKSmjjq9UOgYuouoULUbMeoDRAzh2nXldmsm1SZd74y1UmYW4JXDRzvkVknqAGWiMn6wa9IAI1xuxO8+1rnFv3/GTZdXlAwAguUakyYqz0mpmNeAqAyLow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623951816; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rsoKZ7f8yxgrxqEHzFjGR/VAfd9jTxkbFGEdSqiHzIk=; b=ZggUkNB1OjB91+pXcPQ3cC6N6gY2fzft1UQ2Rm+G3fNEsTobzx0gqjmWRqDrYM5OskAssEZUng8aQVUBGYSbv7eqlRAq8Xx0Bj0WFUMaHyj8cSqR8bxcTdz+q+FjK3oSgbLMVtwalZvnC868bOB+Nsa1AB+aW7Fz9Xda02swUdI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1623951816753432.62208243312523; Thu, 17 Jun 2021 10:43:36 -0700 (PDT) Received: by mail-wm1-f41.google.com with SMTP id c18-20020a05600c0ad2b02901cee262e45fso4163627wmr.4 for ; Thu, 17 Jun 2021 10:43:36 -0700 (PDT) Return-Path: Return-Path: 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) 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=VM4B9db0yQPVS+kS8RUVmmRlFUS9UZEKHl/+OypTTo9KVS8sCT2qE/R44o/1W9rLhv 6801NZbrPUAkMJMXYxFuKQcwQjlsl0Ux3IixGA821MOvti4S23TaYx8keVeCyv89dag9 Ke2NyVUQQgMAWBFWsHhl0qElXhAHr/zfISJF2xBs57XdWjVbFGdMysWtsL2xnAXyL1JW //MG5B0QGrqoZWHLjj6yFE3BaX1r6X8xKpHbgj0ekLkBfOwO+CDlnNf0Oon5KhEZ/lIN 3FePZASzUefbgICAws84AeE1jGiI28uGzsWQ8OMcDhc74jCh7d5uLM/1s0ZbIK9oGEan 3swg== X-Gm-Message-State: AOAM531KU3IhppstQjybMdRD6OZ3EtBc2gvYnrz79S/POjUdR6PxOwmR kJUEiE67UduXdZ5g6hBfjrE= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Richard Henderson , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Fix multiple TCG temporary leaks in gen_pool32a5_nanomips_insn(). Fixes: 3285a3e4445 ("target/mips: Add emulation of DSP ASE for nanoMIPS - p= art 1") Signed-off-by: Philippe Mathieu-Daud=C3=A9 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(DisasContex= t *ctx, int opc, gen_reserved_instruction(ctx); break; } + + tcg_temp_free(v2_t); + tcg_temp_free(v1_t); + tcg_temp_free(t0); } =20 static int decode_nanomips_32_48_opc(CPUMIPSState *env, DisasContext *ctx) --=20 2.31.1 From nobody Mon May 6 23:44:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1623951821; cv=none; d=zohomail.com; s=zohoarc; b=g2OwbRAUpirAxaxmcGIr1lEsQwSOAsnTQrr7feu4Yz4ru8K8z7+hKFg6ibGE9UNsvtzIe96cANY3oc5KQdiF2cHrD0GUEKY/Yne0+D/d7CUfsjDTYC+6qczKCfHTD0wn8qFRFjTGuQgYM4ZA6fCV2mYGhzg0EXq8SbBDhv/SF5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623951821; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Jc2qmXWDFJ8kQFMS9jZlt3xShTo6ocA1K1RvWad+d5Q=; b=DwzImyqZLJ89BlRgCZhqWDTRhnVg3n8C2aVWQLp496fEg+AU0jaoMO9fUEIq4GwwON/xsfzgfBSe7BMKdUtCxHnGK5QtRMqhFsoJPbE4xgcgnVjoOBfR9y+ednA/BjdFRF0GHF1kSlS9z6PQ3C3OEGgwg40TQu5beXvyK5yDBBc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1623951821348256.59591191394964; Thu, 17 Jun 2021 10:43:41 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id f2so7679516wri.11 for ; Thu, 17 Jun 2021 10:43:40 -0700 (PDT) Return-Path: Return-Path: 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) 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=KnDraGEyAkESuUS1rIhNZFcSDLKHi/EW49V9y4d3/3kFhUujtI1x1u7CuezzDSmIhZ gU/I/G3b/wSzb1OQSYa7VKozA3LoSyr2vE/2jQddNtRm1nitViqU8l5dCsVPclQguP1m DQGziNooDCyTggcpgxwkZ+Lty6Wr4QfdlGcUvZrecHJ8f/fQBM141rQBPewVKRolE5aS OwSpq1oQ3IwupOz6V0ED8EUj8GMD8MRbIDIh+CoaBmVLSbxjlrGDlwGJ4wdExTvVQJlo Qx4TMRhnwmxKLP4mCyQkSUkZWjQsV6B5gpnj5SV+yHur6P4cx+iPla8Xtv5fYEL0Jyoc DHEQ== X-Gm-Message-State: AOAM532BHlne/MEtFj1GSF+pPjekmVjxRdCpNXdctJ7uybwaiH8gR+Ze xQ58NnaZN5cnIH54GsP1TmQ= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Richard Henderson , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 Reviewed-by: Richard Henderson --- meson.build | 2 +- target/mips/tcg/translate.c | 1 + target/mips/{ =3D> tcg}/trace-events | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename target/mips/{ =3D> 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 @@ =20 #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 --=20 2.31.1 From nobody Mon May 6 23:44:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623951826; cv=none; d=zohomail.com; s=zohoarc; b=ZbIa+0/rNYLZbWxJKswY9C/KqR+7ldIPURhcRhgAFtMceZOPByh1oN1cfHnRbxQfAX41ylm5ezdq5HsIww0icFvwb2QgPssJPhperXkldT+c/91vBZje9doZiN3/897pXA0JgTu9F8qKLE7R+mm1LhTDTjAGxwPP2aUd+TpUlZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623951826; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R7Xfsej5DEajIa18cawD/xf7U5trIsp041pqQxhlGvo=; b=CjBGXKvhLxKFv8nXJGiJLevPfD7Bx62qqPWyUFFfvk7Llk4ZVh0qXScCTLgltcyul+TBVmIMBxsL19Qh+8QFGkqfK298h6Rs3tHoXD3SbT1eHmeOpUSBOQHeNuXMegX2dqdOy+n7srmuRTdfUlug5Ky/VpcuEwRT+6UatdzE/z8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1623951826068811.2095681052064; Thu, 17 Jun 2021 10:43:46 -0700 (PDT) Received: by mail-wm1-f52.google.com with SMTP id h11-20020a05600c350bb02901b59c28e8b4so6948067wmq.1 for ; Thu, 17 Jun 2021 10:43:45 -0700 (PDT) Return-Path: Return-Path: 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) 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=X3i5DKT3enupmZLU6fZwlGBOk6FFkbdzw5xgo/DjCp/5u4x1IMxAiwRuxdClPeDjjV rKpuFiclnS/3vVNJyARjNtc0igTheiLt/aQqXpPL1hUikeYvUh6M+nX0F7rMTHHIgIgl eeul9anDBTVXPShIhU/Q5mH4XMt4tgliZ6a+qdeDti6wvhy/feO2HeXadqf7NfAzwEwW yOb5Xjgm1T37JPdzRHiUvtn2LeNc64Frf/L2UTmt40VdRnAQXrijWd4LmEdy+NWxpRRE GMcpv5EzHQREi0rc9rUFIOAoxV3RTumTiUzQydaIi9VRpY2osr/GlnNSJo0OuLCzCRIm 4nIw== X-Gm-Message-State: AOAM533y2nYICgOT7GbKgLuBa4DZOjv73LBLOfv79g5D58cvatDuyLxT HIkprLes3LkrDDm9PNAxWAY= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Richard Henderson , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 Reviewed-by: Richard Henderson --- target/mips/{ =3D> 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/{ =3D> 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_translat= e.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" =20 diff --git a/target/mips/tcg/mxu_translate.c b/target/mips/tcg/mxu_translat= e.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" =20 /* * diff --git a/target/mips/tcg/rel6_translate.c b/target/mips/tcg/rel6_transl= ate.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" =20 /* 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" =20 /* * Many sysemu-only helpers are not reachable for user-only. diff --git a/target/mips/tcg/translate_addr_const.c b/target/mips/tcg/trans= late_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" =20 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_transl= ate.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" =20 /* Include the auto-generated decoder. */ #include "decode-tx79.c.inc" diff --git a/target/mips/tcg/txx9_translate.c b/target/mips/tcg/txx9_transl= ate.c index 8a2c0b766bd..5f147b89eef 100644 --- a/target/mips/tcg/txx9_translate.c +++ b/target/mips/tcg/txx9_translate.c @@ -7,7 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "translate.h" +#include "tcg/translate.h" =20 bool decode_ext_txx9(DisasContext *ctx, uint32_t insn) { --=20 2.31.1 From nobody Mon May 6 23:44:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623951830; cv=none; d=zohomail.com; s=zohoarc; b=DSGrKmxRKcnJgo1mnuds2wg7bvpIkCDFYFpW5oTkUwqNBfSRDGtJQwRSRUrPkMWhgPL4CDNDpfzsMMRt9Rf/QuOKym1Lipgtu3p+VjgMN1eRsXCS/s9EbwXw5O62n2V8sNQokxPnxWrhkcE1uYhwe2ZNIwyZE9A2vNl918Rg4HY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623951830; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=unit4JgEQfUxC97CDRdybI6rtAIvnMfZCcJpKphtNpg=; b=e7Xiv/2fcYOnyBQ0WtQ3ETXTSniZxi/zuU3osdNz6hoygq5ZW+oHnv5zSMHPxT7sKpWuh776dGmcRu1dc5EoajgqYRJ5e78vd2y68+lqLHraFN2faIa9divS/mMHzT4SSGEoHFAPP/u2osk7q1c9lSNtg9ctFZlr6tERQJuUbas= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1623951830570294.6175031683854; Thu, 17 Jun 2021 10:43:50 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id d11so5334572wrm.0 for ; Thu, 17 Jun 2021 10:43:50 -0700 (PDT) Return-Path: Return-Path: 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) 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=QdnQmVQji40EGUberYQADVKH1Rvq+lVZRcG+xF8vF40yPZg9ZjokppS/1Fyj+NG5Jn 0OYmf8B3WqII1kJ/JwK7jde4adxkK7TVo71u7Gq0IugF2R27qm2/Kq0K50psCkBXMyz6 hQSwly0WUGk/R6Ru6spfvm4+4vUxxkoCRlDSQBA42oKb2hHb6e68EjpulluGqGhlKvJa puLKqLtJCFnQdDomNU6D0CHQsfrY6Hw/tDxgDBXDnBkX/0vQpPIs0nC1ouoExjW8VYK/ FtuGhTWptkecyJh5gYBOV95rulb+gCIXhGile3ONFRIswso6wzzU3bER6ZaA47ZDID+X wT7g== X-Gm-Message-State: AOAM533NIn4crX89SvciSAh+LONbCo2TVit0MvItpxAxspD8UHERzYp6 f/MLb1SSWAubAirALFOoSDs= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Richard Henderson , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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 =20 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, uint6= 4_t addr); bool mips_um_ksegs_enabled(void); void mips_um_ksegs_enable(void); =20 +#if !defined(CONFIG_USER_ONLY) + /* mips_int.c */ void cpu_mips_soft_irq(CPUMIPSState *env, int irq, int level); =20 /* mips_itu.c */ void itc_reconfigure(struct MIPSITUState *tag); =20 +#endif /* !CONFIG_USER_ONLY */ + /* helper.c */ target_ulong exception_resume_pc(CPUMIPSState *env); =20 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); =20 const char *mips_exception_name(int32_t exception); =20 @@ -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 retadd= r); +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); =20 #endif /* !CONFIG_USER_ONLY */ --=20 2.31.1 From nobody Mon May 6 23:44:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623951836; cv=none; d=zohomail.com; s=zohoarc; b=ceZZ20hoMe5pRDWDJaRmdIQ+TOjFJLycQ0P0hw59AQk8UblElF9N0Ku7RXvTlEhE+jsGqYaoo909x0qQnQm7XhO1ovpp7+9i2llnj8W1EVIt7MnFQ/jN1A5bA4nYxqOVjmf/SMqv5rchWG5yRVuE2jhdv84yZip/NVUYhw84zZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623951836; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qof+yv8e9S7550YKz4Cn5HOdqyTeOFddruO/ErbyrOE=; b=hGVz4sjNfufzcdmsNUm2IA6AyYZxg34A82f9ViHZHdR5T3viRzkKnMdTOEuRmdCZG7Lpbpu2wm2/JcAl16NRH6B3baX0+MA9BME9szX8ayEiy+BdcpOfhwlmJ6mZfypIoCSnH4RA/JRq4aoUSlBGld261sSwI4PVAYZijSySe9U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1623951836411515.7801006717178; Thu, 17 Jun 2021 10:43:56 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id y7so7670520wrh.7 for ; Thu, 17 Jun 2021 10:43:54 -0700 (PDT) Return-Path: Return-Path: 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) 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=pwpM2KdAJYqN0QCsnbZQ54+CVHqoAPtKA7VOwtRSAhJFKHR0wXU8C4fkyqMi2o3zku yVYR4T8kmjGjNJUqSQ3ed3ifnqrmZiTmmGH4O8m3XBAjBOL4sAdFoZ7HnDTO6OXacy4D Cbgb1POJktlwPAMy5faZiHf9RYyWpB6Z7qpERf06i9/pr2xpfVIMxV1JnUPrn0XX0zS5 7QY7ES1Lm2sN1IE6UQjCl82e6lZLfWNUPifUn+FF1EXHYh+diZWah10aOWwakEPo5OYF Ft3sz9jH9O9PyVH6hXU1ddNBrjRZaH1lR8lH3Ml3MKqQZ5rtblYLJg362dudgW/kLOSi Pevg== X-Gm-Message-State: AOAM530BGH0Vu92r4s487gctIouIdVLm+3TANHki+Wyycuz6cgZa5Dip sTJ1Lx4l2tcLFunbGyzi59M= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Richard Henderson , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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) } =20 =20 -/* 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) --=20 2.31.1 From nobody Mon May 6 23:44:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623951840; cv=none; d=zohomail.com; s=zohoarc; b=c+YFGgh1tUVYe291urDsn/hPbjFcebOHKJLhkWpoMsnLtE95pMiC2mEwHJ1vJSoBonIPSEVgWmBB97F52dcUIqqJnf21A5sUS7mFJ6S+GMMM4wkTZylpUmhYaaJ06FUcPYCECjrrdgKt7WJI60Xkg7oEfc7MGWrMkc+NrN5ZPIw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623951840; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QQhnyJT7IqQiTtdyfsN9R/GF4TMQXLmBFDH1C75S2Y8=; b=TlLqtN9l8RJYl9W/ogqUXMeNlQCp9OtEGm2XWXlPV1D+TNrP9GlyhI8yNDu4kJGb4ZGKUqFufdxexHCPxAZ/GFwaTeuoVBZFbx81bwK8N9woRGJheNNQo7RTwZFcgWcfQCe4T/kLRYshyo5/67hC06pmzY5msS85D07bEXsDs/w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1623951840441991.2676262030116; Thu, 17 Jun 2021 10:44:00 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id a11so7696597wrt.13 for ; Thu, 17 Jun 2021 10:43:59 -0700 (PDT) Return-Path: Return-Path: 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) 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=mIXLW/VqfyHHkJ2I0NsiUCPQ3S4+L2xu7jHZegfM4XWjl6gzWYGFuCj3ncSt4rhcP8 ioHDjIuPvqfh7/14RWeSC6XP58Ua/QaoUpXAap6cF6Yu4s9MPJLky55sRilWw8rPfWeR 6STReeVJb8eSLWdFU6dWdezWLzzpbEHlHMxdvzBpO9Vya9A8eEyFvqSc9wbYw5WUCLgu Z5TsAV7Qv7j0B8c91PMlAxYRXZlDrF9xUMBqLA6Vadp2nUufoXq64lCN8EtTYwRaYHfH OGDpiH4Hg/PMTzYuNbwzhVYFhPXzuED8mMhnOAp98DXvPMr/ui+rLaz//ltXPWLTf7cU 9wbA== X-Gm-Message-State: AOAM5332xQL0L0f5IpFZbGjSIrCulRwaXTCMZnNCEiNSE/3J46RlPUxM D5TbMvlMnQnj9E9eadHCopw= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Richard Henderson , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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 =3D 0x13, BC2F =3D 0x14, BC2T =3D 0x15, - BPOSGE64 =3D 0x1a, - BPOSGE32 =3D 0x1b, /* These overlap and are distinguished by bit16 of the instruction */ BC1F =3D 0x1c, BC1T =3D 0x1d, @@ -16122,10 +16120,6 @@ static void decode_micromips32_opc(CPUMIPSState *e= nv, 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); --=20 2.31.1 From nobody Mon May 6 23:44:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623951844; cv=none; d=zohomail.com; s=zohoarc; b=WSNJUa7uyzEikBindtdHsVf1ndenk4FvKhQ32LnENt3+byt4V/srsD+Bjczx/uvVE5rj+AMf+F3nvucWkMK3xHHA5sIDEOfHBe7NKRzzgGZXUixLNKUkcE9Etv/eSgfc5pHzxWAQAFmW7VLP1zbA3szzymbQsP6Ip5/BX20DDIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623951844; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=z+tQ+79u0v5Hqcb6NxLeyIdCtff9V34lJUP0h2IdROs=; b=Go0/ZUayOeSog2AJq4lHGYfkasejf98dPdQkr5djV30lAFZt8b0CE4fSLRJ0YiNV1enJ6k5unfRVk6kyNitImFld/nv6ShyfkA9ygVvX9AFt3gBKYstTzFNOdBcdRlU2KG2T2PH0A5oH5t0lXnwwp3Yphw++fcxI0xMcUPNFOok= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1623951844958335.5701988590413; Thu, 17 Jun 2021 10:44:04 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id 3-20020a05600c0243b029019f2f9b2b8aso4165638wmj.2 for ; Thu, 17 Jun 2021 10:44:04 -0700 (PDT) Return-Path: Return-Path: 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) 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=K+DlU2xyTvjE1TSua+ulOkY2e7phCrDU9dZbeajJXe4nKfQr2+5TpHRLU8OAmvMgzt Nz7VvfnMzZ9nHN6cdcK05I8HCdqBz8zLyhi8GGdtlV0vq06rKwrlmufUYMl8Fn25+WzN ZYLPH9jzCJNI4YVcxUuNysN10KpiOBTtwwXmuRYvtYBPrNOqc7SWvDGFJTY3HOflgKot J2yC6qq/6vWyHuWYaGsV0Y5cLAC38Jgi6pgkSkooOEPVSpN/ptWZTenV00yXgnZK362S 1jyEFugjrA2szidMNkIbGSilHYU9i9LtDoT6bIhixl7bh/zt8PxBfIS8O1eN0COjYLUv ksOQ== X-Gm-Message-State: AOAM531jitw9AY9QVPWen30qgjQwcxpmB7X2OHtQWNP3iCSYm6orrVu7 qDcXzb4VuGBMZ57q7/9Em7k= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Richard Henderson , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Keep host_to_mips_errno[] in .rodata by marking the array const. Signed-off-by: Philippe Mathieu-Daud=C3=A9 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/mi= ps-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 { }; =20 /* Errno values taken from asm-mips/errno.h */ -static uint16_t host_to_mips_errno[] =3D { +static const uint16_t host_to_mips_errno[] =3D { [ENAMETOOLONG] =3D 78, #ifdef EOVERFLOW [EOVERFLOW] =3D 79, --=20 2.31.1 From nobody Mon May 6 23:44:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623951849; cv=none; d=zohomail.com; s=zohoarc; b=RkNRZdvVtvevUibwCh04EwTK1wIHjPsDjZkRYsVJWuF4nSx7PyBdkbhlBvad+Vevx/Sa+1dPqL25V/GZ4z403bpHjVBEEUmMLAG3i+SrCwvrTCWCQMqOC6zMplKKgh3NJqKZ85HwJocxrzDf/BxnkIHFLEwaxTzhExLqEl4tCmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623951849; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RoU+7ht74MR+uFQU3Fe913vTah/u1fs34mzDvWBnykU=; b=AUpcbE0EvcBzKC1tCKgrRP+nzue6yJvsxqXOlHyhyLu9om5jwgad074Dyx9q+H8Ahzu1dSyBhxRyi721TikVy8JWO2c+jnbZOwohPNEbyJCwzx+p+/kOxp/dzZ2jYTaS4XTpJ3jTnRlE5hVA0vXmmlfGQH5SC4IPZ8OvudSfyN4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1623951849692590.6077741722419; Thu, 17 Jun 2021 10:44:09 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id a11so7697003wrt.13 for ; Thu, 17 Jun 2021 10:44:09 -0700 (PDT) Return-Path: Return-Path: 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) 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=UVBM3qGRETYe4b82hDy2Q1SWxcPr/tkfVNlqir2j+vSm7qLfPLEUgkuegyg0ZObPwn 132Rc32pPJHeNTuUrjR7s2yk2NIacdpZyjwYRMqwBqXm9sNFQ9whg72zi9Wp0qFQWM5r QkuS7T+HVlDBjQDfgkSf3fTXtgyoI5sV7/oP6xB/yRH2clOz5j1/ooAFtucd9BM0E2J6 QTBVmXXK+AcsUF6gNUvtBZtK53cTr5imhC7EVUeab7HXJ33MPKnUIiVX2vjpLf8s2Vic BSj8xEUN9uRo7abMhPMAjevn1ry+wS/6Hi3KZ012UQG6zjDkI1uJa8sAYRhZ710C2cj+ ORUw== X-Gm-Message-State: AOAM5314N0g7zQV7AtXKzfkToFnibkAL5an6aadKYjKHy2ikGIkOvf8x C+MjR3QOELOfAsBKg53Epis= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Richard Henderson , Aurelien Jarno , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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; }; =20 -extern const char regnames[32][4]; +extern const char regnames[32][3]; extern const char fregnames[32][4]; =20 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" =20 -const char regnames[32][4] =3D { +const char regnames[32][3] =3D { "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_translat= e.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 =3D (0x7 << 23) | OPC_MSA_BIT_09, }; =20 -static const char * const msaregnames[] =3D { +static const char msaregnames[][6] =3D { "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_translat= e.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; =20 -static const char * const mxuregnames[] =3D { +static const char mxuregnames[][4] =3D { "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", }; =20 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 =20 -static const char * const regnames_HI[] =3D { +static const char regnames_HI[][4] =3D { "HI0", "HI1", "HI2", "HI3", }; =20 -static const char * const regnames_LO[] =3D { +static const char regnames_LO[][4] =3D { "LO0", "LO1", "LO2", "LO3", }; =20 --=20 2.31.1