瀏覽代碼

add debug

David Voswinkel 15 年之前
父節點
當前提交
c1203c3519

+ 458 - 21
snesram.tmproj

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>currentDocument</key>
-	<string>snes/fatfstest/integer.h</string>
+	<string>snes/fatfstest/pad.c</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -35,6 +35,36 @@
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
+		<key>poc/avr_sdcard/main.c</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>113</integer>
+			</dict>
+			<key>columnSelection</key>
+			<false/>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>106</integer>
+			<key>selectFrom</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>146</integer>
+			</dict>
+			<key>selectTo</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>113</integer>
+			</dict>
+		</dict>
 		<key>poc/avr_sdcard/mmc.h</key>
 		<dict>
 			<key>caret</key>
@@ -77,33 +107,215 @@
 			<key>firstVisibleLine</key>
 			<integer>211</integer>
 		</dict>
+		<key>snes/crc/crc.c</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>39</integer>
+				<key>line</key>
+				<integer>27</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>snes/crc/debug.c</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>3</integer>
+				<key>line</key>
+				<integer>6</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>2</integer>
+		</dict>
+		<key>snes/crc/debug.h</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>10</integer>
+				<key>line</key>
+				<integer>0</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>snes/crc/main.c</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>49</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>20</integer>
+		</dict>
+		<key>snes/fatfstest/Makefile</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>23</integer>
+				<key>line</key>
+				<integer>72</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>29</integer>
+		</dict>
+		<key>snes/fatfstest/StartupSnes.asm</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>0</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>97</integer>
+		</dict>
+		<key>snes/fatfstest/config.h</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>28</integer>
+				<key>line</key>
+				<integer>17</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>snes/fatfstest/crc.c</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>0</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>snes/fatfstest/crc.h</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>0</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>snes/fatfstest/data.h</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>0</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
 		<key>snes/fatfstest/debug.c</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>line</key>
-				<integer>39</integer>
+				<integer>144</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>snes/fatfstest/debug.h</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>32</integer>
+				<key>line</key>
+				<integer>7</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
+		<key>snes/fatfstest/dis</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>32759</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>32759</integer>
+		</dict>
 		<key>snes/fatfstest/diskio.c</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>25</integer>
+				<integer>6</integer>
 				<key>line</key>
-				<integer>39</integer>
+				<integer>91</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>13</integer>
+			<integer>72</integer>
+		</dict>
+		<key>snes/fatfstest/event.c</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>0</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>39</integer>
 		</dict>
 		<key>snes/fatfstest/event.h</key>
 		<dict>
@@ -119,14 +331,56 @@
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
+		<key>snes/fatfstest/ff.c</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>1281</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>153</integer>
+		</dict>
+		<key>snes/fatfstest/ff.h</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>18</integer>
+				<key>line</key>
+				<integer>56</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>42</integer>
+		</dict>
+		<key>snes/fatfstest/hook.asm</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>7</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
 		<key>snes/fatfstest/integer.h</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>2</integer>
+				<integer>28</integer>
 				<key>line</key>
-				<integer>35</integer>
+				<integer>24</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
@@ -138,14 +392,28 @@
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>13</integer>
+				<integer>0</integer>
 				<key>line</key>
-				<integer>22</integer>
+				<integer>26</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>62</integer>
+			<integer>0</integer>
+		</dict>
+		<key>snes/fatfstest/myEvents.h</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>0</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
 		</dict>
 		<key>snes/fatfstest/pad.c</key>
 		<dict>
@@ -161,19 +429,47 @@
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>tools/bsnes/cart/cart.cpp</key>
+		<key>snes/fatfstest/ressource.asm</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
 				<integer>0</integer>
 				<key>line</key>
-				<integer>95</integer>
+				<integer>14</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>44</integer>
+			<integer>0</integer>
+		</dict>
+		<key>snes/fatfstest/ressource.h</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>2</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>tools/bsnes/cart/cart.cpp</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>24</integer>
+				<key>line</key>
+				<integer>48</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>33</integer>
 		</dict>
 		<key>tools/bsnes/cart/cart.hpp</key>
 		<dict>
@@ -189,35 +485,77 @@
 			<key>firstVisibleLine</key>
 			<integer>24</integer>
 		</dict>
-		<key>tools/bsnes/chip/fatfs/diskio.cpp</key>
+		<key>tools/bsnes/chip/fatfs/config.h</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
 				<integer>0</integer>
 				<key>line</key>
-				<integer>0</integer>
+				<integer>21</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>24</integer>
+			<integer>0</integer>
+		</dict>
+		<key>tools/bsnes/chip/fatfs/diskio.cpp</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>58</integer>
+				<key>line</key>
+				<integer>102</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>65</integer>
+		</dict>
+		<key>tools/bsnes/chip/fatfs/diskio.h</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>28</integer>
+				<key>line</key>
+				<integer>50</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
 		</dict>
 		<key>tools/bsnes/chip/fatfs/fatfs.cpp</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>23</integer>
