Skip to content

Commit 1b2dd11

Browse files
nspringbuserror
authored andcommitted
use READ_SREG_INTO rather than g->avr->data[R_SREG] to get current sreg status for export to gdb
1 parent 1b6e6ed commit 1b2dd11

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

simavr/sim/sim_gdb.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,12 @@ gdb_send_quick_status(
199199
uint8_t signal )
200200
{
201201
char cmd[64];
202+
uint8_t sreg;
203+
204+
READ_SREG_INTO(g->avr, sreg);
202205

203206
sprintf(cmd, "T%02x20:%02x;21:%02x%02x;22:%02x%02x%02x00;",
204-
signal ? signal : 5, g->avr->data[R_SREG],
207+
signal ? signal : 5, sreg,
205208
g->avr->data[R_SPL], g->avr->data[R_SPH],
206209
g->avr->pc & 0xff, (g->avr->pc>>8)&0xff, (g->avr->pc>>16)&0xff);
207210
gdb_send_reply(g, cmd);
@@ -577,8 +580,11 @@ avr_gdb_handle_watchpoints(
577580
if (kind & type) {
578581
/* Send gdb reply (see GDB user manual appendix E.3). */
579582
char cmd[78];
583+
uint8_t sreg;
584+
585+
READ_SREG_INTO(g->avr, sreg);
580586
sprintf(cmd, "T%02x20:%02x;21:%02x%02x;22:%02x%02x%02x00;%s:%06x;",
581-
5, g->avr->data[R_SREG],
587+
5, sreg,
582588
g->avr->data[R_SPL], g->avr->data[R_SPH],
583589
g->avr->pc & 0xff, (g->avr->pc>>8)&0xff, (g->avr->pc>>16)&0xff,
584590
kind & AVR_GDB_WATCH_ACCESS ? "awatch" :

0 commit comments

Comments
 (0)