From 408581b7bc9fddbcd44f47b0fa45615d255c9a89 Mon Sep 17 00:00:00 2001
From: DHrpcs3 <dh.rpcs3@gmail.com>
Date: Sun, 20 Dec 2015 10:28:25 +0200
Subject: [PATCH] sys_mmapper improvements sys_mmapper_allocate_address: always
 set default value if aligment is 0 sys_mmapper_map_memory: don't fire
 exception if memory already mapped

---
 rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp
index c4d4db29cf..abfba68159 100644
--- a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp
@@ -36,7 +36,7 @@ s32 sys_mmapper_allocate_address(u64 size, u64 flags, u64 alignment, vm::ptr<u32
 	// This is a 'hack' / workaround for psl1ght, which gives us an alignment of 0, which is technically invalid, 
 	//  but apparently is allowed on actual ps3
 	//  https://github.com/ps3dev/PSL1GHT/blob/534e58950732c54dc6a553910b653c99ba6e9edc/ppu/librt/sbrk.c#L71 
-	if (!alignment && size == 0x10000000)
+	if (!alignment)
 	{
 		alignment = 0x10000000;
 	}
@@ -283,7 +283,8 @@ s32 sys_mmapper_map_memory(u32 addr, u32 mem_id, u64 flags)
 
 	if (const u32 old_addr = mem->addr)
 	{
-		throw EXCEPTION("Already mapped (mem_id=0x%x, addr=0x%x)", mem_id, old_addr);
+		sys_mmapper.Warning("sys_mmapper_map_memory: Already mapped (mem_id=0x%x, addr=0x%x)", mem_id, old_addr);
+		return CELL_OK;
 	}
 
 	if (!area->falloc(addr, mem->size))