From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AFkzN/ohe2CaOgAAWB0awg (envelope-from ) for ; Sat, 17 Apr 2021 13:59:22 -0400 Received: by simark.ca (Postfix, from userid 112) id DC3C81F104; Sat, 17 Apr 2021 13:59:22 -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.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.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 3B2E41E813 for ; Sat, 17 Apr 2021 13:59:21 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EF7D53899075; Sat, 17 Apr 2021 17:59:20 +0000 (GMT) Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id BDBAE3894C21 for ; Sat, 17 Apr 2021 17:59:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BDBAE3894C21 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-pf1-x430.google.com with SMTP id p67so15507421pfp.10 for ; Sat, 17 Apr 2021 10:59:11 -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=vekkZLN2q2EMxBUH74q+uWrdhkr+QweHyTjNTMIWRjg=; b=ElVjxLujAqtdK4sJgurd4Gk5J4rAbKgg6XNyMnEXJiKs8NzURkJBhi0dAFzF3IEM9r 6gb4I+tYGUfVMgcpW8q8zmt5sKYrqbj79x2U0a8vNeVyVLzDaoYiz6u5f06RAryuFcJf Qc+gQEGdpBw8xlmQaZhkv66q+M3Si+auxUxicKDvPsvs6V7LHbAAbHg2IyJm+PJdS+et KWTtVD2CbPf01IXXRS2HR1MQ+qQIsky87Zk3ybG8lia7XCXykkt2u0pEhbF7ZIBu7WP7 000iLwMvbCiRDCKOCyrdMMHB/GWS8YLNT4U2x0d0s9cssk6yZ0qDiJ49ESlPf29zgC9i AWRA== 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=vekkZLN2q2EMxBUH74q+uWrdhkr+QweHyTjNTMIWRjg=; b=k7xMZUF4My21h3lRd/lfmfVDWh4ERnY+iQ1LqXfrzgPzbEdzfehcGkPrXGW8ezRTuv a7Cv7B8RT8ekLeS84/LXqtvysMRpNkXGvdmrYG2PAui/h8qxAP/XVHlkn47YCe72uuvt UXgsrXcKlGE7CUDy/rlAdA90Y+Qix+0IClnnwEer24uAFamuM4j1YbZZX5L36xVZF2si tltpQQnCY6I5lQz8IZ6QnrM0l0nPtQT2Jw3bKR2l00Hd++s9Cb1j9onk5YYXBitkvF0/ vQ8FAy1MkFWxL0WUecJ9hEB/hRPJrJgS5hyIypEUiSfE1847H/DlBoHB2RkkAQZLJq4v fqDQ== X-Gm-Message-State: AOAM532XJipNzmynYBeLaMpLmH9Zzus/8rAYIMScBT6m04zDwgJnH9tU gBW5AO5qSkS++r/Zd591OdSW0zv3q81qrg== X-Google-Smtp-Source: ABdhPJwDEKMQGf4m9M+6ACFk5AYXXDXqV1+IKnnryu1Lvj2NIJjd/TUHgNWqtSXjpi9K5K8dM7hKGQ== X-Received: by 2002:a62:8c8c:0:b029:253:31e:55cb with SMTP id m134-20020a628c8c0000b0290253031e55cbmr12796410pfd.27.1618682350632; Sat, 17 Apr 2021 10:59:10 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Apr 2021 10:59:10 -0700 (PDT) From: Jim Wilson To: gdb-patches@sourceware.org Subject: [PATCH 10/24] RISC-V sim: Fix ebreak. Date: Sat, 17 Apr 2021 10:58:17 -0700 Message-Id: <20210417175831.16413-11-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: , Cc: Monk Chiang Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" From: Monk Chiang Linux kernel no longer adds 4 to epc, and so gdb no longer subtracts 4, so the simulator should no longer add 4 either. sim/riscv/ * sim-main.c (execute_i): In case MATCH_SBREAK, don't increment pc in sim_engine_halt call. --- sim/riscv/sim-main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index 48cf27f..710b67d 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -1241,8 +1241,8 @@ execute_i (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) break; case MATCH_SBREAK: TRACE_INSN (cpu, "sbreak;"); - /* GDB expects us to step over SBREAK. */ - sim_engine_halt (sd, cpu, NULL, cpu->pc + 4, sim_stopped, SIM_SIGTRAP); + /* GDB expects us to stop at SBREAK. */ + sim_engine_halt (sd, cpu, NULL, cpu->pc, sim_stopped, SIM_SIGTRAP); break; case MATCH_ECALL: TRACE_INSN (cpu, "ecall;"); -- 2.7.4