Rename DumpMem function -> memory_dump

[emu8051.git] / src / common / sfr.c

diff --git a/src/common/sfr.c b/src/common/sfr.c
index 1bbeb8e..8d74dcf 100644 (file)
--- a/src/common/sfr.c
+++ b/src/common/sfr.c
@@ -39,12 +39,16 @@
 static unsigned int
 regwin_read_pc(int dummy)
 {
+       (void) dummy; /* Remove compiler warning about unused variable. */
+
        return cpu8051.pc;
 }
 
 static void
 regwin_write_pc(int param, int val)
 {
+       (void) param; /* Remove compiler warning about unused variable. */
+
        cpu8051.pc = (u_int16_t) val;
 }
 
@@ -71,6 +75,8 @@ regwin_read_bank_offset(void)
 static unsigned int
 regwin_read_bank(int dummy)
 {
+       (void) dummy; /* Remove compiler warning about unused variable. */
+
        return regwin_read_bank_offset() >> 3;
 }
 
@@ -79,6 +85,8 @@ regwin_write_bank(int param, int bank_number)
 {
        u_int8_t psw = memory_sfr_read8(_PSW_);
 
+       (void) param; /* Remove compiler warning about unused variable. */
+
        if ((bank_number < 0) || (bank_number > 3)) {
                log_info("Error: invalid bank number: %d", bank_number);
                bank_number = 0;
@@ -309,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
@@ -322,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 *
@@ -334,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 *