fixed_typemap.hpp: return reference

RPCS3 · Mar 2, 2021 · ea5e837 · ea5e837
1 parent bbf52f3
commit ea5e837
Show file tree

Hide file tree

Showing 87 changed files with 3,029 additions and 2,998 deletions.
diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp
@@ -1423,13 +1423,13 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no
 		vm::temporary_unlock(*cpu);
 		u32 pf_port_id = 0;
 
-		if (auto pf_entries = g_fxo->get<page_fault_notification_entries>(); true)
+		if (auto& pf_entries = g_fxo->get<page_fault_notification_entries>(); true)
 		{
 			if (auto mem = vm::get(vm::any, addr))
 			{
-				reader_lock lock(pf_entries->mutex);
+				reader_lock lock(pf_entries.mutex);
 
-				for (const auto& entry : pf_entries->entries)
+				for (const auto& entry : pf_entries.entries)
 				{
 					if (entry.start_addr == mem->addr)
 					{
@@ -1489,10 +1489,10 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no
 			// Now, place the page fault event onto table so that other functions [sys_mmapper_free_address and pagefault recovery funcs etc]
 			// know that this thread is page faulted and where.
 
-			auto pf_events = g_fxo->get<page_fault_event_entries>();
+			auto& pf_events = g_fxo->get<page_fault_event_entries>();
 			{
-				std::lock_guard pf_lock(pf_events->pf_mutex);
-				pf_events->events.emplace(cpu, addr);
+				std::lock_guard pf_lock(pf_events.pf_mutex);
+				pf_events.events.emplace(cpu, addr);
 			}
 
 			sig_log.warning("Page_fault %s location 0x%x because of %s memory", is_writing ? "writing" : "reading",

diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp
@@ -444,14 +444,14 @@ void cpu_thread::operator()()
 	{
 	case 1:
 	{
-		//g_fxo->get<cpu_profiler>()->registered.push(id);
+		//g_fxo->get<cpu_profiler>().registered.push(id);
 		break;
 	}
 	case 2:
 	{
 		if (g_cfg.core.spu_prof)
 		{
-			g_fxo->get<cpu_profiler>()->registered.push(id);
+			g_fxo->get<cpu_profiler>().registered.push(id);
 		}
 
 		break;
@@ -763,7 +763,7 @@ bool cpu_thread::check_state() noexcept
 		{
 			if (state0 & cpu_flag::dbg_pause)
 			{
-				g_fxo->get<gdb_server>()->pause_from(this);
+				g_fxo->get<gdb_server>().pause_from(this);
 			}
 
 			cpu_wait(state1);
@@ -1159,6 +1159,6 @@ void cpu_thread::flush_profilers() noexcept
 
 	if (g_cfg.core.spu_prof || false)
 	{
-		g_fxo->get<cpu_profiler>()->registered.push(0);
+		g_fxo->get<cpu_profiler>().registered.push(0);
 	}
 }