Various fixes

Bigpet · Sep 8, 2015 · cbe83ad · cbe83ad
1 parent 4666f19
commit cbe83ad
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Utilities/BEType.h b/Utilities/BEType.h
@@ -557,7 +557,7 @@ template<typename T> class be_t
 
 	be_t(const be_t&) = default;
 
-	template<typename = std::enable_if_t<std::is_constructible<type, type>::value>> be_t(const type& value)
+	force_inline be_t(const type& value)
 #ifdef IS_LE_MACHINE
 		: m_data(se_t<type, sizeof(stype)>::to(value))
 #else
@@ -736,7 +736,7 @@ template<typename T> class le_t
 
 	le_t(const le_t&) = default;
 
-	template<typename = std::enable_if_t<std::is_constructible<type, type>::value>> le_t(const type& value)
+	le_t(const type& value)
 		: m_data(value)
 	{
 	}

diff --git a/rpcs3/Emu/SysCalls/Modules/cellGameExec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGameExec.cpp
@@ -33,7 +33,7 @@ s32 cellGameGetHomeLaunchOptionPath()
 
 s32 cellGameGetBootGameInfo(vm::ptr<u32> type, vm::ptr<char> dirName, vm::ptr<u32> execData)
 {
-	cellGameExec.Todo("cellGameGetBootGameInfo(type=*0x%x, dirName=*0x%x, execData=*0x%x)");
+	cellGameExec.Todo("cellGameGetBootGameInfo(type=*0x%x, dirName=*0x%x, execData=*0x%x)", type, dirName, execData);
 
 	// TODO: Support more boot types
 	*type = CELL_GAME_GAMETYPE_SYS;

diff --git a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp
@@ -34,7 +34,7 @@ void playerBoot(vm::ptr<CellSailPlayer> pSelf, u64 userParam)
 
 s32 cellSailMemAllocatorInitialize(vm::ptr<CellSailMemAllocator> pSelf, vm::ptr<CellSailMemAllocatorFuncs> pCallbacks)
 {
-	cellSail.Warning("cellSailMemAllocatorInitialize(pSelf_addr=*0x%x, pCallbacks_addr=*0x%x)", pSelf, pCallbacks);
+	cellSail.Warning("cellSailMemAllocatorInitialize(pSelf=*0x%x, pCallbacks=*0x%x)", pSelf, pCallbacks);
 
 	pSelf->callbacks = pCallbacks;
 

diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "Utilities/Log.h"
 #include "Utilities/File.h"
-#include "git-version.h"
 #include "rpcs3/Ini.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
@@ -208,8 +207,6 @@ void Emulator::Load()
 		LOG_NOTICE(LOADER, "%s -> %s", GetVFS().m_devices[i]->GetPs3Path().c_str(), GetVFS().m_devices[i]->GetLocalPath().c_str());
 	}
 
-	LOG_NOTICE(LOADER, "");
-	LOG_NOTICE(LOADER, "RPCS3 version: %s", RPCS3_GIT_VERSION);
 	LOG_NOTICE(LOADER, "");
 
 	LOG_NOTICE(LOADER, "Settings:");

diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp
@@ -68,7 +68,7 @@ MainFrame::MainFrame()
 	, m_sys_menu_opened(false)
 {
 
-	SetLabel(wxString::Format(_PRGNAME_ " " RPCS3_GIT_VERSION));
+	SetLabel(wxString::Format(_PRGNAME_ " " _PRGVER_ " " RPCS3_GIT_VERSION));
 
 	wxMenuBar* menubar = new wxMenuBar();
 
@@ -161,6 +161,9 @@ MainFrame::MainFrame()
 
 	wxGetApp().Bind(wxEVT_KEY_DOWN, &MainFrame::OnKeyDown, this);
 	wxGetApp().Bind(wxEVT_DBG_COMMAND, &MainFrame::UpdateUI, this);
+
+	LOG_NOTICE(GENERAL, _PRGNAME_ " " _PRGVER_ " " RPCS3_GIT_VERSION);
+	LOG_NOTICE(GENERAL, "");
 }
 
 MainFrame::~MainFrame()