From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id +K7dFqRXFGMV+TIAWB0awg (envelope-from ) for ; Sun, 04 Sep 2022 03:45:40 -0400 Received: by simark.ca (Postfix, from userid 112) id 59B5D1E4A7; Sun, 4 Sep 2022 03:45:40 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=gEQhUp0Q; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 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 136921E21F for ; Sun, 4 Sep 2022 03:45:40 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B7F41385828A for ; Sun, 4 Sep 2022 07:45:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B7F41385828A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1662277539; bh=sDTWrUAmc/QrBdwTQ6iRMMRMgzHFcGZUBB90jKkLy7Q=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=gEQhUp0QxGDSKlh/PBMal+Z52XOE9j2CLzRatZGzrQ0NxxTP0wH8Bah2e6no4Kutk DBhO3Rvbs+PfiorjQ2KuzYNCo1U+tVSOHoZ7zwWygFwb8cpBGxuj+rq/Rs9sV0V27U 27f6sr2TC0HCldLvSdKDV0ErQ648MiWddiFA18XE= Received: from mail-sender-0.a4lg.com (mail-sender-0.a4lg.com [IPv6:2401:2500:203:30b:4000:6bfe:4757:0]) by sourceware.org (Postfix) with ESMTPS id 17E6C3858292 for ; Sun, 4 Sep 2022 07:45:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 17E6C3858292 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 5FACE300089; Sun, 4 Sep 2022 07:45:19 +0000 (UTC) To: Tsukasa OI , Andrew Burgess , Mike Frysinger , Nelson Chu , Kito Cheng , Palmer Dabbelt Subject: [PATCH 1/1] sim/riscv: Complete tidying up with SBREAK Date: Sun, 4 Sep 2022 07:45:06 +0000 Message-Id: <9397aa661e0b6ba2c02c96f166088387a99c84a8.1662277499.git.research_trasio@irq.a4lg.com> In-Reply-To: References: 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: , From: Tsukasa OI via Gdb-patches Reply-To: Tsukasa OI Cc: gdb-patches@sourceware.org Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" This commit removes SBREAK-related references on the simulator as it's renamed to EBREAK in 2016 (the RISC-V ISA, version 2.1). sim/ChangeLog: * riscv/sim-main.c (execute_i): Use "ebreak" instead of "sbreak". --- 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 62f475671c9..30d2f1e1c9a 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -583,9 +583,9 @@ execute_i (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) case MATCH_FENCE_I: TRACE_INSN (cpu, "fence.i;"); break; - case MATCH_SBREAK: - TRACE_INSN (cpu, "sbreak;"); - /* GDB expects us to step over SBREAK. */ + case MATCH_EBREAK: + TRACE_INSN (cpu, "ebreak;"); + /* GDB expects us to step over EBREAK. */ sim_engine_halt (sd, cpu, NULL, cpu->pc + 4, sim_stopped, SIM_SIGTRAP); break; case MATCH_ECALL: -- 2.34.1