From 2912e5a820f727a1049fd9bab736f95b21c8fa0f Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Thu, 7 Jun 2012 00:47:52 +0300
Subject: [PATCH] =?utf8?q?lsnes=20rr1-=CE=9410?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 VERSION                  |  2 +-
 manual.lyx               | 20 ++++++++++++++++++++
 manual.txt               | 10 ++++++++++
 src/core/memorymanip.cpp |  2 +-
 src/core/misc.cpp        | 10 ++++++----
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index 4375c362..dfed6d5d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1-Δ9
\ No newline at end of file
+1-Δ10
\ No newline at end of file
diff --git a/manual.lyx b/manual.lyx
index b3b5c998..1aa4ebc0 100644
--- a/manual.lyx
+++ b/manual.lyx
@@ -6102,5 +6102,25 @@ Unsafe rewind support
 Fix directory transversal.
 \end_layout
 
+\begin_layout Subsection
+rr1-delta10
+\end_layout
+
+\begin_layout Itemize
+AVI: Sound mode 5 (48kHz high-quality)
+\end_layout
+
+\begin_layout Itemize
+Lua: Reset Lua VM
+\end_layout
+
+\begin_layout Itemize
+Map the SNES bus into address space
+\end_layout
+
+\begin_layout Itemize
+Fix loading memory watch files with CRLF line endings
+\end_layout
+
 \end_body
 \end_document
diff --git a/manual.txt b/manual.txt
index ac95f195..9f9840df 100644
--- a/manual.txt
+++ b/manual.txt
@@ -3025,3 +3025,13 @@ set-axis joystick0axis19 disabled
 
 • Fix directory transversal.
 
+15.63 rr1-delta10
+
+• AVI: Sound mode 5 (48kHz high-quality)
+
+• Lua: Reset Lua VM
+
+• Map the SNES bus into address space
+
+• Fix loading memory watch files with CRLF line endings
+
diff --git a/src/core/memorymanip.cpp b/src/core/memorymanip.cpp
index 9f09b943..6a2c4111 100644
--- a/src/core/memorymanip.cpp
+++ b/src/core/memorymanip.cpp
@@ -255,7 +255,7 @@ void refresh_cart_mappings() throw(std::bad_alloc)
 	}
 	create_region("SRAM", 0x10000000, SNES::cartridge.ram, false);
 	create_region("ROM", 0x80000000, SNES::cartridge.rom, true);
-	create_region("BUS", 0x100000000ULL, 0x1000000, snes_bus_iospace_rw);
+	create_region("BUS", 0x1000000, 0x1000000, snes_bus_iospace_rw);
 	switch(get_current_rom_info().first) {
 	case ROMTYPE_BSX:
 	case ROMTYPE_BSXSLOTTED:
diff --git a/src/core/misc.cpp b/src/core/misc.cpp
index 892bcd73..d32b95a3 100644
--- a/src/core/misc.cpp
+++ b/src/core/misc.cpp
@@ -143,10 +143,12 @@ void dump_region_map() throw(std::bad_alloc)
 {
 	std::vector<struct memory_region> regions = get_regions();
 	for(auto i : regions) {
-		char buf[256];
-		sprintf(buf, "Region: %08X-%08X %08X %s%c %s", i.baseaddr, i.lastaddr, i.size,
-			i.readonly ? "R-" : "RW", i.native_endian ? 'N' : 'L', i.region_name.c_str());
-		messages << buf << std::endl;
+		std::ostringstream x;
+		x << std::setfill('0') << std::setw(16) << std::hex << i.baseaddr << "-";
+		x << std::setfill('0') << std::setw(16) << std::hex << i.lastaddr << " ";
+		x << std::setfill('0') << std::setw(16) << std::hex << i.size << " ";
+		messages << x.str() << (i.readonly ? "R-" : "RW") << (i.native_endian ? 'N' : 'L')
+			<< (i.iospace ? 'I' : 'M') << " " << i.region_name << std::endl;
 	}
 }
 
-- 
2.11.4.GIT