From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id yGjVHahLfGE6dgAAWB0awg (envelope-from ) for ; Fri, 29 Oct 2021 15:29:44 -0400 Received: by simark.ca (Postfix, from userid 112) id 699BC1F0BB; Fri, 29 Oct 2021 15:29:44 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 5C8441EE18 for ; Fri, 29 Oct 2021 15:29:43 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E9E423857416 for ; Fri, 29 Oct 2021 19:29:42 +0000 (GMT) Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by sourceware.org (Postfix) with ESMTPS id 7E0833858431 for ; Fri, 29 Oct 2021 19:29:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7E0833858431 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pj1-x1033.google.com with SMTP id k2-20020a17090ac50200b001a218b956aaso8046990pjt.2 for ; Fri, 29 Oct 2021 12:29:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TqIis6rCgtAiDDtj54m9vIqsFtSD2VCjlsnsAinJBug=; b=QVIygPwwFri0yeN5OSmrI9E44qGlByoJMQvGW1CYkENOuJCzwTqHfvAIJ+h1SuD8i3 rrCasD+pdTS1gylXcrCFeIf/QPc9vDEWkJmc8lOvdSl09H/wE+8exJGlTpcoNDJkCTPx tzwTzBOifQ1rm+jmPCgCkvgquJkUgo5w/fEMPBSWJnTBPbIsi3BhHgkuN4uJjNoXOe3k +OpxMls/Ihd2MZREBlzlR8MnLKp0yiB7lFf4pl9gufoSh2tCxou2fS8etcGDeaN6wdsB ABTyuVyMtFwLU6GeuVss6fNY8/4MZGGvStZgkMttI3MU8+vwLwCAi1JqdtIaT5ECimYl e6+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TqIis6rCgtAiDDtj54m9vIqsFtSD2VCjlsnsAinJBug=; b=El8OdnhF4D+tPSYAlMfBUK6gVV7ZR0nGlInO+vGWZ8oP2w1uixf8QlPVlYWjhAiORX h5Iz8VdVAIC84aCQEZtGhx67C8HpChViLCthQ8q6EwWWn8P7Ltl4Smag7lGINrSM1Rki acSEPA/kO9VVzHgZAde/y3ySFnAzziPdtASFY7OmXMcJNCoqcw+/eKk/csUiSUOq/nIc +11ed7ZZH7Lw3Zas8QpSDzVRg0SiCn2eaE3zYDQgVcAnmRxKtHBFJxRaEtY7pW98o8FB xVmg2TE+ZpF3ent4so1W6UhWKIBIGLJaIsek0x01HfeOKMVbaxCb/0e/54m+mLhEnqOO 7oyA== X-Gm-Message-State: AOAM5317citLEWjf8LVQ1jH7oygQzYBY0OY1FnlkhJf1eo0tTnqvfUnV e1M3gX0dt1+mhHCrUAwigIHmXgApwU14ReUrkDY= X-Google-Smtp-Source: ABdhPJwcHpYts2rIHVXPb4XN6/x4kAD0JqS2q5YqAfBXyJJ0nlMfJOhXFa0/t4IhqNxPn2ea2323wA== X-Received: by 2002:a17:902:e892:b0:141:5e96:8bfd with SMTP id w18-20020a170902e89200b001415e968bfdmr11591583plg.82.1635535739463; Fri, 29 Oct 2021 12:28:59 -0700 (PDT) Received: from vineetg-ThinkPad-X1-Carbon-Gen-9.ba.rivosinc.com (c-24-4-73-83.hsd1.ca.comcast.net. [24.4.73.83]) by smtp.gmail.com with ESMTPSA id t1sm7175420pfe.51.2021.10.29.12.28.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 12:28:59 -0700 (PDT) From: Vineet Gupta To: gdb-patches@sourceware.org, binutils@sourceware.org Subject: [PATCH] sim: riscv: fix build breakage with rvv changes Date: Fri, 29 Oct 2021 12:28:56 -0700 Message-Id: <20211029192856.3987778-1-vineetg@rivosinc.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dylan Reid , Kito Cheng Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" changes to gas for riscv vector extensions need to be propagated to sim otherwise gdb fails to build on users/riscv/binutils-integration-branch This patch currently applies to that branch. Fixes: 144cceb058e "(RISC-V/rvv: Add rvv v0.10 instructions.)" Reported-by: Dylan Reid Signed-off-by: Vineet Gupta --- sim/riscv/ChangeLog-2021 | 4 ++++ sim/riscv/sim-main.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sim/riscv/ChangeLog-2021 b/sim/riscv/ChangeLog-2021 index e9aa74490f12..9ced6773bdd6 100644 --- a/sim/riscv/ChangeLog-2021 +++ b/sim/riscv/ChangeLog-2021 @@ -1,3 +1,7 @@ +2021-20-28 Vineet Gupta + + * sim-main.c (step_once): Fix match_func call per gas changes. + 2021-07-01 Mike Frysinger * configure: Regenerate. diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index 0faf9395ae52..9b4f7c6c5aad 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -956,6 +956,7 @@ void step_once (SIM_CPU *cpu) sim_cia pc = cpu->pc; const struct riscv_opcode *op; int xlen = RISCV_XLEN (cpu); + const char *error = NULL; if (TRACE_ANY_P (cpu)) trace_prefix (sd, cpu, NULL_CIA, pc, TRACE_LINENUM_P (cpu), @@ -985,7 +986,7 @@ void step_once (SIM_CPU *cpu) for (; op->name; op++) { /* Does the opcode match? */ - if (! op->match_func (op, iw)) + if (! op->match_func (op, iw, 0, /* check_constraints */ &error)) continue; /* Is this a pseudo-instruction and may we print it as such? */ if (op->pinfo & INSN_ALIAS) -- 2.30.2