--- trunk/src/memory_rw.c	2007/10/08 16:19:23	20
+++ trunk/src/memory_rw.c	2007/10/08 16:19:37	22
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2003-2005  Anders Gavare.  All rights reserved.
+ *  Copyright (C) 2003-2006  Anders Gavare.  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: memory_rw.c,v 1.80 2005/11/20 11:28:44 debug Exp $
+ *  $Id: memory_rw.c,v 1.82 2005/12/31 15:48:32 debug Exp $
  *
  *  Generic memory_rw(), with special hacks for specific CPU families.
  *
@@ -83,7 +83,7 @@
 #ifdef MEM_MIPS
 	int bintrans_cached = cpu->machine->bintrans_enable;
 #endif
-	int bintrans_device_danger = 0;
+	int dyntrans_device_danger = 0;
 
 	no_exceptions = misc_flags & NO_EXCEPTIONS;
 	cache = misc_flags & CACHE_FLAGS_MASK;
@@ -93,7 +93,8 @@
 	if (REAL_MODE && !(misc_flags & PHYSICAL)) {
 		if ((vaddr & 0xffff) + len > 0x10000) {
 			/*  Do one byte at a time:  */
-			int res = 0, i;
+			int res = 0;
+			size_t i;
 			for (i=0; i<len; i++)
 				res = MEMORY_RW(cpu, mem, vaddr+i, &data[i], 1,
 				    writeflag, misc_flags);
@@ -108,7 +109,8 @@
 		    Then do a write of all the new bytes. This is to make sure
 		    than both pages around the boundary are writable so we don't
 		    do a partial write.  */
-		int res = 0, i;
+		int res = 0;
+		size_t i;
 		if (writeflag == MEM_WRITE) {
 			unsigned char tmp;
 			for (i=0; i<len; i++) {
@@ -267,13 +269,12 @@
 	/*
 	 *  Memory mapped device?
 	 *
-	 *  TODO: this is utterly slow.
-	 *  TODO2: if paddr<base, but len enough, then we should write
-	 *  to a device to
+	 *  TODO: if paddr < base, but len enough, then the device should
+	 *  still be written to!
 	 */
 	if (paddr >= mem->mmap_dev_minaddr && paddr < mem->mmap_dev_maxaddr) {
 		uint64_t orig_paddr = paddr;
-		int i, start, res;
+		int i, start, end, res;
 
 		/*
 		 *  Really really slow, but unfortunately necessary. This is
@@ -283,24 +284,30 @@
 		 *	b) offsets 0x124..0x777 are a device
 		 *
 		 *	1) a read is done from offset 0x100. the page is
-		 *	   added to the bintrans system as a "RAM" page
-		 *	2) a bintranslated read is done from offset 0x200,
+		 *	   added to the dyntrans system as a "RAM" page
+		 *	2) a dyntranslated read is done from offset 0x200,
 		 *	   which should access the device, but since the
 		 *	   entire page is added, it will access non-existant
 		 *	   RAM instead, without warning.
 		 *
-		 *  Setting bintrans_device_danger = 1 on accesses which are
+		 *  Setting dyntrans_device_danger = 1 on accesses which are
 		 *  on _any_ offset on pages that are device mapped avoids
 		 *  this problem, but it is probably not very fast.
+		 *
+		 *  TODO: Convert this into a quick (multi-level, 64-bit)
+		 *  address space lookup, to find dangerous pages.
 		 */
+#if 1
 		for (i=0; i<mem->n_mmapped_devices; i++)
 			if (paddr >= (mem->dev_baseaddr[i] & ~offset_mask) &&
 			    paddr <= ((mem->dev_endaddr[i]-1) | offset_mask)) {
-				bintrans_device_danger = 1;
+				dyntrans_device_danger = 1;
 				break;
 			}
+#endif
 
-		i = start = mem->last_accessed_device;
+		start = 0; end = mem->n_mmapped_devices - 1;
+		i = mem->last_accessed_device;
 
 		/*  Scan through all devices:  */
 		do {
@@ -400,10 +407,12 @@
 				goto do_return_ok;
 			}
 
-			i ++;
-			if (i == mem->n_mmapped_devices)
-				i = 0;
-		} while (i != start);
+			if (paddr < mem->dev_baseaddr[i])
+				end = i - 1;
+			if (paddr >= mem->dev_endaddr[i])
+				start = i + 1;
+			i = (start + end) >> 1;
+		} while (start <= end);
 	}
 
 
@@ -569,7 +578,7 @@
 
 	offset = paddr & ((1 << BITS_PER_MEMBLOCK) - 1);
 
-	if (cpu->update_translation_table != NULL && !bintrans_device_danger
+	if (cpu->update_translation_table != NULL && !dyntrans_device_danger
 #ifndef MEM_MIPS
 /*	    && !(misc_flags & MEMORY_USER_ACCESS)  */
 #ifndef MEM_USERLAND