+				<integer>2</integer>
 				<key>line</key>
-				<integer>69</integer>
+				<integer>56</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>43</integer>
+			<integer>17</integer>
 		</dict>
 		<key>tools/bsnes/chip/fatfs/fatfs.hpp</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>31</integer>
+				<key>line</key>
+				<integer>10</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>tools/bsnes/chip/fatfs/integer.h</key>
 		<dict>
 			<key>caret</key>
 			<dict>
@@ -245,22 +583,121 @@
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
+		<key>tools/bsnes/memory/memory.cpp</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>6</integer>
+				<key>line</key>
+				<integer>22</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>tools/bsnes/memory/memory.hpp</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>31</integer>
+				<key>line</key>
+				<integer>132</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>84</integer>
+		</dict>
+		<key>tools/bsnes/memory/smemory/smemory.cpp</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>20</integer>
+				<key>line</key>
+				<integer>9</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>tools/bsnes/memory/smemory/smemory.hpp</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>0</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>tools/ffsample/linux/main.c</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>18</integer>
+				<key>line</key>
+				<integer>385</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>229</integer>
+		</dict>
 	</dict>
 	<key>openDocuments</key>
 	<array>
 		<string>snes/fatfstest/debug.c</string>
 		<string>snes/fatfstest/pad.c</string>
 		<string>snes/fatfstest/diskio.c</string>
+		<string>snes/fatfstest/ff.c</string>
+		<string>tools/bsnes/memory/memory.hpp</string>
+		<string>tools/bsnes/memory/memory.cpp</string>
+		<string>tools/bsnes/memory/smemory/smemory.cpp</string>
+		<string>tools/bsnes/cart/cart.cpp</string>
+		<string>tools/bsnes/memory/smemory/smemory.hpp</string>
+		<string>snes/fatfstest/data.h</string>
+		<string>snes/fatfstest/ff.h</string>
+		<string>snes/fatfstest/event.c</string>
+		<string>snes/fatfstest/StartupSnes.asm</string>
 		<string>snes/fatfstest/main.c</string>
+		<string>tools/ffsample/linux/main.c</string>
+		<string>snes/crc/crc.c</string>
+		<string>snes/crc/main.c</string>
+		<string>poc/avr_sdcard/main.c</string>
+		<string>snes/crc/debug.h</string>
+		<string>snes/crc/debug.c</string>
+		<string>snes/fatfstest/crc.h</string>
+		<string>snes/fatfstest/crc.c</string>
+		<string>snes/fatfstest/Makefile</string>
+		<string>snes/fatfstest/hook.asm</string>
+		<string>snes/fatfstest/myEvents.h</string>
+		<string>snes/fatfstest/ressource.asm</string>
+		<string>snes/fatfstest/ressource.h</string>
+		<string>snes/fatfstest/dis</string>
 		<string>snes/fatfstest/event.h</string>
 		<string>snes/fatfstest/integer.h</string>
 		<string>tools/bsnes/chip/fatfs/fatfs.hpp</string>
+		<string>tools/bsnes/chip/fatfs/diskio.h</string>
 		<string>tools/bsnes/chip/fatfs/fatfs.cpp</string>
+		<string>snes/fatfstest/debug.h</string>
+		<string>tools/bsnes/chip/fatfs/config.h</string>
+		<string>snes/fatfstest/config.h</string>
+		<string>tools/bsnes/chip/fatfs/integer.h</string>
 		<string>tools/bsnes/chip/fatfs/diskio.cpp</string>
 	</array>
 	<key>showFileHierarchyDrawer</key>
 	<false/>
 	<key>windowFrame</key>
-	<string>{{0, 60}, {1110, 818}}</string>
+	<string>{{0, 52}, {1205, 826}}</string>
 </dict>
 </plist>

+ 2 - 2
tools/bsnes/cart/cart.cpp

