Merge branch 'master' of https://github.com/DHrpcs3/rpcs3

Utilities/git-version-gen.cmd

@@ -13,7 +13,7 @@ rem // A copy of the GPL 2.0 should have been included with the program.
 rem // If not, see http://www.gnu.org/licenses/
 
 rem // Official git repository and contact information can be found at
-rem // https://github.com/DHrpcs3/rpcs3 and http://code.google.com/p/rpcs3/.
+rem // https://github.com/DHrpcs3/rpcs3 and http://rpcs3.net/.
 
 setlocal ENABLEDELAYEDEXPANSION
 

rpcs3/Emu/Cell/PPUProgramCompiler.h

@@ -24,10 +24,10 @@ struct Arg
 	ArgType type;
 
 	Arg(const wxString& _string, const u32 _value = 0, const ArgType _type = ARG_ERR)
-		: value(_value)
+		: string(_string.ToStdString())
+		, value(_value)
 		, type(_type)
 	{
-		string =  _string.ToStdString();
 	}
 };
 
@@ -68,19 +68,19 @@ class CompilePPUProgram
 		s32 m_addr;
 
 		Branch(const wxString& name, s32 pos)
-			: m_pos(pos)
+			: m_name(name.ToStdString())
+			, m_pos(pos)
 			, m_id(-1)
 			, m_addr(-1)
 		{
-			m_name = name.ToStdString();
 		}
 
 		Branch(const wxString& name, u32 id, u32 addr)
-			: m_pos(-1)
+			: m_name(name.ToStdString())
+			, m_pos(-1)
 			, m_id(id)
 			, m_addr(addr)
 		{
-			m_name = name.ToStdString();
 		}
 	};
 
@@ -105,9 +105,9 @@ class CompilePPUProgram
 		u32 m_addr;
 
 		SpData(const wxString& data, u32 addr)
-			: m_addr(addr)
+			: m_data(data.ToStdString())
+			, m_addr(addr)
 		{
-			m_data = data.ToStdString();
 		}
 	};
 

rpcs3/Emu/Cell/PPUThread.h

@@ -401,7 +401,7 @@ struct PPCdouble
 		return (u64&)_double;
 	}
 
-	u32 GetZerosCount()
+	u32 GetZerosCount() const
 	{
 		u32 ret;
 		u32 dd = frac >> 32;

rpcs3/Emu/GS/RSXThread.h

@@ -30,7 +30,7 @@ struct RSXVertexData
 	RSXVertexData();
 
 	void Reset();
-	bool IsEnabled() { return size > 0; }
+	bool IsEnabled() const { return size > 0; }
 	void Load(u32 start, u32 count);
 
 	u32 GetTypeSize();
@@ -450,7 +450,6 @@ protected:
 		m_set_scissor_horizontal = false;
 		m_set_scissor_vertical = false;
 		m_set_front_polygon_mode = false;
-		m_clear_surface_mask = 0;
 		m_set_blend_sfactor = false;
 		m_set_blend_dfactor = false;
 		m_set_stencil_mask = false;

rpcs3/Emu/HDD/HDD.h

@@ -235,7 +235,7 @@ public:
 		return 0;
 	}
 
-	u64 GetSize()
+	u64 GetSize() const
 	{
 		return m_info.size;
 	}

rpcs3/Emu/Io/Keyboard.h

@@ -20,7 +20,7 @@ public:
 	CellKbData& GetData(const u32 keyboard) { return m_keyboard_handler->GetData(keyboard); }
 	CellKbConfig& GetConfig(const u32 keyboard) { return m_keyboard_handler->GetConfig(keyboard); }
 
-	bool IsInited() { return m_inited; }
+	bool IsInited() const { return m_inited; }
 
 //private:
 	//DECLARE_EVENT_TABLE();

rpcs3/Emu/Io/Mouse.h

@@ -19,7 +19,7 @@ public:
 	CellMouseData& GetData(const u32 mouse) { return m_mouse_handler->GetData(mouse); }
 	CellMouseRawData& GetRawData(const u32 mouse) { return m_mouse_handler->GetRawData(mouse); }
 
-	bool IsInited() { return m_inited; }
+	bool IsInited() const { return m_inited; }
 
 //private:
 	//DECLARE_EVENT_TABLE();

rpcs3/Emu/Io/Pad.h

@@ -18,7 +18,7 @@ public:
 	PadInfo& GetInfo() { return m_pad_handler->GetInfo(); }
 	Array<Button>& GetButtons(const u32 pad) { return m_pad_handler->GetButtons(pad); }
 
