X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fmemory.c;h=bf3a822c5625134998dd67700828d08fd0960a01;hb=ba7ff1a7a78b3aa7c2cad9bfce117256638938b1;hp=23885ce0f38e53eae8f775cfa0f462f015926497;hpb=6a65dca9d597772744524b909f2d89b479b8bf77;p=emu8051.git

diff --git a/src/memory.c b/src/memory.c
index 23885ce..bf3a822 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -16,106 +16,141 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "memory.h"
+#include <stdio.h>
+#include <string.h>
 
+#include "common.h"
+#include "cpu8051.h"
+#include "hexfile.h"
+#include "memory.h"
 
-#define SFR_MEM_SIZE 128
 #define PGM_MEM_SIZE 65536
-#define INT_MEM_SIZE 128
+#define INT_MEM_SIZE 256 /* IRAM = Direct addresses $00 to $7F
+			  * SFR  = Direct addresses $80 to $FF */
 #define EXT_MEM_SIZE 65536
 
-
-static u_int8_t sfr_mem[SFR_MEM_SIZE];
 static u_int8_t pgm_mem[PGM_MEM_SIZE];
 static u_int8_t int_mem[INT_MEM_SIZE];
 static u_int8_t ext_mem[EXT_MEM_SIZE];
 
-
 void
-memory_write8( int memory_id, unsigned long address, u_int8_t value )
+memory_write8(int memory_id, unsigned long address, u_int8_t value)
 {
-  switch( memory_id ) {
-  case SFR_MEM_ID:
-    if( address >= SFR_MEM_SIZE ) {
-      return;
-    }
-    else {
-      sfr_mem[address] = value;
-    }
-    break;
-  case PGM_MEM_ID:
-    if( address >= PGM_MEM_SIZE ) {
-      return;
-    }
-    else {
-      pgm_mem[address] = value;
-    }
-    break;
-  case INT_MEM_ID:
-    if( address >= INT_MEM_SIZE ) {
-      return;
-    }
-    else {
-      int_mem[address] = value;
-    }
-    break;
-  case EXT_MEM_ID:
-    if( address >= EXT_MEM_SIZE ) {
-      return;
-    }
-    else {
-      ext_mem[address] = value;
-    }
-    break; 
-  default:
-    /* Error. */
-    break;
-  }
+	switch (memory_id) {
+	case PGM_MEM_ID:
+		if (address >= PGM_MEM_SIZE) {
+			printf("Address (%lu) is greater than PGM_MEM_SIZE\n",
+			       address);
+			return;
+		} else
+			pgm_mem[address] = value;
+		break;
+	case INT_MEM_ID:
+		if (address >= INT_MEM_SIZE) {
+			printf("Address (%lu) is greater than INT_MEM_SIZE\n",
+			       address);
+			return;
+		} else
+			int_mem[address] = value;
+		break;
+	case EXT_MEM_ID:
+		if (address >= EXT_MEM_SIZE) {
+			printf("Address (%lu) is greater than EXT_MEM_SIZE\n",
+			       address);
+			return;
+		} else
+			ext_mem[address] = value;
+		break;
+	default:
+		/* Error. */
+		break;
+	}
 }
 
-
 u_int8_t
-memory_read8( int memory_id, unsigned long address )
+memory_read8(int memory_id, unsigned long address)
 {
-  switch( memory_id ) {
-  case SFR_MEM_ID:
-    if( address < SFR_MEM_SIZE ) {
-      return sfr_mem[address];
-    }
-    else {
-      return 0;
-    }
-    break;
-  case PGM_MEM_ID:
-    if( address < PGM_MEM_SIZE ) {
-      return pgm_mem[address];
-    }
-    else {
-      return 0;
-    }
-    break;
-  case INT_MEM_ID:
-    if( address < INT_MEM_SIZE ) {
-      return int_mem[address];
-    }
-    else {
-      return 0;
-    }
-    break;
-  case EXT_MEM_ID:
-    if( address < EXT_MEM_SIZE ) {
-      return ext_mem[address];
-    }
-    else {
-      return 0;
-    }
-    break; 
-  default:
-    /* Error. */
-    return 0;
-    break;
-  }
+	switch (memory_id) {
+	case PGM_MEM_ID:
+		if (address < PGM_MEM_SIZE)
+			return pgm_mem[address];
+		else {
+			printf("Address (%lu) is greater than PGM_MEM_SIZE\n",
+				address);
+			return 0;
+		}
+		break;
+	case INT_MEM_ID:
+		if (address < INT_MEM_SIZE)
+			return int_mem[address];
+		else {
+			printf("Address (%lu) is greater than INT_MEM_SIZE\n",
+			       address);
+			return 0;
+		}
+		break;
+	case EXT_MEM_ID:
+		if (address < EXT_MEM_SIZE)
+			return ext_mem[address];
+		else {
+			printf("Address (%lu) is greater than EXT_MEM_SIZE\n",
+			       address);
+			return 0;
+		}
+		break;
+	default:
+		/* Error. */
+		return 0;
+		break;
+	}
+}
+
+/* Dump memory */
+void
+DumpMem(char *Address, char *Asize, int memory_id)
+{
+	unsigned int MemAddress;
+	int size;
+	int Offset, Column;
+
+	if (strlen(Address) != 0) {
+		if (STREQ(Address, "PC"))
+			MemAddress = cpu8051.pc;
+		else
+			MemAddress = Ascii2Hex(Address, strlen(Address));
+	} else {
+		MemAddress = 0;
+	}
+
+	if (strlen(Asize) != 0) {
+		size = Ascii2Hex(Asize, strlen(Asize));
+	} else {
+		size = 256; /* Default size if not specified. */
+	}
+
+	for (Offset = 0; Offset < size; Offset += 16) {
+		unsigned char data[16];
+
+		printf("%.4X ", MemAddress + Offset);
+
+		for (Column = 0; Column < 16; Column++) {
+			data[Column] = memory_read8(memory_id, MemAddress +
+						    Offset + Column);
+			printf(" %.2X", (int) data[Column]);
+		}
+		printf("  ");
+
+		/* Display any ASCII characters */
+		for (Column = 0; Column < 16; Column++) {
+			if ((int) data[Column] >= 32 &&
+			    (int) data[Column] <= 126) {
+				printf("%c", data[Column]);
+			} else
+				printf(".");
+		}
+		printf("\n");
+	}
 }