From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id KLSuGv4he2CaOgAAWB0awg (envelope-from ) for ; Sat, 17 Apr 2021 13:59:26 -0400 Received: by simark.ca (Postfix, from userid 112) id 686421F104; Sat, 17 Apr 2021 13:59:26 -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.9 required=5.0 tests=DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,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 85F3C1E813 for ; Sat, 17 Apr 2021 13:59:25 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4C6BF3938803; Sat, 17 Apr 2021 17:59:25 +0000 (GMT) Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by sourceware.org (Postfix) with ESMTPS id 4E01F3896819 for ; Sat, 17 Apr 2021 17:59:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4E01F3896819 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=jimw@sifive.com Received: by mail-pg1-x535.google.com with SMTP id f29so21353474pgm.8 for ; Sat, 17 Apr 2021 10:59:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vthx2AmdNiRn3nALZ9n+2+eP7AZeVOZ8zeAiU1Y3Rdg=; b=dDvoxdKV9+/u8eRXIHWCSYFksPJ8n5akrgzeF76t+3rdKwWG4QbrOZ+DvdQbhwSwCa 8w1kgsyqg1+oE0t92hqQhki2N1ifr2pIDnrGZ9OkciVyt/aqOX141kV+Q+mwZ1Hkb3Bm AErgLm4xGU4qr+uq9axcfj0C3NtCSapF5qNGAf/+jfYH9J4duGP0/RCqpPVqmGN6sKBU CCd932z+ke+YdPdfTfdGMrKmHRphjDli30vs8Rht5zomEwePnKMQ9W0n2Kutu33iCkIi C2HFNEVsYXzN7whm42qbbVRf6R5Htx5GKTJAx8weJjk/2kktpK6twTVMILvFJW/7Np1e fRDg== 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:in-reply-to :references; bh=vthx2AmdNiRn3nALZ9n+2+eP7AZeVOZ8zeAiU1Y3Rdg=; b=kNuja+P+eG+XdojRV7bCqo6P7qIcXpgKoLfRr9rdW5k98sRSOeFXiZqbpG/l7ECnqk EW0xFCjEoGiOg6rFwd2LdFDrFCJTwbjt+OSXqQmJZ6+A7BqautMkC2zF9jQR1vHyNIzU zHGcTC9tzq12ZNL1q3U6Ou5mXJXuWf8bx+GA0z9l63L88m6Qk21Yx4PO6Uvp9SeRfJ33 8b9EofwtL4jPALkbFmrCcnPDr9i4GKgSvO2eBE7FYpCnz4/fYsk55ZY4c3d2L9S1ld/U LQhSn2iFUOm6EuJuWHLhL3ow/giJGRhnU7ew8eJgDed9kseIfpRreWcg44AkqGS516Jq Ellg== X-Gm-Message-State: AOAM530EqcPngpSK77PqR5Rcuc9n52kPExpk2Vo8Sm6P508ouzXAL+V4 5WX0001Q7qIaeN0htQXA24SwAYgXhbNS1g== X-Google-Smtp-Source: ABdhPJyw6DctoViJwM/nCnS1sQskMzYRutAWXfOaE4sub1ozg9ThVEaE1SJc3kHW0whJQR0DVx20XQ== X-Received: by 2002:aa7:9496:0:b029:252:f269:ffa3 with SMTP id z22-20020aa794960000b0290252f269ffa3mr12917433pfk.30.1618682352199; Sat, 17 Apr 2021 10:59:12 -0700 (PDT) Received: from rohan.hsd1.ca.comcast.net ([2601:646:c180:b150:1820:3ed4:975:3fbe]) by smtp.gmail.com with ESMTPSA id u4sm5030705pfk.56.2021.04.17.10.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Apr 2021 10:59:11 -0700 (PDT) From: Jim Wilson To: gdb-patches@sourceware.org Subject: [PATCH 11/24] RISC-V sim: Fix ebreak, part 2. Date: Sat, 17 Apr 2021 10:58:18 -0700 Message-Id: <20210417175831.16413-12-jimw@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210417175831.16413-1-jimw@sifive.com> References: <20210417175831.16413-1-jimw@sifive.com> 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: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Sbreak was renamed to ebreak a long time ago. Fix the references. sim/riscv/ * sim-main.c (execute_i): Rename MATCH_SBREAK to MATCH_EBREAK. --- sim/riscv/sim-main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index 710b67d..84f7cb86 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -1239,9 +1239,9 @@ execute_i (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) case MATCH_FENCE: TRACE_INSN (cpu, "fence;"); break; - case MATCH_SBREAK: - TRACE_INSN (cpu, "sbreak;"); - /* GDB expects us to stop at SBREAK. */ + case MATCH_EBREAK: + TRACE_INSN (cpu, "ebreak;"); + /* GDB expects us to stop at EBREAK. */ sim_engine_halt (sd, cpu, NULL, cpu->pc, sim_stopped, SIM_SIGTRAP); break; case MATCH_ECALL: -- 2.7.4