From 6aa71fbbb9cb92ed56c7642af390c9a3e98d807a Mon Sep 17 00:00:00 2001
From: cmosher <cmosher@884d43a4-ffbe-47e9-90ca-fd8c37d7eb32>
Date: Mon, 27 Jun 2011 23:27:23 +0000
Subject: [PATCH] git-svn-id:
 https://subversion.assembla.com/svn/cmosher/apple2/emu/v6502@10094
 884d43a4-ffbe-47e9-90ca-fd8c37d7eb32

---
 v6502.cpp | 139 +++++++++++++++++++++++++++---------------------------
 1 file changed, 70 insertions(+), 69 deletions(-)

diff --git a/v6502.cpp b/v6502.cpp
index c1dd9a5..4e25045 100644
--- a/v6502.cpp
+++ b/v6502.cpp
@@ -123,6 +123,75 @@ void dumpSegs() {
 	}
 }
 
+unsigned char memory[0x10000];
+void init_mem() {
+	for (int i = 0; i < 0x10000; ++i) {
+		memory[i] = 0;
+	}
+
+	memory[0x0200] = 0xEA; // NOP
+	memory[0x0201] = 0xEA; // NOP
+	memory[0x0202] = 0xA9; // LDA #$5A
+	memory[0x0203] = 0x5A; //
+	memory[0x0204] = 0x85; // STA $88
+	memory[0x0205] = 0x88; //
+	memory[0x0206] = 0xA9; // LDA #$23
+	memory[0x0207] = 0x23; //
+	memory[0x0208] = 0xD0; // BNE 0
+	memory[0x0209] = 0xF8; //
+
+	memory[0xFFFC] = 0x02;  // RESET --> $0202
+	memory[0xFFFD] = 0x02;
+
+//	memory[0xFF] = 0x68;  // PLA
+/*
+	memory[0xFF] = 0xFF;
+	memory[0xFFFF] = 0xFE;
+	memory[0xFEFE] = 0xFD;
+	memory[0xFDFD] = 0xFC;
+	memory[0xFCFC] = 0xFB;
+	memory[0xFBFB] = 0xFA;
+	memory[0xFAFA] = 0xF9;
+*/
+}
+void pZP() {
+	int a = 0;
+	for (int i = 0; i < 16; ++i) {
+		pHexw(a);
+		std::cout << ": ";
+		for (int j = 0; j < 16; ++j) {
+			pHex(memory[a++]);
+			std::cout << " ";
+		}
+		std::cout << std::endl;
+	}
+}
+
+unsigned char mRead(unsigned short addr) {
+	unsigned char x;
+	x = memory[addr];
+#ifdef TRACEMEM
+	std::cout << "--------------------------------------------- ";
+	pHex(x);
+	std::cout << "<";
+	pHexw(addr);
+	std::cout << std::endl;
+#endif
+	return x;
+}
+
+void mWrite(unsigned short addr, unsigned char data) {
+	/* TODO write data to addr in memory */
+	memory[addr] = data;
+#ifdef TRACEMEM
+	std::cout << "--------------------------------------------- ";
+	pHex(data);
+	std::cout << ">";
+	pHexw(addr);
+	std::cout << std::endl;
+#endif
+}
+
 void dumpRegs() {
 	std::cout << "A";
 	pHex(rA());
@@ -159,6 +228,7 @@ void dumpRegs() {
 	std::cout << " AB";
 	pHexw(rAddr());
 	std::cout << std::endl;
+//pZP();
 }
 
 
@@ -313,75 +383,6 @@ void setLow(int iseg) {
 	setSeg(iseg,false);
 }
 
-unsigned char memory[0x10000];
-void init_mem() {
-	for (int i = 0; i < 0x10000; ++i) {
-		memory[i] = 0;
-	}
-
-	memory[0x0200] = 0xEA; // NOP
-	memory[0x0201] = 0xEA; // NOP
-	memory[0x0202] = 0xA9; // LDA #$5A
-	memory[0x0203] = 0x5A; //
-	memory[0x0204] = 0x85; // STA $88
-	memory[0x0205] = 0x88; //
-	memory[0x0206] = 0xA9; // LDA #$23
-	memory[0x0207] = 0x23; //
-	memory[0x0208] = 0xD0; // BNE 0
-	memory[0x0209] = 0xF8; //
-
-	memory[0xFFFC] = 0x02;  // RESET --> $0202
-	memory[0xFFFD] = 0x02;
-
-//	memory[0xFF] = 0x68;  // PLA
-/*
-	memory[0xFF] = 0xFF;
-	memory[0xFFFF] = 0xFE;
-	memory[0xFEFE] = 0xFD;
-	memory[0xFDFD] = 0xFC;
-	memory[0xFCFC] = 0xFB;
-	memory[0xFBFB] = 0xFA;
-	memory[0xFAFA] = 0xF9;
-*/
-}
-void pZP() {
-	int a = 0;
-	for (int i = 0; i < 16; ++i) {
-		pHexw(a);
-		std::cout << ": ";
-		for (int j = 0; j < 16; ++j) {
-			pHex(memory[a++]);
-			std::cout << " ";
-		}
-		std::cout << std::endl;
-	}
-}
-
-unsigned char mRead(unsigned short addr) {
-	unsigned char x;
-	x = memory[addr];
-#ifdef TRACEMEM
-	std::cout << "--------------------------------------------- ";
-	pHex(x);
-	std::cout << "<";
-	pHexw(addr);
-	std::cout << std::endl;
-#endif
-	return x;
-}
-
-void mWrite(unsigned short addr, unsigned char data) {
-	/* TODO write data to addr in memory */
-	memory[addr] = data;
-#ifdef TRACEMEM
-	std::cout << "--------------------------------------------- ";
-	pHex(data);
-	std::cout << ">";
-	pHexw(addr);
-	std::cout << std::endl;
-#endif
-}
-
 void putDataToChip(unsigned char data) {
 /*
 	std::cout << "d2cpu: ";