hugovil/emu8051
1
0
Fork 0
mirror of http://git.hugovil.com/git/emu8051.git synced 2025-10-14 02:48:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add new value range check when writing register in CLI version

Browse Source 
The GUI version also had this check, so the functionality has been merged.
This commit is contained in:
Hugo Villeneuve
2014-02-05 22:02:43 -05:00
parent c7d14532b0
commit a43a2e343e
3 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/sfr.c
View File

@@ -317,9 +317,20 @@ regwin_read(int row)
return val;
}
void
int
regwin_write(struct regwin_infos_t *p, int new)
{
int max_value;
max_value = (1 << (4 * p->w)) - 1; /* 16^w - 1 */
/* Check that the new value is not too large for the register type. */
if (new > max_value) {
/* Display message for CLI version */
printf("Value out of range\n");
return -1;
}
if (p->write_func == NULL) {
/*
* Write register value using generic 8 or 16 bits write
@@ -330,6 +341,8 @@ regwin_write(struct regwin_infos_t *p, int new)
/* Write register value using custom function pointer. */
p->write_func(p->param, new);
}
return 0;
}
struct regwin_infos_t *
@@ -342,7 +355,7 @@ sfr_get_infos(const char *regname)
return &regwin_infos[row];
}
return NULL; /* Programming error. */
return NULL; /* Register not found. */
}
struct regwin_infos_t *

2
src/common/sfr.h
View File

@@ -34,7 +34,7 @@ struct regwin_infos_t {
int
regwin_read(int row);
void
int
regwin_write(struct regwin_infos_t *p, int new);
struct regwin_infos_t *

48
src/gtk/regwin.c
View File

@@ -80,6 +80,7 @@ regwin_cell_edited(GtkCellRendererText *cell, gchar *path_string,
int old;
int new;
char *str;
int rc;
struct regwin_infos_t *regwin_infos;
(void) cell; /* Remove compiler warning about unused variables. */
@@ -96,47 +97,30 @@ regwin_cell_edited(GtkCellRendererText *cell, gchar *path_string,
log_info("Register: %s", str);
regwin_infos = sfr_get_infos(str);
log_info(" width: %d bits", 4 * regwin_infos->w);
/* Read current (old) value. */
gtk_tree_model_get(model, &iter, COL_VAL, &str, -1);
old = asciihex2int(str);
if (regwin_infos->w == 2)
log_info(" old value: $%02X", old);
else if (regwin_infos->w == 4)
log_info(" old value: $%04X", old);
log_info(" old value: $%04X", old);
new = asciihex2int(new_str);
log_info(" new value: $%04X", new);
if (regwin_infos->w == 2) {
if ((new < 0) || (new > 0xFF)) {
log_info(" new value: out of range");
new = old; /* Put back old value... */
} else {
log_info(" new value: $%02X", new);
}
} else if (regwin_infos->w == 4) {
if ((new < 0) || (new > 0xFFFF)) {
log_info(" new value: out of range");
new = old; /* Put back old value... */
} else {
log_info(" new value: $%04X", new);
}
/* Store new value in emulator register (if in range). */
rc = regwin_write(regwin_infos, new);
if (rc == 0) {
/* Store new value in gtk model. */
int2asciihex(new, str, regwin_infos->w);
gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_VAL, str, -1);
/*
* Make sure to update all windows.
* For example, R0-R7 values depends on internal memory values.
*/
emugtk_UpdateDisplay();
}
/* Store new value in emulator register. */
regwin_write(regwin_infos, new);
/* Store new value in gtk model. */
int2asciihex(new, str, regwin_infos->w);
gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_VAL, str, -1);
/*
* Make sure to update all windows.
* For example, R0-R7 values depends on internal memory values.
*/
emugtk_UpdateDisplay();
};
static void