-	bool IsInited() { return m_inited; }
+	bool IsInited() const { return m_inited; }
 
 //private:
 	//DECLARE_EVENT_TABLE();

rpcs3/Emu/SysCalls/Modules/cellL10n.cpp

@@ -23,13 +23,13 @@ enum
 enum
 {
 	L10N_STR_UNKNOWN = (1 << 0),
-	L10N_STR_ASCII = (1 << 1),
+	L10N_STR_ASCII   = (1 << 1),
-	L10N_STR_JIS = (1 << 2),
+	L10N_STR_JIS     = (1 << 2),
-	L10N_STR_EUCJP = (1 << 3),
+	L10N_STR_EUCJP   = (1 << 3),
-	L10N_STR_SJIS = (1 << 4),
+	L10N_STR_SJIS    = (1 << 4),
-	L10N_STR_UTF8 = (1 << 5),
+	L10N_STR_UTF8    = (1 << 5),
 	L10N_STR_ILLEGAL = (1 << 16),
-	L10N_STR_ERROR = (1 << 17),
+	L10N_STR_ERROR   = (1 << 17),
 };
 
 int UTF16stoUTF8s(mem16_ptr_t utf16, mem64_t utf16_len, mem8_ptr_t utf8, mem64_t utf8_len)
@@ -47,9 +47,11 @@ int UTF16stoUTF8s(mem16_ptr_t utf16, mem64_t utf16_len, mem8_ptr_t utf8, mem64_t
 	std::string str = convert.to_bytes(wstr);
 
 	if (!utf8.IsGood() || utf8_len.GetValue() < str.size())
+	{
 		utf8_len = str.size();
 		return DSTExhausted;
-	
+	}
+
 	utf8_len = str.size();
 	Memory.WriteString(utf8, str.c_str());
 #endif

rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp

@@ -198,7 +198,7 @@ int cellSpursGetInfo(mem_ptr_t<CellSpurs> spurs, mem_ptr_t<CellSpursInfo> info)
 int cellSpursGetTasksetId(mem_ptr_t<CellSpursTaskset> taskset, mem32_t workloadId)
 {
 	cellSpurs.Error("cellSpursGetTasksetId(taskset_addr=0x%x, workloadId_addr=0x%x)", taskset.GetAddr(), workloadId.GetAddr());
-	if(!taskset.IsGood() || !taskset.IsGood()) return CELL_SPURS_TASK_ERROR_NULL_POINTER;
+	if(!taskset.IsGood() || !workloadId.IsGood()) return CELL_SPURS_TASK_ERROR_NULL_POINTER;
 
 	return CELL_OK;
 }

rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp

@@ -61,7 +61,7 @@ int sceNpTrophyCreateContext(mem32_t context, mem_ptr_t<SceNpCommunicationId> co
 	if (!context.IsGood())
 		return SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT;
 	if (options & (~(u64)1))
-		SCE_NP_TROPHY_ERROR_NOT_SUPPORTED;
+		return SCE_NP_TROPHY_ERROR_NOT_SUPPORTED;
 	// TODO: There are other possible errors
 
 	// TODO: Is the TROPHY.TRP file necessarily located in this path?

rpcs3/Emu/event.h

@@ -143,7 +143,7 @@ public:
 		return res;
 	}
 
-	u32 count()
+	u32 count() const
 	{
 		return buf_count;
 	}

rpcs3/Loader/ELF.h

@@ -27,7 +27,7 @@ struct Elf_Ehdr
 
 	bool CheckMagic() const { return e_magic == 0x7F454C46; }
 
-	ElfClass GetClass()
+	ElfClass GetClass() const
 	{
 		switch(e_class)
 		{

rpcs3/Loader/Loader.h

@@ -193,11 +193,11 @@ protected:
 public:
 	virtual bool LoadInfo() { return false; }
 	virtual bool LoadData(u64 offset = 0) { return false; }
-	Elf_Machine GetMachine() { return machine; }
+	Elf_Machine GetMachine() const { return machine; }
 
-	u32 GetEntry() { return entry; }
+	u32 GetEntry()   const { return entry; }
-	u32 GetMinAddr() { return min_addr; }
+	u32 GetMinAddr() const { return min_addr; }
-	u32 GetMaxAddr() { return max_addr; }
+	u32 GetMaxAddr() const { return max_addr; }
 };
 
 class Loader : public LoaderBase