From patchwork Tue Aug 22 00:05:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 136430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp3321186vqi; Mon, 21 Aug 2023 17:05:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNsbvHMfja9BBjtYBw7WG7+CYxQfd0Ksrd0L2aVAM9NNEDuFjEO8u6FuMRnRjek37b10wq X-Received: by 2002:a2e:9b97:0:b0:2bc:b694:6d6e with SMTP id z23-20020a2e9b97000000b002bcb6946d6emr4117059lji.27.1692662749985; Mon, 21 Aug 2023 17:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692662749; cv=none; d=google.com; s=arc-20160816; b=f/9V+y7fFfzUiJauS+N73hDYcvunpL4iaFHaixe4nToY9B11DsYnvHuzmz8AYqplUd smG8rZbxYlKLiSQpD4prsYdfLovfG/3cMX4FeQqVeWZFbrnQbG3noe8vxUvGcmFd+tLL NXVrebRbGrS2AxlIFJJUTlZNAiuvcOBs5SVYiQ1+YBHFMW3bMJMSfgIYczeYj9W7NKkp ZeC6kEHlufz+ZRNKKk70MqJLzXcTfE7hp9UbJZgcF5wGrLc9SgxDShW23uJLdpsozUUM bpICcjAdziTVuVRkwyE5BpXIWDPp1Ik69iaZy8VcYE8Pr4HJi9rhKSw4Idtrii+iQiTD BDjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=84spJhmVMGZ9uHsHU/W1ZfA/yh5vqw6u2z6Gq9YWvsU=; fh=HNIqzTA9Dp00ovCAyCdXfuEvWDT00OlFxFRPLybXRis=; b=GoMf0LCyPO29VDaym+Szjwtl+jfnk3dCj7yzn1cDCkKSIXD9AMrkB9KnJAeSypsCUI K9RmwWOSMj5wwpQvIZvuUVs7gaMzD7cLLfX5sBRuKu9Gew4QqXkF0kXKWt5R/xj5eZDc dfKC2bcEWNlzCy+tBGKPzLWiboONfmidY6HeACUVEgZzf2Ah8xcFlCBqN/7V+rJZl7j5 VgvErOQHEtF+Kn0LQr/ecLEsI1axmftSXePQ71xV9zq2o4WvXN9fQR1KR+nxdxybnpAu 5KRfLdZxf5Yqyxr+tzQ8iAFjuF9UEQAmrVwd9lOF8lmrsgHSbxpoZ1bx0/m0GSuwilBk Nm1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ZmalYjxV; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id md21-20020a170906ae9500b0099bd5a646c2si6421154ejb.271.2023.08.21.17.05.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 17:05:49 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ZmalYjxV; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 898CD3857C5A for ; Tue, 22 Aug 2023 00:05:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 898CD3857C5A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692662747; bh=84spJhmVMGZ9uHsHU/W1ZfA/yh5vqw6u2z6Gq9YWvsU=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ZmalYjxVyaztX+Gn9s3K8Fw1f8eX9ve6naIz6Y8iWOmezdFFTFqMQAxi8Ss2KozfX z54eDL2IIqkligIn94mxOX8JedggefBlA65/QNJoGBxW8Y1ch1kKstDfXVLjddpgpM PV6IylqKjPU9kQMj0uRSAU1zfFffGUr38gtHc+og= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id D7DDC3858D33 for ; Tue, 22 Aug 2023 00:05:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D7DDC3858D33 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1bc5acc627dso24391565ad.1 for ; Mon, 21 Aug 2023 17:05:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692662734; x=1693267534; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=84spJhmVMGZ9uHsHU/W1ZfA/yh5vqw6u2z6Gq9YWvsU=; b=TgEuNpxdIABuzemgbSYcNPLHH7tUI9pZoQ3UQcMk1KdVCzdoM8hSV+dc6or+ETE2bZ 489CQcGABScepKJWHFEKaE/8w7D7Vj7nXqPPgf/5j2wPF5ntRima4qidYUi0PxYOlskr xJKsZo2rfSdsRB+W9f9QcDQz3MZnleCF6pAoh4bLipVuIyK9nF3udg/6H/Zp9YLCKYgg zANNLVO/npQzhfYHuA29X3bDVsdwcq0IMkxQhJEzswtU8fBpkuW/mhGsbtd5agPz+i/Y Md9KRwv1BUG5nn9YYU9nLEIwaosrtNsDlJcSOER5JutCupn0jDbpaAApfQgRln9dxCPj fX4w== X-Gm-Message-State: AOJu0YzRrWpNDt8D+GfL+VWZIC0JqUGcHg8zZxBd/6ZZgRG5XVEZfSgZ SX+NLN6J334x8ImtB15ZfUebAW3RF0tfZw== X-Received: by 2002:a17:902:f68e:b0:1bb:91f2:bb3e with SMTP id l14-20020a170902f68e00b001bb91f2bb3emr6874597plg.49.1692662734465; Mon, 21 Aug 2023 17:05:34 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:297:dd7:3cdc:6056]) by smtp.gmail.com with ESMTPSA id i1-20020a17090332c100b001bbf7fd354csm7553433plr.213.2023.08.21.17.05.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 17:05:34 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id BD65D1142931; Tue, 22 Aug 2023 09:35:31 +0930 (ACST) Date: Tue, 22 Aug 2023 09:35:31 +0930 To: binutils@sourceware.org Subject: kvx_dis_init Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3033.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774885535651100025 X-GMAIL-MSGID: 1774885535651100025 kvx_dis_init currently always returns true, but error conditions do so by "return -1" which converts to true. The return status is ignored anyway, and it doesn't make much sense to error on unexpected arch or mach: If print_insn_kvx is called then the atch is known to be kvx, and it's better to choose some default for a user passing an unknown mach value rather than segfaulting in decode_insn when env.opc_table is NULL. I've chosen the default mach to be bfd_mach_kv3_1, the default in bfd/cpu-kvx.c, not that it matters very much. In normal objdump/gdb usage, info->mach won't be an unexpected value. * kvx-dis.c (kvx_dis_init): Return void. Don't error on unexpected arch or mach. Default to bfd_mach_kv3_1 for unknown mach. Don't clear info->disassembler_options. diff --git a/opcodes/kvx-dis.c b/opcodes/kvx-dis.c index eabef4af171..d7b86791c30 100644 --- a/opcodes/kvx-dis.c +++ b/opcodes/kvx-dis.c @@ -207,15 +207,9 @@ static struct kvx_dis_env env = { .kvx_max_dec_registers = 0 }; -static bool +static void kvx_dis_init (struct disassemble_info *info) { - if (info->arch != bfd_arch_kvx) - { - (*info->fprintf_func) (info->stream, "error: Unknown architecture\n"); - return -1; - } - env.kvx_arch_size = 32; switch (info->mach) { @@ -224,6 +218,7 @@ kvx_dis_init (struct disassemble_info *info) /* fallthrough */ case bfd_mach_kv3_1_usr: case bfd_mach_kv3_1: + default: env.opc_table = kvx_kv3_v1_optab; env.kvx_regfiles = kvx_kv3_v1_regfiles; env.kvx_registers = kvx_kv3_v1_registers; @@ -252,26 +247,14 @@ kvx_dis_init (struct disassemble_info *info) env.kvx_modifiers = kvx_kv4_v1_modifiers; env.kvx_dec_registers = kvx_kv4_v1_dec_registers; break; - - default: - /* Core not supported. */ - (*info->fprintf_func) (info->stream, "disassembling not supported for " - "this KVX core! (core:%d)", (int) info->mach); - return -1; } env.kvx_max_dec_registers = env.kvx_regfiles[KVX_REGFILE_DEC_REGISTERS]; if (info->disassembler_options) - { - parse_kvx_dis_options (info->disassembler_options); + parse_kvx_dis_options (info->disassembler_options); - /* To avoid repeated parsing of these options, we remove them here. */ - info->disassembler_options = NULL; - } env.initialized_p = 1; - - return env.initialized_p; } static int