From nobody Sat May 18 23:55:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1586359964; cv=none; d=zohomail.com; s=zohoarc; b=CGcQl5sv/vFMOUIihE0nlK1INmavi8S3yJdgWp85W13mxs96c5pI3Ul1rUSdSRfanUV0JRVTvSIwCUKRDxg6voTbng9037qtoz0ZSz8RUf3PFrIpnE5/6gpHAGZIE24mFkvzC2PZZuUGeshwA1dwsTVot4Ur6IkyW2W1bIiP5Jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586359964; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Wy9/RKdx6k2GdGX7vFs6xPvmsh5JxfYLsYClmHq661o=; b=MWVc7hLKPf32SDXyegeIqSJ3kTi/e2f9V7tFyUxmLm58MUwcGdnZNg66Ifq6XzSQ5EfqgKbqHfPUBKuOhKIIQ2TP0nal9BQC/y98cMSl6YJRA7MyVhmJVi1pnNhILrQ5Ll9Tm3dgNMttWchxZaek5VTT+83jsYHL8mVTSfUBOIE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586359964821440.06037759000185; Wed, 8 Apr 2020 08:32:44 -0700 (PDT) Received: from localhost ([::1]:37586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMCh1-0006tU-HD for importer@patchew.org; Wed, 08 Apr 2020 11:32:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33433) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMCfQ-0005rd-Is for qemu-devel@nongnu.org; Wed, 08 Apr 2020 11:31:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMCfP-0008B7-L5 for qemu-devel@nongnu.org; Wed, 08 Apr 2020 11:31:04 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:43849) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jMCfP-0008Ad-EV for qemu-devel@nongnu.org; Wed, 08 Apr 2020 11:31:03 -0400 Received: by mail-pg1-x535.google.com with SMTP id s4so3452912pgk.10 for ; Wed, 08 Apr 2020 08:31:03 -0700 (PDT) Received: from localhost.localdomain (174-21-149-226.tukw.qwest.net. [174.21.149.226]) by smtp.gmail.com with ESMTPSA id t4sm16920454pfb.156.2020.04.08.08.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 08:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Wy9/RKdx6k2GdGX7vFs6xPvmsh5JxfYLsYClmHq661o=; b=zvY/AQ4WyidrWkmVrcdxUCoLxJ+t6LzZ4qfdxTkzlxAx0wWmrWCJggz6Gd00Jt5vRt q7m9qpNZ6du7MTGtk9a5/xoVc63Cwcjnh2TLORassd/xxRJx29OpAAr7T2pk/W5tKgfD O1zhHEDTkszuCDebZZDCiW7SfftW7NBkNdXdXdTUxBKJZneIGREv080NaxNLm5v+ES6b x2UsPuFTt0aqgxwfrKwHQo8cGUzYxuGmW199wyArmwS4L1xqMmk/4qp6WHkdNoltwHmE m2u7yQKy+/+XpeODAiqWuyEYe8r9YQluGNpqQKB0Dl3i693cEvnF/wIyanhxurM0IaXT T8mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Wy9/RKdx6k2GdGX7vFs6xPvmsh5JxfYLsYClmHq661o=; b=k8hQWEjGXuk2kwtNxOD/FBAx62Gk67KrPBpxh8Ei6Hf0WkqQG/Xo8GWtwYmoJyrg5W GzF7L5JR7e+yZjnuxzOjF+6MVSPaSprphYv9TT81MJieYRQSO/r5djnN/r8sFir8j21p i42tqiai5nGVBER1Ovygh9KpA+/nfCEfqn//8+7tWBEGG5g+9ffX10vnv9qGaREUKw/c 0G8t6mXn5bo4SZkDXruU50qa3A/Aosj71kz+xLmlomKZMuhpztB2WPXLV3t7WlnCCIXx QM507wFlZIYK6UaysxM1suRLS64VdGvjJj0kQZ+KWR81Sh5Cf4b8B4agjEYHszjQB/sM Q3Iw== X-Gm-Message-State: AGi0PuY/B6fcIzd6xjBhyANS89gsLwwOXtFD76myAFm2byaGlSyTI+Ne K+OKVIRXYvYXO66MNb2/CdoITCTDsQM= X-Google-Smtp-Source: APiQypIKnOj7/xOwPFBfphlOfupHTQ69hSnNxFzqc7BHWs1a+dVZ7UXM0dM2ZA3Lrk/AVd5/TBbktg== X-Received: by 2002:a62:188c:: with SMTP id 134mr8327452pfy.222.1586359861664; Wed, 08 Apr 2020 08:31:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL for-5.0 1/1] target/rx/translate: Add missing fall through comment Date: Wed, 8 Apr 2020 08:30:56 -0700 Message-Id: <20200408153057.31794-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200408153057.31794-1-richard.henderson@linaro.org> References: <20200408153057.31794-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::535 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: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 Coverity reported a missing fall through comment, add it. Fixes: e5918d7d7f0 ("target/rx: TCG translation") Reported-by: Coverity (CID 1422222 MISSING_BREAK) Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200403184419.28556-1-philmd@redhat.com> Signed-off-by: Richard Henderson --- target/rx/translate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/rx/translate.c b/target/rx/translate.c index b3d7305f23..61e86653a4 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -2362,6 +2362,7 @@ static void rx_tr_tb_stop(DisasContextBase *dcbase, C= PUState *cs) break; case DISAS_UPDATE: tcg_gen_movi_i32(cpu_pc, ctx->base.pc_next); + /* fall through */ case DISAS_EXIT: tcg_gen_exit_tb(NULL, 0); break; --=20 2.20.1 From nobody Sat May 18 23:55:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1586360138; cv=none; d=zohomail.com; s=zohoarc; b=Jspnz4/tcaaRo5PyVaiWj7PztnlMqiQj23IrxsBiJPsFOgkSZLsi8eXjgqOyZQOpdFKjSwVcTmdJ02EKNZX1T+BKOLxWd456eSoMwtf68NBAG8Iks/+oTlq+6aYp68N6HRfbSK/QxRIvZHbonk26YputL6ny7k8w0Fv0vMMxIsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586360138; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZGk61WNrpGDP6QSZdndDZCbGnp9yVuwh0dhPIo77VUo=; b=FwVNbfFm30caU266wIeILNjyM/GVmjh997m7/ue07KNTHplrR3Ytfzz0f0lldtVkZveRQYPF1E51jTTOKImbPDoHR6bmEdY5G2ukR9NRewURh01+T4rjerJFBorCgF2RfLt+YiQY4GxUHakYjLj0s04LwRuD3+lBPRdvWw9/O90= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586360138724842.0400381784593; Wed, 8 Apr 2020 08:35:38 -0700 (PDT) Received: from localhost ([::1]:37652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMCjp-0002P9-Fh for importer@patchew.org; Wed, 08 Apr 2020 11:35:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33454) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMCfS-0005tP-JR for qemu-devel@nongnu.org; Wed, 08 Apr 2020 11:31:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMCfR-0008Bx-CP for qemu-devel@nongnu.org; Wed, 08 Apr 2020 11:31:06 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:43014) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jMCfR-0008Bg-6Z for qemu-devel@nongnu.org; Wed, 08 Apr 2020 11:31:05 -0400 Received: by mail-pg1-x541.google.com with SMTP id s4so3452974pgk.10 for ; Wed, 08 Apr 2020 08:31:05 -0700 (PDT) Received: from localhost.localdomain (174-21-149-226.tukw.qwest.net. [174.21.149.226]) by smtp.gmail.com with ESMTPSA id t4sm16920454pfb.156.2020.04.08.08.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 08:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZGk61WNrpGDP6QSZdndDZCbGnp9yVuwh0dhPIo77VUo=; b=egOm0rpPsfA+JcFU+ZAumseK3G1qt5+0guBCINOwVNfjwirppjZe6B4/VGErtNeCGg lAXICa7zfO7Yrw3WmnepaFPzNObE2fnDSZeKBnZUGR36yMrwYfbRlU1yOLq/p5eBHSCH wGPAe3ydiFDK+zr2fofm3bvuorDLAmLM1AnEH3wYubDvtrZq3J93R13zYJaOERTdrAtB 6sCPXWLI76GtEpf530z9PSDHv3wInPPPfyMMayUR9llCRKferSAqMRvoc6fe49PRn25i oeZ2lJTUH3vnL3vq1ZkjBOUkwr1IRNk69n0Sn4NbQ3DcggoRh9YEcVxfT2sX2gexffQX lZ+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZGk61WNrpGDP6QSZdndDZCbGnp9yVuwh0dhPIo77VUo=; b=Yi0YJTOXE2VsnjJ/dKPZ7fmpapzOXteXdPkDfwyBXmjfg3DOaB6qLOMWNalDWLA7ZS Zz9sVLxJ7pCYmqaewbGyDmuCBZJGjal9HqxZLXSvAXeswjNizZocAjHq+pM24itRTpOd XZ0NI/SnFgPFlEPVI5Kok+/gD1sZ5rGBl68PlFri9ehO9OBZALobacJxYrJJ/UnvYJ2E z7V0YbH9kA8eDkOfP8aDd0fM8yRIjgc67wW6FW6e2RMbOPPpS1eOH2lfTQ6j/yIyLdH1 Yyxcdb9p0MhuJypNBPyT+iq0dpFkf/MSPnS7wRO6kIp/wketDL+ALehQ7LerNuf0GS3S 7R2w== X-Gm-Message-State: AGi0PuYMf/HxQNNexc/cY8o1t/3MeIY/Dwt/dzjNGp1gdt3xJXHPWml2 3rV95gCqCKYdl6euyIeBuwGaFUIJXsw= X-Google-Smtp-Source: APiQypKOJgM92Uw1ND36UJS72RidY5r+kP1+opVVKY97BHay+RlAdp/JqIfIrhfyzndwZvxLUPlUqA== X-Received: by 2002:a65:670e:: with SMTP id u14mr7723317pgf.264.1586359863191; Wed, 08 Apr 2020 08:31:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH for-5.0? v2] target/xtensa: Statically allocate xtensa_insnbufs in DisasContext Date: Wed, 8 Apr 2020 08:30:57 -0700 Message-Id: <20200408153057.31794-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200408153057.31794-1-richard.henderson@linaro.org> References: <20200408153057.31794-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 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: peter.maydell@linaro.org, Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Max Filippov Rather than dynamically allocate, and risk failing to free when we longjmp out of the translator, allocate the maximum buffer size from any of the supported cpus. Signed-off-by: Max Filippov [rth: Merged the fixup in Max's reply to his original] Signed-off-by: Richard Henderson --- target/xtensa/cpu.h | 3 +++ target/xtensa/helper.c | 1 + target/xtensa/translate.c | 18 ++---------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index c0d69fad96..7a46dccbe1 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -213,6 +213,9 @@ enum { #define MEMCTL_IL0EN 0x1 =20 #define MAX_INSN_LENGTH 64 +#define MAX_INSNBUF_LENGTH \ + ((MAX_INSN_LENGTH + sizeof(xtensa_insnbuf_word) - 1) / \ + sizeof(xtensa_insnbuf_word)) #define MAX_INSN_SLOTS 32 #define MAX_OPCODE_ARGS 16 #define MAX_NAREG 64 diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index 376a61f339..7073381f03 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -96,6 +96,7 @@ static void init_libisa(XtensaConfig *config) =20 config->isa =3D xtensa_isa_init(config->isa_internal, NULL, NULL); assert(xtensa_isa_maxlength(config->isa) <=3D MAX_INSN_LENGTH); + assert(xtensa_insnbuf_size(config->isa) <=3D MAX_INSNBUF_LENGTH); opcodes =3D xtensa_isa_num_opcodes(config->isa); formats =3D xtensa_isa_num_formats(config->isa); regfiles =3D xtensa_isa_num_regfiles(config->isa); diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 37f65b1f03..b898ee2261 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -72,8 +72,8 @@ struct DisasContext { unsigned cpenable; =20 uint32_t op_flags; - xtensa_insnbuf insnbuf; - xtensa_insnbuf slotbuf; + xtensa_insnbuf_word insnbuf[MAX_INSNBUF_LENGTH]; + xtensa_insnbuf_word slotbuf[MAX_INSNBUF_LENGTH]; }; =20 static TCGv_i32 cpu_pc; @@ -1173,16 +1173,6 @@ static void xtensa_tr_init_disas_context(DisasContex= tBase *dcbase, dc->cwoe =3D tb_flags & XTENSA_TBFLAG_CWOE; dc->callinc =3D ((tb_flags & XTENSA_TBFLAG_CALLINC_MASK) >> XTENSA_TBFLAG_CALLINC_SHIFT); - - /* - * FIXME: This will leak when a failed instruction load or similar - * event causes us to longjump out of the translation loop and - * hence not clean-up in xtensa_tr_tb_stop - */ - if (dc->config->isa) { - dc->insnbuf =3D xtensa_insnbuf_alloc(dc->config->isa); - dc->slotbuf =3D xtensa_insnbuf_alloc(dc->config->isa); - } init_sar_tracker(dc); } =20 @@ -1272,10 +1262,6 @@ static void xtensa_tr_tb_stop(DisasContextBase *dcba= se, CPUState *cpu) DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 reset_sar_tracker(dc); - if (dc->config->isa) { - xtensa_insnbuf_free(dc->config->isa, dc->insnbuf); - xtensa_insnbuf_free(dc->config->isa, dc->slotbuf); - } if (dc->icount) { tcg_temp_free(dc->next_icount); } --=20 2.20.1