#include "common.h"
#include "memory.h"
#include "cpu8051.h"
+#include "opcodes.h"
#include "pgmwin.h"
#include "hexfile.h"
gtk_tree_model_get(model, &iter, COL_ADDR, &str_addr, -1);
/* Convert hex address in ASCII to integer. */
+ /* No need to check error, has already been validated. */
val = asciihex2int(str_addr);
log_debug(" row address is: $%04X", val);
/* Display base address. */
int2asciihex(address, str, 4);
-
gtk_list_store_set(store, &iter, COL_ADDR, str, -1);
- opcode = memory_read8(PGM_MEM_ID, address);
- inst_size = cpu8051_get_instruction_size(opcode);
+ opcode = mem_read8(PGM_MEM_ID, address);
+ inst_size = opcodes_get_instr_size(opcode);
/* Display instruction hex bytes. */
for (k = 0, col_id = COL_B0; k < 3; k++, col_id++) {
if (k < inst_size)
- int2asciihex(memory_read8(PGM_MEM_ID,
- address + k),
+ int2asciihex(mem_read8(PGM_MEM_ID,
+ address + k),
str, 2);
else
str[0] = '\0';
}
/* Display instruction menmonic. */
- cpu8051_disasm_mnemonic(opcode, str);
+ (void) cpu8051_disasm_mnemonic(opcode, str);
gtk_list_store_set(store, &iter, COL_INST, str, -1);
/* Display instruction arguments (if applicable). */
- str[0] = '\0';
cpu8051_disasm_args(address, str);
gtk_list_store_set(store, &iter, COL_ARGS, str, -1);