From nobody Sun May 19 07:16: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=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1586286621; cv=none; d=zohomail.com; s=zohoarc; b=fV7NfLC7bkyhCiojQmlYm1aj04E4YECiI0Zsc+mPDH3R6jyHJnAUsmgwpiXqGfIm6CLCYmTg4ZIc8EiS1vT86VDaCpaukMMOY3NOYVHkHvuvRBTOTK9tq/vEJe2gEMUO/aaCXwQNc5Xj+W+PaY2urSVgzLcG49VbtbezY9fMzeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586286621; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=pVPn1A8lH7D9dBMNrDxt3UTPqMe9uBm7OsqcSSTllH8=; b=eV4NA/IZrF9yuoHg5/RfVPfY4kXVepcK+RLyuZjhrDRkc3l2xVddQ4NWFpmt8WyxwOZKyNhoMrIqT1nv6XqhxuqF0O+9yafBddd2SApKcBYAK+wEwutcKTF1vtV0KR4rKbbwrcax95T2iLD4dmSCMXoxrsVRr9nz0tKzxTdRycc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1586286621899850.369352662816; Tue, 7 Apr 2020 12:10:21 -0700 (PDT) Received: from localhost ([::1]:52194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLtc4-0003w8-FK for importer@patchew.org; Tue, 07 Apr 2020 15:10:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45904) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLtbP-0003XC-6I for qemu-devel@nongnu.org; Tue, 07 Apr 2020 15:09:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLtbO-0001hd-5I for qemu-devel@nongnu.org; Tue, 07 Apr 2020 15:09:39 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:36250) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLtbO-0001hK-06 for qemu-devel@nongnu.org; Tue, 07 Apr 2020 15:09:38 -0400 Received: by mail-pf1-x442.google.com with SMTP id n10so1239771pff.3 for ; Tue, 07 Apr 2020 12:09:37 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net ([2601:641:400:63f0:a487:3b8:7ffc:c9e4]) by smtp.gmail.com with ESMTPSA id b3sm13852348pgs.69.2020.04.07.12.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 12:09:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pVPn1A8lH7D9dBMNrDxt3UTPqMe9uBm7OsqcSSTllH8=; b=mjNB9B+WwRhyEGpC7+CGl/PyCJb4aha1UpjFP8hdfqS+dZI0/c7+f2QLhSN9Fm1n8e KcJ+iAqJDtJQoTgHy4Foyc6XO8YvRP0YZqZhUpZOpFyRtzWKZ/O2kKdneNzJ8zE8CTdw LTfZxvMak2+sH5UIabsQ01maYh6pYRUCG63qYr9W5yH6qVTmCY78BOqve9s1WOrvohTV KM/alnkhMg6RZWkvnQGaDySNv66Yfu2W9XO8p7TmZwRN/tMt9/i9hVu51YMTLk/0ino/ eG7ecx0/TJSwJ1sLF/YA3RdEBhgYLDYgqTjuFCvkDyFS+niXFad4Sedub1WLEnz20jok 8cBg== 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:mime-version :content-transfer-encoding; bh=pVPn1A8lH7D9dBMNrDxt3UTPqMe9uBm7OsqcSSTllH8=; b=X+B8RfxFUTdXXFB/pm3TOxS94nKYd+UHn0g5SuSdHV/4aHwNQbIVI7e4Onxo2yEl/r z4UCUR6jypLqhKhIF0vwXQ8Ngf9GwUGA+m+61gygpd4s+LOSRTy4LbcMZ9yoq3MllUru CSzP2Mwkw1DFGWwr09Mri+2O7St8m+WlqNjipHeqWApowQGe/1V10gjemSOTRNSm0Xm0 /5KC+aleWnz2XxLnfDe88X7peNuo4fYtGU6LU6jFHxOqhFqEHhNkhwc7V2EhHiEIvige Xl3SyqPkic1g4MCl3r+5/2N3nQ9uNTpz6Z/C7HRGi/rJ0bUDAIXoy8TJ7Cg/zzwq4T5X kVrQ== X-Gm-Message-State: AGi0PuZBZNUzXuXXuaowa1sAvpU0+b6Wzi8HQ0RPdf4fV7EEspAVWwle Ji2N0fhYSnBTKdXoDc0ZZYrUXADYOg4= X-Google-Smtp-Source: APiQypLhy7cdEvADN8ROf5hhUyWrkaVcmphBPZlSVVfastqPqd/aJYiktq55HfmS7tZ+wq7GXbLDOQ== X-Received: by 2002:a63:af5c:: with SMTP id s28mr3445694pgo.21.1586286576530; Tue, 07 Apr 2020 12:09:36 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Subject: [PATCH] target/xtensa: statically allocate xtensa_insnbufs in DisasContext Date: Tue, 7 Apr 2020 12:09:25 -0700 Message-Id: <20200407190925.4879-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.20.1 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::442 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: Max Filippov , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Rather than dynamically allocate, and risk failing to free when we longjmp out of the translator, allocate the maximum buffer size based on the maximum supported instruction length. Suggested-by: Richard Henderson Signed-off-by: Max Filippov Reviewed-by: Richard Henderson Tested-by: Richard Henderson --- target/xtensa/cpu.h | 3 +++ target/xtensa/helper.c | 1 + target/xtensa/translate.c | 17 ++--------------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index c0d69fad96c5..7a46dccbe11b 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 376a61f3397c..7073381f03b2 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 37f65b1f0305..91c7776c2544 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; @@ -1174,15 +1174,6 @@ static void xtensa_tr_init_disas_context(DisasContex= tBase *dcbase, dc->callinc =3D ((tb_flags & XTENSA_TBFLAG_CALLINC_MASK) >> XTENSA_TBFLAG_CALLINC_SHIFT); =20 - /* - * 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 +1263,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