X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fregwin.c;h=e5708f2466a24a36ee4b95d46df614f135e0a96f;hb=68a328d198d28dc2dd6ab65bda0cfcef3d12e49a;hp=06c643a6f79f25094421f75a61d966e9eaa8bebb;hpb=f3f6f52c0e9b6f42e392835502a5d19ef7abbfc5;p=emu8051.git diff --git a/src/regwin.c b/src/regwin.c index 06c643a..e5708f2 100644 --- a/src/regwin.c +++ b/src/regwin.c @@ -28,13 +28,17 @@ #include "common.h" #include "reg8051.h" #include "cpu8051.h" +#include "memory.h" #include "regwin.h" #include "memwin.h" +#include "pgmwin.h" #include "instructions_8051.h" +#include "hexfile.h" +#include "emugtk.h" static GtkWidget *reglist; -#define DATA_ROWS 24 +#define DATA_ROWS 26 enum { @@ -59,23 +63,24 @@ static unsigned int regwin_read(int addr, int width) { if (width == 2) - return cpu8051_ReadD(addr); + return memory_sfr_read8(addr); else if (width == 4) { /* Address is low address. */ - return (cpu8051_ReadD(addr + 1) << 8) + - cpu8051_ReadD(addr); - } + return (memory_sfr_read8(addr + 1) << 8) | + memory_sfr_read8(addr); + } else + return 0xFFFFFFFF; } static void regwin_write(int addr, int val, int width) { if (width == 2) - cpu8051_WriteD(addr, (u_int8_t) val); + memory_sfr_write8(addr, (u_int8_t) val); else if (width == 4) { /* Address is low address. */ - cpu8051_WriteD(addr + 1, (u_int8_t) ((val & 0x0000FFFF) >> 8)); - cpu8051_WriteD(addr, (u_int8_t) val); + memory_sfr_write8(addr + 1, (u_int8_t) ((val & 0x0000FFFF) >> 8)); + memory_sfr_write8(addr, (u_int8_t) val); } }; @@ -93,36 +98,57 @@ regwin_write_pc(int param, int val) cpu8051.pc = (u_int16_t) val; } +static unsigned int +regwin_read_timer(int timer_low_addr) +{ + return (memory_sfr_read8(timer_low_addr + 2) << 8) | + memory_sfr_read8(timer_low_addr); +} + +static void +regwin_write_timer(int timer_low_addr, int val) +{ + memory_sfr_write8(timer_low_addr + 2, (u_int8_t) ((val & 0x0000FFFF) >> 8)); + memory_sfr_write8(timer_low_addr, (u_int8_t) val); +} + +static u_int8_t +regwin_read_bank_offset(void) +{ + return memory_sfr_read8(_PSW_) & 0x18; +} + static unsigned int regwin_read_bank(int dummy) { - return BANKPSW >> 3; + return regwin_read_bank_offset() >> 3; } static void regwin_write_bank(int param, int bank_number) { - u_int8_t psw = cpu8051_ReadD(_PSW_); + u_int8_t psw = memory_sfr_read8(_PSW_); if ((bank_number < 0) || (bank_number > 3)) { log_info("Error: invalid bank number: %d", bank_number); bank_number = 0; } - cpu8051_WriteD(_PSW_, (psw & ~0x18) | (bank_number << 3)); + memory_sfr_write8(_PSW_, (psw & ~0x18) | (bank_number << 3)); } -/* Read R0 - R7 in current bank. */ +/* Indirect read of R0 - R7 in current bank from internal memory. */ static unsigned int regwin_read_rx(int offset) { - return cpu8051_ReadD(BANKPSW + offset); + return memory_read8(INT_MEM_ID, regwin_read_bank_offset() + offset); } +/* Indirect write to R0 - R7 in current bank to internal memory. */ static void regwin_write_rx(int offset, int val) { - cpu8051_WriteD(BANKPSW + offset, (u_int8_t) val); + memory_write8(INT_MEM_ID, regwin_read_bank_offset() + offset, (u_int8_t) val); } /* This array defines how to read value for each register. */ @@ -199,6 +225,18 @@ static struct regwin_infos_t regwin_infos[DATA_ROWS] = { NULL, NULL, _TMOD_, }, + { + "TIMER0", + HEX_DIGITS_4, + regwin_read_timer, regwin_write_timer, + _TL0_, + }, + { + "TIMER1", + HEX_DIGITS_4, + regwin_read_timer, regwin_write_timer, + _TL1_, + }, { "SCON", HEX_DIGITS_2, @@ -279,22 +317,20 @@ static GtkListStore * regwin_init_store(void) { GtkTreeIter iter; - int rows; + int row; int col; GtkListStore *store; GType col_types[N_COLUMNS]; - for (col = 0; col < N_COLUMNS; col++) { + /* No need for static array, all our columns are of the same type. */ + for (col = 0; col < N_COLUMNS; col++) col_types[col] = G_TYPE_STRING; - } store = gtk_list_store_newv(N_COLUMNS, col_types); - /* Initialize with rows of dummy data... */ - for (rows = 0; rows < DATA_ROWS; rows++) { - /* Add new row. */ + /* Add rows. */ + for (row = 0; row < DATA_ROWS; row++) gtk_list_store_append(store, &iter); - } return store; } @@ -339,16 +375,14 @@ regwin_cell_edited(GtkCellRendererText *cell, gchar *path_string, /* Read current (old) value. */ gtk_tree_model_get(model, &iter, COL_VAL, &str, -1); - /* Convert old value (asciihex) to integer. */ - sscanf(str, "%x", &old); + old = asciihex2int(str); if (regwin_infos[row].w == 2) log_info(" old value: $%02X", old); else if (regwin_infos[row].w == 4) log_info(" old value: $%04X", old); - /* Convert new value (asciihex) to integer. */ - sscanf(new_str, "%x", &new); + new = asciihex2int(new_str); if (regwin_infos[row].w == 2) { if ((new < 0) || (new > 0xFF)) { @@ -367,10 +401,7 @@ regwin_cell_edited(GtkCellRendererText *cell, gchar *path_string, } /* Convert new value to text. */ - if (regwin_infos[row].w == 2) - sprintf(str, "%02X", new); - else if (regwin_infos[row].w == 4) - sprintf(str, "%04X", new); + int2asciihex(new, str, regwin_infos[row].w); /* Store new value in emulator register. */ if (regwin_infos[row].write_func == NULL) { @@ -391,8 +422,7 @@ regwin_cell_edited(GtkCellRendererText *cell, gchar *path_string, * Make sure to update all windows. * For example, R0-R7 values depends on internal memory values. */ - regwin_Show(); - memwin_DumpD("0"); + emugtk_UpdateDisplay(); }; static void @@ -470,7 +500,7 @@ regwin_init(void) /* Show registers. */ void -regwin_Show(void) +regwin_refresh(void) { int row; GtkListStore *store; @@ -507,14 +537,12 @@ regwin_Show(void) regwin_infos[row].w); } else { /* Read register value using custom function pointer. */ - val = regwin_infos[row].read_func(regwin_infos[row].param); + val = regwin_infos[row].read_func( + regwin_infos[row].param); } /* Convert to specified number of hex digits. */ - if (regwin_infos[row].w == 2) - sprintf(str , "%.2X", (u_int8_t) val); - else if (regwin_infos[row].w == 4) - sprintf(str , "%.4X", (u_int16_t) val); + int2asciihex(val, str, regwin_infos[row].w); gtk_list_store_set(store, &iter, COL_NAME, regwin_infos[row].name,