archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 17:58:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove m_ prefix

Browse source
This commit is contained in:
Vincent Lejeune 2015-10-11 20:47:53 +02:00
parent dd000caad7
commit b5127e68de
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -257,7 +257,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
// NV406E // NV406E
case NV406E_SET_REFERENCE: case NV406E_SET_REFERENCE:
{ {
m_ctrl->ref.exchange(ARGS(0)); ctrl->ref.exchange(ARGS(0));
break; break;
} }
@ -344,8 +344,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
return; return;
} }
std::this_thread::sleep_for(std::chrono::milliseconds((s64)(1000.0 / limit - m_timer_sync.GetElapsedTimeInMilliSec()))); std::this_thread::sleep_for(std::chrono::milliseconds((s64)(1000.0 / limit - timer_sync.GetElapsedTimeInMilliSec())));
m_timer_sync.Start(); timer_sync.Start();
}; };
sync(); sync();
@ -2145,8 +2145,8 @@ void RSXThread::Task()
inc = 1; inc = 1;
const be_t<u32> put = m_ctrl->put; const be_t<u32> put = ctrl->put;
const be_t<u32> get = m_ctrl->get; const be_t<u32> get = ctrl->get;
if (put == get || !Emu.IsRunning()) if (put == get || !Emu.IsRunning())
{ {
@ -2166,7 +2166,7 @@ void RSXThread::Task()
{ {
u32 offs = cmd & 0x1fffffff; u32 offs = cmd & 0x1fffffff;
//LOG_WARNING(RSX, "rsx jump(0x%x) #addr=0x%x, cmd=0x%x, get=0x%x, put=0x%x", offs, m_ioAddress + get, cmd, get, put); //LOG_WARNING(RSX, "rsx jump(0x%x) #addr=0x%x, cmd=0x%x, get=0x%x, put=0x%x", offs, m_ioAddress + get, cmd, get, put);
m_ctrl->get.exchange(offs); ctrl->get.exchange(offs);
continue; continue;
} }
if (cmd & CELL_GCM_METHOD_FLAG_CALL) if (cmd & CELL_GCM_METHOD_FLAG_CALL)
@ -2174,7 +2174,7 @@ void RSXThread::Task()
m_call_stack.push(get + 4); m_call_stack.push(get + 4);
u32 offs = cmd & ~3; u32 offs = cmd & ~3;
//LOG_WARNING(RSX, "rsx call(0x%x) #0x%x - 0x%x", offs, cmd, get); //LOG_WARNING(RSX, "rsx call(0x%x) #0x%x - 0x%x", offs, cmd, get);
m_ctrl->get.exchange(offs); ctrl->get.exchange(offs);
continue; continue;
} }
if (cmd == CELL_GCM_METHOD_FLAG_RETURN) if (cmd == CELL_GCM_METHOD_FLAG_RETURN)
@ -2182,7 +2182,7 @@ void RSXThread::Task()
u32 get = m_call_stack.top(); u32 get = m_call_stack.top();
m_call_stack.pop(); m_call_stack.pop();
//LOG_WARNING(RSX, "rsx return(0x%x)", get); //LOG_WARNING(RSX, "rsx return(0x%x)", get);
m_ctrl->get.exchange(get); ctrl->get.exchange(get);
continue; continue;
} }
if (cmd & CELL_GCM_METHOD_FLAG_NON_INCREMENT) if (cmd & CELL_GCM_METHOD_FLAG_NON_INCREMENT)
@ -2193,7 +2193,7 @@ void RSXThread::Task()
if (cmd == 0) //nop if (cmd == 0) //nop
{ {
m_ctrl->get += 4; ctrl->get += 4;
continue; continue;
} }
@ -2206,17 +2206,17 @@ void RSXThread::Task()
DoCmd(cmd, cmd & 0x3ffff, args.addr(), count); DoCmd(cmd, cmd & 0x3ffff, args.addr(), count);
m_ctrl->get += (count + 1) * 4; ctrl->get += (count + 1) * 4;
} }
onexit_thread(); onexit_thread();
} }
void RSXThread::Init(const u32 ioAddress, const u32 ioSize, const u32 ctrlAddress, const u32 localAddress) void RSXThread::Init(const u32 ioAddress, const u32 io_size, const u32 ctrlAddress, const u32 localAddress)
{ {
m_ctrl = vm::get_ptr<CellGcmControl>(ctrlAddress); ctrl = vm::get_ptr<CellGcmControl>(ctrlAddress);
m_ioAddress = ioAddress; this->ioAddress = ioAddress;
m_ioSize = ioSize; this->ioSize = io_size;
m_ctrlAddress = ctrlAddress; m_ctrlAddress = ctrlAddress;
local_mem_addr = localAddress; local_mem_addr = localAddress;

10
rpcs3/Emu/RSX/RSXThread.h
View file

@ -117,10 +117,11 @@ class RSXThread : protected named_thread_t
{ {
protected: protected:
std::stack<u32> m_call_stack; std::stack<u32> m_call_stack;
CellGcmControl* m_ctrl;
Timer m_timer_sync;
public: public:
CellGcmControl* ctrl = nullptr;
Timer timer_sync;
GcmTileInfo tiles[rsx::limits::tiles_count]; GcmTileInfo tiles[rsx::limits::tiles_count];
GcmZcullInfo zculls[rsx::limits::zculls_count]; GcmZcullInfo zculls[rsx::limits::zculls_count];
rsx::texture textures[rsx::limits::textures_count]; rsx::texture textures[rsx::limits::textures_count];
@ -138,7 +139,7 @@ public:
RSXVertexProgram* m_cur_vertex_prog; RSXVertexProgram* m_cur_vertex_prog;
public: public:
u32 m_ioAddress, m_ioSize, m_ctrlAddress; u32 ioAddress, ioSize, m_ctrlAddress;
int flip_status; int flip_status;
int flip_mode; int flip_mode;
int debug_level; int debug_level;
@ -332,8 +333,7 @@ public:
protected: protected:
RSXThread() RSXThread()
: m_ctrl(nullptr) : m_shader_ctrl(0x40)
, m_shader_ctrl(0x40)
, flip_status(0) , flip_status(0)
, flip_mode(CELL_GCM_DISPLAY_VSYNC) , flip_mode(CELL_GCM_DISPLAY_VSYNC)
, debug_level(CELL_GCM_DEBUG_LEVEL0) , debug_level(CELL_GCM_DEBUG_LEVEL0)

2
rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
View file

@ -968,7 +968,7 @@ s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr<u32> offset)
return CELL_GCM_ERROR_NO_IO_PAGE_TABLE; return CELL_GCM_ERROR_NO_IO_PAGE_TABLE;
} }
Emu.GetGSManager().GetRender().main_mem_addr = Emu.GetGSManager().GetRender().m_ioAddress; Emu.GetGSManager().GetRender().main_mem_addr = Emu.GetGSManager().GetRender().ioAddress;
return CELL_OK; return CELL_OK;
} }