[binutils-gdb] sim: riscv: Fix PC at gdb breakpoints

[binutils-gdb] sim: riscv: Fix PC at gdb breakpoints

[Bernd Edlinger]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ae14cde6fd2c527c407a115fa1684c2002749552

commit ae14cde6fd2c527c407a115fa1684c2002749552
Author: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date:   Fri Apr 12 08:55:11 2024 +0200

    sim: riscv: Fix PC at gdb breakpoints
    
    The uncompressed EBREAK instruction does not work
    correctly this way, and the comment saying that
    GDB expects us to step over EBREAK is just wrong.
    The PC was always 4 bytes too high, which skips one
    instruction at break and step over commands, and
    causes complete chaos.  The compressed EBREAK was
    already implemented correctly.
    
    Tested by using gdb's "target sim" and single-stepping.
    
    Approved-By: Andrew Burgess <aburgess@redhat.com>

Diff:
---
 sim/riscv/sim-main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c
index adff99921c6..ddc7e1d3e98 100644
--- a/sim/riscv/sim-main.c
+++ b/sim/riscv/sim-main.c
@@ -623,9 +623,7 @@ execute_i (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op)
       break;
     case MATCH_EBREAK:
       TRACE_INSN (cpu, "ebreak;");
-      /* GDB expects us to step over EBREAK.  */
-      sim_engine_halt (sd, cpu, NULL, riscv_cpu->pc + 4, sim_stopped,
-		       SIM_SIGTRAP);
+      sim_engine_halt (sd, cpu, NULL, riscv_cpu->pc, sim_stopped, SIM_SIGTRAP);
       break;
     case MATCH_ECALL:
       TRACE_INSN (cpu, "ecall;");