X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=lib%2Fccdbg-memory.c;h=20a247999ae1a59339eb1e822c7bfe93bea16d09;hp=105295db7c8dc238606a84f859ba1c4b5f76bb31;hb=6c2a65c743a4ffae96ed27dbc38c1bf9242ed1df;hpb=9025eb792861930e6af918d2727c4f5d97a69936

diff --git a/lib/ccdbg-memory.c b/lib/ccdbg-memory.c
index 105295db..20a24799 100644
--- a/lib/ccdbg-memory.c
+++ b/lib/ccdbg-memory.c
@@ -48,16 +48,28 @@ uint8_t
 ccdbg_write_memory(struct ccdbg *dbg, uint16_t addr, uint8_t *bytes, int nbytes)
 {
 	int i, nl = 0;
+	struct ccstate state;
+
+	ccdbg_state_save(dbg, &state, CC_STATE_ACC | CC_STATE_PSW | CC_STATE_DP);
 	memory_init[HIGH_START] = addr >> 8;
 	memory_init[LOW_START] = addr;
 	(void) ccdbg_execute(dbg, memory_init);
 	for (i = 0; i < nbytes; i++) {
 		write8[DATA_BYTE] = *bytes++;
 		ccdbg_execute(dbg, write8);
-		if ((i & 0xf) == 0xf) { printf ("."); fflush(stdout); nl = 1; }
-		if ((i & 0xff) == 0xff) { printf ("\n"); nl = 0; }
+		if ((i & 0xf) == 0xf) {
+			ccdbg_debug(CC_DEBUG_MEMORY, ".");
+			ccdbg_flush(CC_DEBUG_MEMORY);
+			nl = 1;
+		}
+		if ((i & 0xff) == 0xff) {
+			ccdbg_debug(CC_DEBUG_MEMORY, "\n");
+			nl = 0;
+		}
 	}
-	if (nl) printf ("\n");
+	ccdbg_state_restore(dbg, &state);
+	if (nl)
+		ccdbg_debug(CC_DEBUG_MEMORY, "\n");
 	return 0;
 }
 
@@ -65,15 +77,32 @@ uint8_t
 ccdbg_read_memory(struct ccdbg *dbg, uint16_t addr, uint8_t *bytes, int nbytes)
 {
 	int i, nl = 0;
+	struct ccstate state;
+
+	if (ccdbg_rom_contains(dbg, addr, nbytes)) {
+		ccdbg_rom_replace_xmem(dbg, addr, bytes, nbytes);
+		return 0;
+	}
+	ccdbg_state_save(dbg, &state, CC_STATE_ACC | CC_STATE_PSW | CC_STATE_DP);
 	memory_init[HIGH_START] = addr >> 8;
 	memory_init[LOW_START] = addr;
 	(void) ccdbg_execute(dbg, memory_init);
 	for (i = 0; i < nbytes; i++) {
 		*bytes++ = ccdbg_execute(dbg, read8);
-		if ((i & 0xf) == 0xf) { printf ("."); fflush(stdout); nl = 1; }
-		if ((i & 0xff) == 0xff) { printf ("\n"); nl = 0; }
+		if ((i & 0xf) == 0xf) {
+			ccdbg_debug(CC_DEBUG_MEMORY, ".");
+			ccdbg_flush(CC_DEBUG_MEMORY);
+			nl = 1;
+		}
+		if ((i & 0xff) == 0xff) {
+			ccdbg_debug(CC_DEBUG_MEMORY, "\n");
+			nl = 0;
+		}
 	}
-	if (nl) printf ("\n");
+	ccdbg_state_replace_xmem(dbg, &state, addr, bytes, nbytes);
+	ccdbg_state_restore(dbg, &state);
+	if (nl)
+		ccdbg_debug(CC_DEBUG_MEMORY, "\n");
 	return 0;
 }
 
@@ -102,3 +131,45 @@ ccdbg_read_hex_image(struct ccdbg *dbg, uint16_t address, uint16_t length)
 	ccdbg_read_memory(dbg, address, image->data, length);
 	return image;
 }
+
+static uint8_t sfr_read[] = {
+	2,	MOV_A_direct,		0,
+#define SFR_READ_ADDR	2
+	0,
+};
+
+static uint8_t sfr_write[] = {
+	3,	MOV_direct_data,	0,	0,
+#define SFR_WRITE_ADDR	2
+#define SFR_WRITE_DATA	3
+	0,
+};
+
+uint8_t
+ccdbg_read_sfr(struct ccdbg *dbg, uint8_t addr, uint8_t *bytes, int nbytes)
+{
+	int	i;
+	struct ccstate state;
+
+	ccdbg_state_save(dbg, &state, CC_STATE_ACC);
+	for (i = 0; i < nbytes; i++) {
+		sfr_read[SFR_READ_ADDR] = addr + i;
+		*bytes++ = ccdbg_execute(dbg, sfr_read);
+	}
+	ccdbg_state_replace_sfr(dbg, &state, addr, bytes, nbytes);
+	ccdbg_state_restore(dbg, &state);
+	return 0;
+}
+
+uint8_t
+ccdbg_write_sfr(struct ccdbg *dbg, uint8_t addr, uint8_t *bytes, int nbytes)
+{
+	int	i;
+	
+	for (i = 0; i < nbytes; i++) {
+		sfr_write[SFR_WRITE_ADDR] = addr + i;
+		sfr_write[SFR_WRITE_DATA] = *bytes++;
+		ccdbg_execute(dbg, sfr_write);
+	}
+	return 0;
+}