Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-24 01:56:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Wrap round flash on disasm

Browse Source
This commit is contained in:
Stefan Rueger
2024-07-18 23:39:25 +01:00
parent 7dbab82a2b
commit ab08e1c1b4
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/disasm.c
View File

@@ -139,6 +139,19 @@ static int Get_Next_Opcode(const char *Bitstream) {
return -1;
}
int disasm_wrap(int addr) {
int flashsz = cx->dis_opts.FlashSize;
if(flashsz > 0) {
while(addr >= flashsz)
addr -= flashsz;
while(addr < 0)
addr += flashsz;
}
return addr;
}
int disasm(const char *Bitstream, int Read, int addr) {
int Pos;
int Opcode;
@@ -154,7 +167,7 @@ int disasm(const char *Bitstream, int Read, int addr) {
if(Opcode == -1) {
Pos += 2;
} else {
cx->dis_op[Opcode].Callback(Bitstream + Pos, Pos + addr, cx->dis_op[Opcode].mnemo);
cx->dis_op[Opcode].Callback(Bitstream + Pos, disasm_wrap(Pos + addr), cx->dis_op[Opcode].mnemo);
Pos += Get_Bitmask_Length(cx->dis_op[Opcode].Opcode_String) / 8;
}
}
@@ -182,14 +195,13 @@ int disasm(const char *Bitstream, int Read, int addr) {
cx->dis_code[0] = 0;
cx->dis_comment[0] = 0;
cx->dis_after_code[0] = 0;
cx->dis_op[Opcode].Callback(Bitstream + Pos, Pos + addr, cx->dis_op[Opcode].mnemo);
cx->dis_op[Opcode].Callback(Bitstream + Pos, disasm_wrap(Pos + addr), cx->dis_op[Opcode].mnemo);
if(cx->dis_opts.Process_Labels) {
Print_JumpCalls(Pos + addr);
}
if(cx->dis_opts.Process_Labels)
Print_JumpCalls(disasm_wrap(Pos + addr));
if(cx->dis_opts.Show_Addresses)
term_out("%4x: ", Pos + addr);
term_out("%4x: ", disasm_wrap(Pos + addr));
if(cx->dis_opts.Show_Cycles)
term_out("[%-3s] ", avr_opcodes[cx->dis_op[Opcode].mnemo].clock[cx->dis_opts.cycle_index]);
@@ -221,8 +233,8 @@ int disasm(const char *Bitstream, int Read, int addr) {
Pos += Get_Bitmask_Length(cx->dis_op[Opcode].Opcode_String) / 8;
} else {
term_out(".word 0x%02x%02x ; Invalid opcode at 0x%04x\n", // @@@ show unoffical opcode what it might do
((unsigned char *) Bitstream)[Pos + 1], ((unsigned char *) Bitstream)[Pos], Pos + addr);
term_out(".word 0x%02x%02x ; Invalid opcode at 0x%04x\n",
((unsigned char *) Bitstream)[Pos + 1], ((unsigned char *) Bitstream)[Pos], disasm_wrap(Pos + addr));
Pos += 2;
}
}

1
src/disasm_private.h
View File

@@ -42,6 +42,7 @@
#define TYPE_STRING 4
void disasm_init_regfile(const AVRPART *p);
int disasm_wrap(int addr);
int Tagfile_FindLabelAddress(int Address);
char *Tagfile_GetLabel(int TagIndex);
char *Tagfile_GetLabelComment(int TagIndex);

8
src/disasm_tagfile.c
View File

@@ -397,7 +397,7 @@ int Tagfile_Process_Data(const char *Bitstream, int Position, int offset) {
int (*ProcessingFunction)(const char *, int, int, int, const char *) = NULL;
char Buffer[32];
Index = Tagfile_FindPGMAddress(Position + offset);
Index = Tagfile_FindPGMAddress(disasm_wrap(Position + offset));
if(Index == -1)
return 0;
@@ -433,7 +433,7 @@ int Tagfile_Process_Data(const char *Bitstream, int Position, int offset) {
}
if(cx->dis_PGMLabels[Index].Count != 1)
term_out("s");
term_out(" starting at 0x%x", Position + offset);
term_out(" starting at 0x%x", disasm_wrap(Position + offset));
if(cx->dis_PGMLabels[Index].Comment != NULL) {
term_out(" (%s)", cx->dis_PGMLabels[Index].Comment);
@@ -442,10 +442,10 @@ int Tagfile_Process_Data(const char *Bitstream, int Position, int offset) {
if((cx->dis_PGMLabels[Index].Type == TYPE_ASTRING) || (cx->dis_PGMLabels[Index].Type == TYPE_STRING)) {
if(cx->dis_PGMLabels[Index].Comment != NULL) {
snprintf(Buffer, sizeof(Buffer), "%x_%s", Position + offset, cx->dis_PGMLabels[Index].Comment);
snprintf(Buffer, sizeof(Buffer), "%x_%s", disasm_wrap(Position + offset), cx->dis_PGMLabels[Index].Comment);
Sanitize_String(Buffer);
} else {
snprintf(Buffer, sizeof(Buffer), "%x", Position + offset);
snprintf(Buffer, sizeof(Buffer), "%x", disasm_wrap(Position + offset));
}
}