PVB
/
shrooms-vb-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent disassembling over PC

This commit is contained in:
Guy Perfect 2024-10-30 10:22:49 -05:00
parent 650d9dfd05
commit 6cba6e5d4f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util/disassembler.c
View File

@ -489,8 +489,9 @@ static OpDef* dasmSETF(VBU_DasmConfig *config,
} }
/* Disassemble one instruction */ /* Disassemble one instruction */
static int dasmLine(VB *sim, uint32_t *address, VBU_DasmConfig *config, static int dasmLine(VB *sim, uint32_t *address, uint32_t pc,
VBU_DasmLine **lines, size_t *size, size_t *offset, unsigned index) { VBU_DasmConfig *config, VBU_DasmLine **lines, size_t *size, size_t *offset,
unsigned index) {
char *dest; /* Text output pointer */ char *dest; /* Text output pointer */
char *format; /* Hexadecimal format string */ char *format; /* Hexadecimal format string */
VBU_DasmLine *line; /* Output line */ VBU_DasmLine *line; /* Output line */
@ -501,15 +502,17 @@ static int dasmLine(VB *sim, uint32_t *address, VBU_DasmConfig *config,
char tCode[4][3]; /* Code display text */ char tCode[4][3]; /* Code display text */
char tMnemonic[8]; /* Mnemonic display text */ char tMnemonic[8]; /* Mnemonic display text */
char tOperands[3][15]; /* Operands display text */ char tOperands[3][15]; /* Operands display text */
unsigned x; /* Scratch and iterator */ uint32_t x; /* Scratch and iterator */
/* Process non-text members */ /* Process non-text members */
line = &(*lines)[index]; line = &(*lines)[index];
line->address = *address; line->address = *address;
line->codeLength = dasmInstSize(sim, *address); line->codeLength = dasmInstSize(sim, *address);
line->isPC = vbGetProgramCounter(sim) - *address < line->codeLength; line->isPC = *address == pc;
for (x = 0; x < line->codeLength; x++, (*address)++) for (x = 0; x < line->codeLength; x++)
line->code[x] = vbRead(sim, *address, VB_U8); line->code[x] = vbRead(sim, *address + x, VB_U8);
*address += pc - *address < line->codeLength ?
pc - *address : line->codeLength;
/* Do not process text members */ /* Do not process text members */
if (config == NULL) { if (config == NULL) {
@ -674,7 +677,7 @@ static VBU_DasmLine* dasmDisassemble(VB *sim, uint32_t address,
/* Process output lines */ /* Process output lines */
for (x = 0; x < length; x++) { for (x = 0; x < length; x++) {
if (dasmLine(sim, &addr, config, &lines, &size, &offset, x)) if (dasmLine(sim, &addr, pc, config, &lines, &size, &offset, x))
goto catch; goto catch;
} }
return lines; return lines;