@@ -46,8 +46,8 @@ void Cartridge::load_end() {
   memory::stAram.map(stA.ram, stA.ram_size);
   memory::stBrom.map(stB.rom, stB.rom_size);
   memory::stBram.map(stB.ram, stB.ram_size);
-
-  memory::cartrom.write_protect(true);
+  /* enable rom write */
+  memory::cartrom.write_protect(false);
   memory::cartram.write_protect(false);
   memory::bscram.write_protect(true);
   memory::stArom.write_protect(true);

+ 2 - 2
tools/bsnes/chip/fatfs/config.h

@@ -14,8 +14,8 @@
 #define MMIO_RETVAL     0x3016
 
 
-#define SHARED_SIZE     512
-#define SHARED_ADDR     0x3f0000
+#define SHARED_MAX_SIZE     512
+#define SHARED_ADDR     0x3d0000
 
 #undef MMIO_DEBUG
 #undef FATFS_DEBUG

+ 3 - 2
tools/bsnes/chip/fatfs/diskio.cpp

@@ -96,10 +96,11 @@ DRESULT disk_read (
 
     DWORD offset = sector  * 512;
     int size = count * 512;
-    #ifdef MMIO_DEBUG
+    //#ifdef MMIO_DEBUG
     printf("DISKIO::disk_read: sector=%li count=%i addr=%p off=%li size=%i\n",sector,count,image_addr + offset,offset,size);
-    #endif
+    //#endif
     memcpy(buff,image_addr + offset,size);
+    printf("%x %x %x %x\n",buff[0],buff[1],buff[2],buff[3]);
     #ifdef MMIO_DEBUG
     printf("DISKIO::disk_read: done\n");
     #endif

+ 8 - 8
tools/bsnes/chip/fatfs/fatfs.cpp

@@ -13,7 +13,7 @@ void FATFS::init() {
   sector = 0;
   count = 0;
   retval = -1;
-  scratch_buffer = (unsigned char*)malloc(SHARED_SIZE);
+  scratch_buffer = (unsigned char*)malloc(SHARED_MAX_SIZE);
 }
 
 void FATFS::enable() {
@@ -38,17 +38,17 @@ void FATFS::reset() {
 }
 
 
-void FATFS::fetchMem() {
-  for ( int i=0;i<SHARED_SIZE;i++){
+void FATFS::fetchMem(unsigned int len) {
+  for ( int i=0;i<len;i++){
       scratch_buffer[i] = bus.read(SHARED_ADDR + i);
   } 
 }
 
-void FATFS::pushMem() {
-  for ( int i=0;i<SHARED_SIZE;i++){
+void FATFS::pushMem(unsigned int len) {
+  for ( int i=0;i<len;i++){
       bus.write(SHARED_ADDR + i,scratch_buffer[i]);
       #ifdef FATFS_DEBUG
-      if ( i < 8)
+      if ( i < 4)
         printf("0x%02x ",scratch_buffer[i]);
       #endif
   }
@@ -117,9 +117,9 @@ void FATFS::mmio_write(unsigned addr, uint8 data) {
       if (command == CMD_READ) {
           retval = disk_read (0, (BYTE*)scratch_buffer, sector, count);
           if (!retval)
-              pushMem();
+              pushMem(512 * count);
       } else if (command == CMD_WRITE) {
-            fetchMem();
+            fetchMem(512 * count);
             retval = disk_write (0, (BYTE*)scratch_buffer, sector, count);
       } else{
             #ifdef FATFS_DEBUG

+ 2 - 2
tools/bsnes/chip/fatfs/fatfs.hpp

@@ -7,8 +7,8 @@ public:
   void reset();
 
 
-  void fetchMem();
-  void pushMem();
+  void fetchMem(unsigned int len);
+  void pushMem(unsigned int len);
 
 
   uint8 mmio_read (unsigned addr);

+ 2 - 1
tools/ffsample/linux/Makefile

@@ -44,9 +44,10 @@ image_not_parted:
 
 image:
 	rm -fv disk00.vfat
-	mkfs.vfat  -I -F 16 -v -C disk00.vfat 32000 
+	mkfs.vfat  -I -F 12 -v -C disk00.vfat 32000 
 	sudo mount -o loop disk00.vfat disk
 	sudo cp -v ../../../roms/*smc  disk/
+	sudo cp -v /var/log/syslog disk/test.txt 
 	sudo umount disk
 
 mount:

二進制
tools/ffsample/linux/fftest


+ 3 - 3
tools/ffsample/linux/main.c

@@ -354,9 +354,9 @@ int main (void)
 				break;
 
 			case 'o' :	/* fo <mode> <name> - Open a file */
-				if (!(&ptr, &p1)) break;
+				//if (!(&ptr, &p1)) break;
 				while (*ptr == ' ') ptr++;
-				put_rc(f_open(&file1, ptr, (BYTE)p1));
+				put_rc(f_open(&file1, ptr, (BYTE)FA_READ));
 				break;
 
 			case 'c' :	/* fc - Close a file */
@@ -383,7 +383,7 @@ int main (void)
 					p2 += s2;
 					if (cnt != s2) break;
 				}
-				s2 = Timer;
+				s2 = Timer + 1;
 				printf("%lu bytes read with %lu bytes/sec.\n", p2, p2 * 100 / s2);
 				break;