Skip to content

Gdb: add support for "load" and "info_registers" and fix bugs. #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
buserror merged 7 commits into from
Apr 11, 2022
Merged

Gdb: add support for "load" and "info_registers" and fix bugs. #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2415a52
Add support for avr-gdb's "info io_registers" command and also
Mar 16, 2022
25b69b2
Support for gdb's "load" command, based on
Mar 16, 2022
4eb0e42
Fix three problems with gdb support:
Mar 16, 2022
3723282
Fix access (read/write) watchpoints and incorrect reporting of watchp…
Mar 16, 2022
ee7434d
Make the break instruction useful. The previous implementation
Mar 16, 2022
0fe7429
Fix bugs in handling vFlashWrite in sim_gdb.c and reset the
Mar 17, 2022
a5634af
Really fix handling of 'break' (testing blunder) and include
Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions simavr/sim/sim_avr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ avr_reset(
port->reset(port);
port = port->next;
}
avr->cycle = 0; // Prevent crash
}

void
Expand Down Expand Up @@ -286,7 +287,7 @@ void
avr_callback_run_gdb(
avr_t * avr)
{
avr_gdb_processor(avr, avr->state == cpu_Stopped);
avr_gdb_processor(avr, avr->state == cpu_Stopped ? 50000 : 0);

if (avr->state == cpu_Stopped)
return ;
Expand Down Expand Up @@ -331,7 +332,6 @@ avr_callback_run_gdb(
// if we were stepping, use this state to inform remote gdb
if (step)
avr->state = cpu_StepDone;

}

/*
Expand Down
2 changes: 2 additions & 0 deletions simavr/sim/sim_avr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ typedef void (*avr_run_t)(
#define AVR_FUSE_HIGH 1
#define AVR_FUSE_EXT 2

#define REG_NAME_COUNT (256 + 32) // Size of reg_names table.

/*
* Main AVR instance. Some of these fields are set by the AVR "Core" definition files
* the rest is runtime data (as little as possible)
Expand Down
16 changes: 7 additions & 9 deletions simavr/sim/sim_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ uint8_t avr_core_watch_read(avr_t *avr, uint16_t addr)
"CORE: *** Wrapping read address "
"PC=%04x SP=%04x O=%04x Address %04x %% %04x --> %04x\n"
FONT_DEFAULT,
avr->pc, _avr_sp_get(avr), _avr_flash_read16le(avr, avr->pc), addr, (avr->ramend + 1), addr % (avr->ramend + 1));
avr->pc, _avr_sp_get(avr), _avr_flash_read16le(avr, avr->pc),
addr, (avr->ramend + 1), addr % (avr->ramend + 1));
addr = addr % (avr->ramend + 1);
}

Expand Down Expand Up @@ -321,7 +322,7 @@ avr_flashaddr_t _avr_pop_addr(avr_t * avr)
/*
* "Pretty" register names
*/
const char * reg_names[255] = {
const char * reg_names[REG_NAME_COUNT] = {
[R_XH] = "XH", [R_XL] = "XL",
[R_YH] = "YH", [R_YL] = "YL",
[R_ZH] = "ZH", [R_ZL] = "ZL",
Expand All @@ -330,7 +331,7 @@ const char * reg_names[255] = {
};


const char * avr_regname(uint8_t reg)
const char * avr_regname(unsigned int reg)
{
if (!reg_names[reg]) {
char tt[16];
Expand Down Expand Up @@ -938,12 +939,9 @@ avr_flashaddr_t avr_run_one(avr_t * avr)
case 0x9598: { // BREAK -- 1001 0101 1001 1000
STATE("break\n");
if (avr->gdb) {
// if gdb is on, we break here as in here
// and we do so until gdb restores the instruction
// that was here before
avr->state = cpu_StepDone;
new_pc = avr->pc;
cycle = 0;
// if gdb is on, break here.
avr->state = cpu_Stopped;
avr_gdb_handle_break(avr);
}
} break;
case 0x95a8: { // WDR -- Watchdog Reset -- 1001 0101 1010 1000
Expand Down
Loading