From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1bc5acc627dso24391565ad.1 for ; Mon, 21 Aug 2023 17:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692662734; x=1693267534; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=84spJhmVMGZ9uHsHU/W1ZfA/yh5vqw6u2z6Gq9YWvsU=; b=ZdNC+R2QLyebqEK1AKH1Wcg/0txWZ4tbe6xotoUND1HUFOTw+mWJCBPr5xG3apHWBM wr4NiONDPZE2/UZVMR7c7xv7sGfxpHAGP66c2BFDirTGCzyYN5zhzih2Ve3S67aG0/v/ 2fDjj5K5gy3/k8aMc9r4lkIc0g8eFg2/u7DBJAldygFcTGMyMJhkNxtL7wJyDF7Vi2Nd nMCMYK8OCBRYS6ZyXs8tT26VPDmkptS3JdKzNUGkzR75M+Uv+dYH2wckkIJhu7dii81N R2LSJcTjPgL9gvCROKhXk8ltGx6UqyVpNdgGHb5UqRb/XHcCbz3GsLdlAvHP78egveXw 0cGw== 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-Google-Smtp-Source: AGHT+IFmIPkzwwLu86RAQmwelgBWQbFRROw/fwk8mYEJ4bvm2K8N7Hn7xRoL5ihhckryCdVx3qa4jQ== 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 From: Alan Modra To: binutils@sourceware.org Subject: kvx_dis_init Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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 List-Id: 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 -- Alan Modra Australia Development Lab, IBM