From patchwork Thu Feb 15 15:58:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Remus X-Patchwork-Id: 201605 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp496911dyb; Thu, 15 Feb 2024 08:01:43 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXDBhur9QyslVEXmEJ/rG3O12AgfkXM/cBCGJCS4Huw2wzitwy1wbiOxiscNFl1n/SmuKH6sljkqPkvSftQLjcXMxuTgQ== X-Google-Smtp-Source: AGHT+IEourTnCe/5AaYb7Ll8S7uZzcfTXNjrloOi5AZ9DAve5HpFwNzmiBjk0uCj63a201PSweZZ X-Received: by 2002:a05:600c:4f0d:b0:411:d89d:dd30 with SMTP id l13-20020a05600c4f0d00b00411d89ddd30mr1806136wmq.25.1708012903067; Thu, 15 Feb 2024 08:01:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708012903; cv=pass; d=google.com; s=arc-20160816; b=PoDc0bOem/5AKFLUXWxYN6IkC5WO5nCZNvwCOa7aWCHicpxbMNnjNn5jKr3ofCjiaJ hhSEV+aUzP/7MR622OUF1W1BXwUYXclBvPGwXmz6bpEPuUkQcuCmeCuv2lXgyUFuCUnr xuqKG1BE7/DV51kGWyvCw0JzSygEBKMfzuYPRnlCmpDx9oIV5zK6U6UpZIPjvOUDsgc1 nxTOgbjrKxEIeODP+E1+qDTwvz307rJ064zt+Psi8kuwdkoebQzvb37HQDdpLysAxyzS byC9neTcGF8i/vo/pbtiD2IwDPJyLFUXYxHpWTmeeEAO++gnWU8mxXmdODYlYQj2m5VA VlcA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=elKOv+CWeJnQd9gLq1jc/vk/B89hQKwM6YmKbrUxrhs=; fh=6sWHPsCQUoLz5ZcbqIohOjwdU7jjRT/citiAJwaEf0c=; b=qc0Pstj1TNCYNiO2R68YshpAwZg2UBeJpYXtECa8Pb7L5DuTdS7RU3clBoZPmNPMAs 8xhpR1xKuT23RMSWegiepUhCxulLKXqso/TkVPaiYN2u40h1w2t6+Igl0IoHzaBz2ZLu skefF4gXbFnFURP/rs4/ZHCGsos3UFWj5Zm9qnU6711aTLcLizeoWXcuQT47UMh1PRjP v273I+tPGYCNy3TkF5xE87TAiYeXFC+03hCoKCycrTbUzt4hfN3tKzalfQ97BmDZA8N6 81DRdxKn/NP5qaldIN27c+XtKbKk+pB7KiTVabruw1pNuCHcY7JVR52aTJucsB5++SLH Uf0Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=EHxGDKZh; arc=pass (i=1); 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=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id jg7-20020a05600ca00700b00410c60ad24bsi1010401wmb.1.2024.02.15.08.01.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 08:01:43 -0800 (PST) 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=@ibm.com header.s=pp1 header.b=EHxGDKZh; arc=pass (i=1); 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=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 730DE386C5BB for ; Thu, 15 Feb 2024 16:01:25 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id 3FA6F3865C27 for ; Thu, 15 Feb 2024 15:58:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3FA6F3865C27 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3FA6F3865C27 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708012723; cv=none; b=NnQJejouZknZVcRXK3CdgkVxI236biiP7yJp3CjvUuwBxLHArR5sO+d79foOgFa1qKFzY2ymu/uEOoRM4UNhMszy6xTeBXtMuMMzgu7E6q+BiKd5gVjhOhnbEW1MsOlWuelXE616/zB5gC+9adiHjUXg3YWPy9FXI+/+bDs0134= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708012723; c=relaxed/simple; bh=tSmOhY6XAkztMlIhFx+/42Osonvfas6zME7Gg1A4ZS0=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=hxM0xw5jOJ4hRKXpGk2X7k/EEXvQM5jiRjfN976XTgHoYcbo+QMZAJfPJbxjDGMtdTX9sPHQ98G6x2IqdtEzg6kWGYt2OsG5yX+Q6MO8zrEgJR9uhRVOqiLD6BgzgLIz5EDZAdCdT99TNAFKpPKEIZK3bHkTWZ+y81/+sh+LDtk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0353728.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41FFuw8c001472 for ; Thu, 15 Feb 2024 15:58:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=elKOv+CWeJnQd9gLq1jc/vk/B89hQKwM6YmKbrUxrhs=; b=EHxGDKZhQCzpzAeev+p5Qx2Lm+ON0SLR8mqzEl2PcZbEQifib8jJknHfkXcwldT5euqX GHY+3h9U+yk4+Xi+dtci46dJcIdAwLZRISb2C8prjpeFfn1kjUl45i1p91jhtsHVG9Ly VSCeYUQN4ES0RIKwdjACGC8XJF6jwZY4QuMGcO5JYwjjZuxK5ew/wWKrPSyiF91Mstjf onc1qew8IPBHxVadO9I+zD2ZA4YBGmVxnfDYSKUDeFpQ9AL4Ux7Y2X1CwvVUJcQ+fFCK vuylwWINeBXB9R5+hlEvBhSYiFx9Wl9pDTFaAy6WXHz3mAWSkk8cmdCv+Xxs6OHCIZcj 7Q== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3w9nq081ub-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 15 Feb 2024 15:58:36 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 41FDqA9O004297 for ; Thu, 15 Feb 2024 15:58:35 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3w6kv0nx3e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 15 Feb 2024 15:58:35 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 41FFwUFN18088488 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Feb 2024 15:58:32 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A4DB420071; Thu, 15 Feb 2024 15:58:30 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 85AA62004D; Thu, 15 Feb 2024 15:58:30 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 15 Feb 2024 15:58:30 +0000 (GMT) From: Jens Remus To: binutils@sourceware.org Cc: Jens Remus , Andreas Krebbel Subject: [PATCH 14/14] s390: Be more verbose about missing operand type Date: Thu, 15 Feb 2024 16:58:21 +0100 Message-Id: <20240215155821.4065623-15-jremus@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240215155821.4065623-1-jremus@linux.ibm.com> References: <20240215155821.4065623-1-jremus@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: uk3W59yFvBD_BjTzJP4Ipk1j3sSACSlx X-Proofpoint-GUID: uk3W59yFvBD_BjTzJP4Ipk1j3sSACSlx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-15_15,2024-02-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 spamscore=0 phishscore=0 clxscore=1015 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402150129 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790981337904176024 X-GMAIL-MSGID: 1790981337904176024 Provide expected operand type in s390-specific assembler operand parsing error message: "error: operand : missing operand" With being one of: - base register - displacement - [vector] index register - length - access register - control register - floating-point register - general-purpose register - vector register - [un]signed number gas/ * config/tc-s390.c: Provide missing operand type in error message. * testsuite/gas/s390/zarch-base-index-0-err.l: Update test case result validation patterns to operand number in operand syntax error messages. * testsuite/gas/s390/zarch-omitted-base-index-err.l: Likewise. Reviewed-by: Andreas Krebbel Signed-off-by: Jens Remus --- gas/config/tc-s390.c | 38 ++++++++++++++++++- .../gas/s390/zarch-base-index-0-err.l | 30 +++++++-------- .../gas/s390/zarch-omitted-base-index-err.l | 4 +- 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c index 786c372a9c1a..f43314666e1f 100644 --- a/gas/config/tc-s390.c +++ b/gas/config/tc-s390.c @@ -1329,6 +1329,41 @@ s390_elf_cons (int nbytes /* 1=.byte, 2=.word, 4=.long */) demand_empty_rest_of_line (); } +static const char * +operand_type_str(const struct s390_operand * operand) +{ + if (operand->flags & S390_OPERAND_BASE) + return _("base register"); + else if (operand->flags & S390_OPERAND_DISP) + return _("displacement"); + else if (operand->flags & S390_OPERAND_INDEX) + { + if (operand->flags & S390_OPERAND_VR) + return _("vector index register"); + else + return _("index register"); + } + else if (operand->flags & S390_OPERAND_LENGTH) + return _("length"); + else if (operand->flags & S390_OPERAND_AR) + return _("access register"); + else if (operand->flags & S390_OPERAND_CR) + return _("control register"); + else if (operand->flags & S390_OPERAND_FPR) + return _("floating-point register"); + else if (operand->flags & S390_OPERAND_GPR) + return _("general-purpose register"); + else if (operand->flags & S390_OPERAND_VR) + return _("vector register"); + else + { + if (operand->flags & S390_OPERAND_SIGNED) + return _("signed number"); + else + return _("unsigned number"); + } +} + /* Return true if all remaining operands in the opcode with OPCODE_FLAGS can be skipped. */ static bool @@ -1431,7 +1466,8 @@ md_gather_operands (char *str, { if (opindex_ptr[0] == '\0') break; - as_bad (_("operand %d: missing operand"), operand_number); + as_bad (_("operand %d: missing %s operand"), operand_number, + operand_type_str(operand)); } else if (ex.X_op == O_register || ex.X_op == O_constant) { diff --git a/gas/testsuite/gas/s390/zarch-base-index-0-err.l b/gas/testsuite/gas/s390/zarch-base-index-0-err.l index 6332d9943496..26187c93d4b3 100644 --- a/gas/testsuite/gas/s390/zarch-base-index-0-err.l +++ b/gas/testsuite/gas/s390/zarch-base-index-0-err.l @@ -16,9 +16,9 @@ .*:16: Error: bad expression .*:16: Error: operand 2: syntax error; missing '\)' after base register .*:17: Error: operand 1: operand out of range \(0 is not between 1 and 256\) -.*:18: Error: operand 1: missing operand -.*:19: Error: operand 1: missing operand -.*:20: Error: operand 1: missing operand +.*:18: Error: operand 1: missing length operand +.*:19: Error: operand 1: missing length operand +.*:20: Error: operand 1: missing length operand .*:21: Error: bad expression .*:21: Error: operand 1: operand out of range \(0 is not between 1 and 256\) .*:21: Error: operand 1: operand out of range \(32 is not between 0 and 15\) @@ -31,9 +31,9 @@ .*:22: Error: operand 1: syntax error; missing '\(' after displacement .*:23: Error: operand 1: invalid length field specified .*:26: Error: operand 1: operand out of range \(0 is not between 1 and 16\) -.*:27: Error: operand 1: missing operand -.*:28: Error: operand 1: missing operand -.*:29: Error: operand 1: missing operand +.*:27: Error: operand 1: missing length operand +.*:28: Error: operand 1: missing length operand +.*:29: Error: operand 1: missing length operand .*:30: Error: bad expression .*:30: Error: operand 1: operand out of range \(0 is not between 1 and 16\) .*:30: Error: operand 1: operand out of range \(32 is not between 0 and 15\) @@ -42,21 +42,21 @@ .*:30: Error: found ',', expected: '\)' .*:31: Error: operand 1: syntax error; missing '\(' after displacement .*:32: Error: operand 2: operand out of range \(0 is not between 1 and 16\) -.*:33: Error: operand 2: missing operand -.*:34: Error: operand 2: missing operand -.*:35: Error: operand 2: missing operand +.*:33: Error: operand 2: missing length operand +.*:34: Error: operand 2: missing length operand +.*:35: Error: operand 2: missing length operand .*:36: Error: bad expression .*:36: Error: operand 2: operand out of range \(0 is not between 1 and 16\) .*:36: Error: operand 2: syntax error; expected ',' .*:37: Error: operand 2: syntax error; missing '\(' after displacement .*:38: Error: operand 1: operand out of range \(0 is not between 1 and 16\) .*:38: Error: operand 2: operand out of range \(0 is not between 1 and 16\) -.*:39: Error: operand 1: missing operand -.*:39: Error: operand 2: missing operand -.*:40: Error: operand 1: missing operand -.*:40: Error: operand 2: missing operand -.*:41: Error: operand 1: missing operand -.*:41: Error: operand 2: missing operand +.*:39: Error: operand 1: missing length operand +.*:39: Error: operand 2: missing length operand +.*:40: Error: operand 1: missing length operand +.*:40: Error: operand 2: missing length operand +.*:41: Error: operand 1: missing length operand +.*:41: Error: operand 2: missing length operand .*:42: Error: bad expression .*:42: Error: operand 1: operand out of range \(0 is not between 1 and 16\) .*:42: Error: operand 1: operand out of range \(32 is not between 0 and 15\) diff --git a/gas/testsuite/gas/s390/zarch-omitted-base-index-err.l b/gas/testsuite/gas/s390/zarch-omitted-base-index-err.l index b2ee382b0f9d..9ff6392915e7 100644 --- a/gas/testsuite/gas/s390/zarch-omitted-base-index-err.l +++ b/gas/testsuite/gas/s390/zarch-omitted-base-index-err.l @@ -6,8 +6,8 @@ .*:11: Warning: operand 2: expected general register name as base register .*:12: Error: bad expression .*:12: Error: operand 2: syntax error; missing '\)' after base register -.*:15: Error: operand 1: missing operand -.*:16: Error: operand 1: missing operand +.*:15: Error: operand 1: missing length operand +.*:16: Error: operand 1: missing length operand .*:17: Error: operand 1: invalid length field specified .*:18: Error: bad expression .*:18: Error: operand 1: operand out of range \(0 is not between 1 and 256\)