diff --git a/rpcs3/Emu/GS/GCM.h b/rpcs3/Emu/GS/GCM.h index 386c86b644..af6d412e96 100644 --- a/rpcs3/Emu/GS/GCM.h +++ b/rpcs3/Emu/GS/GCM.h @@ -190,8 +190,13 @@ enum // GPU Class Handles enum { - CELL_GCM_CONTEXT_SURFACE2D = 0x313371C3, - CELL_GCM_CONTEXT_SWIZZLE2D = 0x31337A73, + CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER = 0xFEED0000, // Local memory + CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER = 0xFEED0001, // Main memory + CELL_GCM_CONTEXT_SURFACE2D = 0x313371C3, + CELL_GCM_CONTEXT_SWIZZLE2D = 0x31337A73, + CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT = 0x66626660, + CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN = 0xBAD68000, + CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0 = 0x6660420F, }; struct CellGcmControl @@ -555,7 +560,6 @@ enum NV4097_SET_VERTEX_ATTRIB_INPUT_MASK = 0x00001ff0, NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK = 0x00001ff4, NV4097_SET_TRANSFORM_BRANCH_BITS = 0x00001ff8, - NV4097_SET_FLIP = 0x0003fead, // NV03_MEMORY_TO_MEMORY_FORMAT (NV0039) NV0039_SET_OBJECT = 0x00002000, @@ -1326,7 +1330,17 @@ static const std::string GetMethodName(const u32 id) { NV4097_SET_TRANSFORM_TIMEOUT , "NV4097_SET_TRANSFORM_TIMEOUT" }, { NV4097_SET_TRANSFORM_CONSTANT_LOAD , "NV4097_SET_TRANSFORM_CONSTANT_LOAD" }, { NV4097_SET_FREQUENCY_DIVIDER_OPERATION , "NV4097_SET_FREQUENCY_DIVIDER_OPERATION" }, - { NV4097_INVALIDATE_L2 , "NV4097_INVALIDATE_L2" }, + { NV4097_SET_ATTRIB_COLOR, "NV4097_SET_ATTRIB_COLOR" }, + { NV4097_SET_ATTRIB_TEX_COORD, "NV4097_SET_ATTRIB_TEX_COORD" }, + { NV4097_SET_ATTRIB_TEX_COORD_EX, "NV4097_SET_ATTRIB_TEX_COORD_EX" }, + { NV4097_SET_ATTRIB_UCLIP0, "NV4097_SET_ATTRIB_UCLIP0" }, + { NV4097_SET_ATTRIB_UCLIP1, "NV4097_SET_ATTRIB_UCLIP1" }, + { NV4097_INVALIDATE_L2, "NV4097_INVALIDATE_L2" }, + { NV4097_SET_REDUCE_DST_COLOR, "NV4097_SET_REDUCE_DST_COLOR" }, + { NV4097_SET_NO_PARANOID_TEXTURE_FETCHES, "NV4097_SET_NO_PARANOID_TEXTURE_FETCHES" }, + { NV4097_SET_SHADER_PACKER, "NV4097_SET_SHADER_PACKER" }, + { NV4097_SET_VERTEX_ATTRIB_INPUT_MASK, "NV4097_SET_VERTEX_ATTRIB_INPUT_MASK" }, + { NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK, "NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK" }, { NV4097_SET_TRANSFORM_BRANCH_BITS, "NV4097_SET_TRANSFORM_BRANCH_BITS" } }; diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp index 34d5f43399..99322ba4da 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.cpp +++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp @@ -15,11 +15,7 @@ #endif gcmBuffer gcmBuffers[8]; -GLuint g_flip_tex; -GLuint g_depth_tex; -GLuint g_pbo[6]; - - +GLuint g_flip_tex, g_depth_tex, g_pbo[6]; int last_width = 0, last_height = 0, last_depth_format = 0; GLenum g_last_gl_error = GL_NO_ERROR; @@ -40,7 +36,6 @@ void printGlError(GLenum err, const std::string& situation) #define checkForGlError(x) /*x*/ #endif - GLGSRender::GLGSRender() : GSRender() , m_frame(nullptr) @@ -303,6 +298,7 @@ void GLGSRender::InitVertexData() l = m_program.GetLocation("scaleOffsetMat"); glUniformMatrix4fv(l, 1, false, scaleOffsetMat); + checkForGlError("glUniformMatrix4fv"); } void GLGSRender::InitFragmentData() @@ -319,7 +315,7 @@ void GLGSRender::InitFragmentData() u32 id = c.id - m_cur_shader_prog->offset; - //ConLog.Warning("fc%u[0x%x - 0x%x] = (%f, %f, %f, %f)", id, c.id, m_cur_shader_prog->offset, c.x, c.y, c.z, c.w); + //LOG_WARNING(RSX,"fc%u[0x%x - 0x%x] = (%f, %f, %f, %f)", id, c.id, m_cur_shader_prog->offset, c.x, c.y, c.z, c.w); const std::string name = fmt::Format("fc%u", id); const int l = m_program.GetLocation(name); @@ -464,28 +460,31 @@ void GLGSRender::WriteDepthBuffer() u32 address = GetAddress(m_surface_offset_z, m_context_dma_z - 0xfeed0000); if (!Memory.IsGoodAddr(address)) { - LOG_WARNING(RSX, "Bad depth address: address=0x%x, offset=0x%x, dma=0x%x", address, m_surface_offset_z, m_context_dma_z); + LOG_WARNING(RSX, "Bad depth buffer address: address=0x%x, offset=0x%x, dma=0x%x", address, m_surface_offset_z, m_context_dma_z); return; } glBindBuffer(GL_PIXEL_PACK_BUFFER, g_pbo[5]); + checkForGlError("WriteDepthBuffer(): glBindBuffer"); glBufferData(GL_PIXEL_PACK_BUFFER, RSXThread::m_buffer_width * RSXThread::m_buffer_height * 4, 0, GL_DYNAMIC_READ); + checkForGlError("WriteDepthBuffer(): glBufferData"); glReadPixels(0, 0, RSXThread::m_buffer_width, RSXThread::m_buffer_height, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 0); - checkForGlError("WriteDepthBuffer(): glReadPixels(GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE)"); + checkForGlError("WriteDepthBuffer(): glReadPixels"); GLubyte *packed = (GLubyte *)glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY); if (packed) { memcpy(&Memory[address], packed, RSXThread::m_buffer_width * RSXThread::m_buffer_height * 4); glUnmapBuffer(GL_PIXEL_PACK_BUFFER); + checkForGlError("WriteDepthBuffer(): glUnmapBuffer"); } glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); + checkForGlError("WriteDepthBuffer(): glBindBuffer"); glBindTexture(GL_TEXTURE_2D, g_depth_tex); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, RSXThread::m_buffer_width, RSXThread::m_buffer_height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, &Memory[address]); - checkForGlError("glTexImage2D"); + checkForGlError("WriteDepthBuffer(): glTexImage2D"); glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &Memory[address]); - checkForGlError("glGetTexImage"); - + checkForGlError("WriteDepthBuffer(): glGetTexImage"); } void GLGSRender::WriteColorBufferA() @@ -498,23 +497,27 @@ void GLGSRender::WriteColorBufferA() u32 address = GetAddress(m_surface_offset_a, m_context_dma_color_a - 0xfeed0000); if (!Memory.IsGoodAddr(address)) { - LOG_WARNING(RSX, "Bad color buffer a address: address=0x%x, offset=0x%x, dma=0x%x", address, m_surface_offset_a, m_context_dma_color_a); + LOG_ERROR(RSX, "Bad color buffer A address: address=0x%x, offset=0x%x, dma=0x%x", address, m_surface_offset_a, m_context_dma_color_a); return; } glReadBuffer(GL_COLOR_ATTACHMENT0); checkForGlError("WriteColorBufferA(): glReadBuffer(GL_COLOR_ATTACHMENT0)"); glBindBuffer(GL_PIXEL_PACK_BUFFER, g_pbo[0]); + checkForGlError("WriteColorBufferA(): glBindBuffer"); glBufferData(GL_PIXEL_PACK_BUFFER, RSXThread::m_buffer_width * RSXThread::m_buffer_height * 4, 0, GL_STREAM_READ); + checkForGlError("WriteColorBufferA(): glBufferData"); glReadPixels(0, 0, RSXThread::m_buffer_width, RSXThread::m_buffer_height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, 0); - checkForGlError("WriteColorBufferA(): glReadPixels(GL_BGRA, GL_UNSIGNED_INT_8_8_8_8)"); + checkForGlError("WriteColorBufferA(): glReadPixels"); GLubyte *packed = (GLubyte *)glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY); if (packed) { memcpy(&Memory[address], packed, RSXThread::m_buffer_width * RSXThread::m_buffer_height * 4); glUnmapBuffer(GL_PIXEL_PACK_BUFFER); + checkForGlError("WriteColorBufferA(): glUnmapBuffer"); } glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); + checkForGlError("WriteColorBufferA(): glBindBuffer"); } void GLGSRender::WriteColorBufferB() @@ -527,23 +530,27 @@ void GLGSRender::WriteColorBufferB() u32 address = GetAddress(m_surface_offset_b, m_context_dma_color_b - 0xfeed0000); if (!Memory.IsGoodAddr(address)) { - LOG_WARNING(RSX, "Bad color buffer b address: address=0x%x, offset=0x%x, dma=0x%x", address, m_surface_offset_b, m_context_dma_color_b); + LOG_ERROR(RSX, "Bad color buffer B address: address=0x%x, offset=0x%x, dma=0x%x", address, m_surface_offset_b, m_context_dma_color_b); return; } glReadBuffer(GL_COLOR_ATTACHMENT1); checkForGlError("WriteColorBufferB(): glReadBuffer(GL_COLOR_ATTACHMENT1)"); glBindBuffer(GL_PIXEL_PACK_BUFFER, g_pbo[1]); + checkForGlError("WriteColorBufferB(): glBindBuffer"); glBufferData(GL_PIXEL_PACK_BUFFER, RSXThread::m_buffer_width * RSXThread::m_buffer_height * 4, 0, GL_STREAM_READ); + checkForGlError("WriteColorBufferB(): glBufferData"); glReadPixels(0, 0, RSXThread::m_buffer_width, RSXThread::m_buffer_height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, 0); - checkForGlError("WriteColorBufferB(): glReadPixels(GL_BGRA, GL_UNSIGNED_INT_8_8_8_8)"); + checkForGlError("WriteColorBufferB(): glReadPixels"); GLubyte *packed = (GLubyte *)glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY); if (packed) { memcpy(&Memory[address], packed, RSXThread::m_buffer_width * RSXThread::m_buffer_height * 4); glUnmapBuffer(GL_PIXEL_PACK_BUFFER); + checkForGlError("WriteColorBufferB(): glUnmapBuffer"); } glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); + checkForGlError("WriteColorBufferB(): glBindBuffer"); } @@ -557,23 +564,27 @@ void GLGSRender::WriteColorBufferC() u32 address = GetAddress(m_surface_offset_c, m_context_dma_color_c - 0xfeed0000); if (!Memory.IsGoodAddr(address)) { - LOG_WARNING(RSX, "Bad color buffer c address: address=0x%x, offset=0x%x, dma=0x%x", address, m_surface_offset_c, m_context_dma_color_c); + LOG_ERROR(RSX, "Bad color buffer C address: address=0x%x, offset=0x%x, dma=0x%x", address, m_surface_offset_c, m_context_dma_color_c); return; } glReadBuffer(GL_COLOR_ATTACHMENT2); checkForGlError("WriteColorBufferC(): glReadBuffer(GL_COLOR_ATTACHMENT2)"); glBindBuffer(GL_PIXEL_PACK_BUFFER, g_pbo[2]); + checkForGlError("WriteColorBufferC(): glBindBuffer"); glBufferData(GL_PIXEL_PACK_BUFFER, RSXThread::m_buffer_width * RSXThread::m_buffer_height * 4, 0, GL_STREAM_READ); + checkForGlError("WriteColorBufferC(): glBufferData"); glReadPixels(0, 0, RSXThread::m_buffer_width, RSXThread::m_buffer_height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, 0); - checkForGlError("WriteColorBufferC(): glReadPixels(GL_BGRA, GL_UNSIGNED_INT_8_8_8_8)"); + checkForGlError("WriteColorBufferC(): glReadPixels"); GLubyte *packed = (GLubyte *)glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY); if (packed) { memcpy(&Memory[address], packed, RSXThread::m_buffer_width * RSXThread::m_buffer_height * 4); glUnmapBuffer(GL_PIXEL_PACK_BUFFER); + checkForGlError("WriteColorBufferC(): glUnmapBuffer"); } glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); + checkForGlError("WriteColorBufferC(): glBindBuffer"); } void GLGSRender::WriteColorBufferD() @@ -586,24 +597,28 @@ void GLGSRender::WriteColorBufferD() u32 address = GetAddress(m_surface_offset_d, m_context_dma_color_d - 0xfeed0000); if (!Memory.IsGoodAddr(address)) { - LOG_WARNING(RSX, "Bad color buffer d address: address=0x%x, offset=0x%x, dma=0x%x", address, m_surface_offset_d, m_context_dma_color_d); + LOG_ERROR(RSX, "Bad color buffer D address: address=0x%x, offset=0x%x, dma=0x%x", address, m_surface_offset_d, m_context_dma_color_d); return; } glReadBuffer(GL_COLOR_ATTACHMENT3); checkForGlError("WriteColorBufferD(): glReadBuffer(GL_COLOR_ATTACHMENT3)"); glBindBuffer(GL_PIXEL_PACK_BUFFER, g_pbo[3]); + checkForGlError("WriteColorBufferD(): glBindBuffer"); glBufferData(GL_PIXEL_PACK_BUFFER, RSXThread::m_buffer_width * RSXThread::m_buffer_height * 4, 0, GL_STREAM_READ); + checkForGlError("WriteColorBufferD(): glBufferData"); glReadPixels(0, 0, RSXThread::m_buffer_width, RSXThread::m_buffer_height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, 0); - checkForGlError("WriteColorBufferD(): glReadPixels(GL_BGRA, GL_UNSIGNED_INT_8_8_8_8)"); + checkForGlError("WriteColorBufferD(): glReadPixels"); GLubyte *packed = (GLubyte *)glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY); if (packed) { memcpy(&Memory[address], packed, RSXThread::m_buffer_width * RSXThread::m_buffer_height * 4); glUnmapBuffer(GL_PIXEL_PACK_BUFFER); + checkForGlError("WriteColorBufferD(): glUnmapBuffer"); + } glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); - + checkForGlError("WriteColorBufferD(): glBindBuffer"); } void GLGSRender::WriteColorBuffers() @@ -670,6 +685,7 @@ void GLGSRender::OnInitThread() glEnable(GL_TEXTURE_2D); glEnable(GL_VERTEX_PROGRAM_POINT_SIZE); + glGenTextures(1, &g_depth_tex); glGenTextures(1, &g_flip_tex); glGenBuffers(6, g_pbo); @@ -691,6 +707,9 @@ void GLGSRender::OnExitThread() glDeleteTextures(1, &g_depth_tex); glDeleteBuffers(6, g_pbo); + glDisable(GL_TEXTURE_2D); + glDisable(GL_VERTEX_PROGRAM_POINT_SIZE); + m_program.Delete(); m_rbo.Delete(); m_fbo.Delete(); @@ -824,6 +843,8 @@ void GLGSRender::InitDrawBuffers() glDrawBuffers(4, draw_buffers); break; + checkForGlError("glDrawBuffers"); + default: LOG_ERROR(RSX, "Bad surface color target: %d", m_surface_color_target); break; @@ -853,6 +874,7 @@ void GLGSRender::ExecCMD(u32 cmd) if (m_clear_surface_mask & 0x1) { glClearDepth(m_clear_surface_z / (float)0xffffff); + checkForGlError("glClearDepth"); f |= GL_DEPTH_BUFFER_BIT; } @@ -860,6 +882,7 @@ void GLGSRender::ExecCMD(u32 cmd) if (m_clear_surface_mask & 0x2) { glClearStencil(m_clear_surface_s); + checkForGlError("glClearStencil"); f |= GL_STENCIL_BUFFER_BIT; } @@ -871,11 +894,13 @@ void GLGSRender::ExecCMD(u32 cmd) m_clear_surface_color_g / 255.0f, m_clear_surface_color_b / 255.0f, m_clear_surface_color_a / 255.0f); + checkForGlError("glClearColor"); f |= GL_COLOR_BUFFER_BIT; } glClear(f); + checkForGlError("glClear"); WriteBuffers(); } @@ -892,10 +917,17 @@ void GLGSRender::ExecCMD() InitDrawBuffers(); + if (m_set_color_mask) + { + glColorMask(m_color_mask_r, m_color_mask_g, m_color_mask_b, m_color_mask_a); + checkForGlError("glColorMask"); + } + Enable(m_set_depth_test, GL_DEPTH_TEST); Enable(m_set_alpha_test, GL_ALPHA_TEST); Enable(m_set_depth_bounds_test, GL_DEPTH_BOUNDS_TEST_EXT); Enable(m_set_blend || m_set_blend_mrt1 || m_set_blend_mrt2 || m_set_blend_mrt3, GL_BLEND); + Enable(m_set_scissor_horizontal && m_set_scissor_vertical, GL_SCISSOR_TEST); Enable(m_set_logic_op, GL_LOGIC_OP); Enable(m_set_cull_face, GL_CULL_FACE); Enable(m_set_dither, GL_DITHER); @@ -955,6 +987,12 @@ void GLGSRender::ExecCMD() checkForGlError("glLogicOp"); } + if (m_set_scissor_horizontal && m_set_scissor_vertical) + { + glScissor(m_scissor_x, m_scissor_y, m_scissor_w, m_scissor_h); + checkForGlError("glScissor"); + } + if(m_set_two_sided_stencil_test_enable) { if(m_set_stencil_fail && m_set_stencil_zfail && m_set_stencil_zpass) @@ -1173,7 +1211,7 @@ void GLGSRender::ExecCMD() if(m_draw_array_count) { - //ConLog.Warning("glDrawArrays(%d,%d,%d)", m_draw_mode - 1, m_draw_array_first, m_draw_array_count); + //LOG_WARNING(RSX,"glDrawArrays(%d,%d,%d)", m_draw_mode - 1, m_draw_array_first, m_draw_array_count); glDrawArrays(m_draw_mode - 1, 0, m_draw_array_count); checkForGlError("glDrawArrays"); DisableVertexData(); diff --git a/rpcs3/Emu/GS/GL/GLProgramBuffer.cpp b/rpcs3/Emu/GS/GL/GLProgramBuffer.cpp index 87aacb94db..59eb82d573 100644 --- a/rpcs3/Emu/GS/GL/GLProgramBuffer.cpp +++ b/rpcs3/Emu/GS/GL/GLProgramBuffer.cpp @@ -117,9 +117,11 @@ void GLProgramBuffer::Clear() { for(u32 i=0; i> 31); CMD_LOG("num=%d, addr=0x%x", index, addr); @@ -459,7 +425,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 } break; - case_16(NV4097_SET_VERTEX_DATA_ARRAY_FORMAT, 4) : + case_16(NV4097_SET_VERTEX_DATA_ARRAY_FORMAT, 4): { const u32 a0 = ARGS(0); u16 frequency = a0 >> 16; @@ -632,7 +598,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 case NV4097_SET_REDUCE_DST_COLOR: { if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_SET_REDUCE_DST_COLOR: 0x % x", ARGS(0)); + LOG_WARNING(RSX, "NV4097_SET_REDUCE_DST_COLOR: 0x%x", ARGS(0)); } break; @@ -714,8 +680,12 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 case NV4097_SET_CLIP_MAX: { - if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_SET_CLIP_MAX: %x", ARGS(0)); + const u32 a0 = ARGS(0); + + m_set_clip = true; + m_clip_max = (float&)a0; + + CMD_LOG("clip_max=%.01f", m_clip_max); } break; @@ -845,13 +815,6 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 } break; - case NV4097_CLEAR_REPORT_VALUE: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_CLEAR_REPORT_VALUE: %x", ARGS(0)); - } - break; - case NV4097_SET_CLEAR_RECT_HORIZONTAL: { if (ARGS(0)) @@ -1527,11 +1490,14 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 // Anti-aliasing case NV4097_SET_ANTI_ALIASING_CONTROL: { - // TODO: - // (cmd)[1] = CELL_GCM_ENDIAN_SWAP((enable) | ((alphaToCoverage) << 4) | ((alphaToOne) << 8) | ((sampleMask) << 16)); \ + const u32 a0 = ARGS(0); - if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_SET_ANTI_ALIASING_CONTROL: %x", ARGS(0)); + const u8 enable = a0 & 0xf; + const u8 alphaToCoverage = (a0 >> 4) & 0xf; + const u8 alphaToOne = (a0 >> 8) & 0xf; + const u16 sampleMask = a0 >> 16; + + LOG_WARNING(RSX, "TODO: NV4097_SET_ANTI_ALIASING_CONTROL: %x", a0); } break; @@ -1626,13 +1592,13 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 break; case NV4097_ZCULL_SYNC: - { + { if (ARGS(0)) LOG_WARNING(RSX, "NV4097_ZCULL_SYNC: %x", ARGS(0)); } break; - // Reporting + // Reports case NV4097_GET_REPORT: { const u32 a0 = ARGS(0); @@ -1667,6 +1633,24 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 } break; + case NV4097_CLEAR_REPORT_VALUE: + { + const u32 type = ARGS(0); + + switch(type) + { + case CELL_GCM_ZPASS_PIXEL_CNT: + LOG_WARNING(RSX, "TODO: NV4097_CLEAR_REPORT_VALUE: ZPASS_PIXEL_CNT"); + break; + case CELL_GCM_ZCULL_STATS: + LOG_WARNING(RSX, "TODO: NV4097_CLEAR_REPORT_VALUE: ZCULL_STATS"); + break; + default: + LOG_ERROR(RSX, "NV4097_CLEAR_REPORT_VALUE: Bad type: %d", type); + } + } + break; + // Clip Plane case NV4097_SET_USER_CLIP_PLANE_CONTROL: { @@ -1702,40 +1686,20 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 // Zmin_max case NV4097_SET_ZMIN_MAX_CONTROL: { - if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_SET_ZMIN_MAX_CONTROL: %x", ARGS(0)); - - // TODO: - // (cmd)[1] = CELL_GCM_ENDIAN_SWAP((cullNearFarEnable) | ((zclampEnable) << 4) | ((cullIgnoreW)<<8)); + const u8 cullNearFarEnable = ARGS(0) & 0xf; + const u8 zclampEnable = (ARGS(0) >> 4) & 0xf; + const u8 cullIgnoreW = (ARGS(0) >> 8) & 0xf; + LOG_WARNING(RSX, "TODO: NV4097_SET_ZMIN_MAX_CONTROL: cullNearFarEnable=%d, zclampEnable=%d, cullIgnoreW=%d", + cullNearFarEnable, zclampEnable, cullIgnoreW); } break; // Windows Clipping case NV4097_SET_WINDOW_OFFSET: { - if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_SET_WINDOW_OFFSET: %x", ARGS(0)); - } - break; - - case NV4097_SET_WINDOW_CLIP_TYPE: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_SET_WINDOW_CLIP_TYPE: %x", ARGS(0)); - } - break; - - case NV4097_SET_WINDOW_CLIP_HORIZONTAL: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_SET_WINDOW_CLIP_HORIZONTAL: %x", ARGS(0)); - } - break; - - case NV4097_SET_WINDOW_CLIP_VERTICAL: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_SET_WINDOW_CLIP_VERTICAL: %x", ARGS(0)); + const u16 x = ARGS(0); + const u16 y = ARGS(0) >> 16; + LOG_WARNING(RSX, "TODO: NV4097_SET_WINDOW_OFFSET: x=%d, y=%d", x, y); } break; @@ -1747,68 +1711,30 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 case NV4097_SET_RENDER_ENABLE: { - // TODO: - // (cmd)[1] = CELL_GCM_ENDIAN_SWAP((offset) | ((mode) << 24)); \ - - if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_SET_RENDER_ENABLE: %x", ARGS(0)); + const u32 offset = ARGS(0) & 0xffffff; + const u8 mode = ARGS(0) >> 24; + LOG_WARNING(RSX, "NV4097_SET_RENDER_ENABLE: Offset=%06x, Mode=%x", offset, mode); } break; case NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE: { - if (ARGS(0)) - LOG_WARNING(RSX, "NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE: %x", ARGS(0)); + const u32 enable = ARGS(0); + LOG_WARNING(RSX, "TODO: NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE: %d", enable); } break; - case 0x000002c8: - case 0x000002d0: - case 0x000002d8: - case 0x000002e0: - case 0x000002e8: - case 0x000002f0: - case 0x000002f8: - break; - // NV0039 - case NV0039_SET_OBJECT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV0039_SET_OBJECT: %x", ARGS(0)); - } - break; - - case NV0039_SET_CONTEXT_DMA_NOTIFIES: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV0039_SET_CONTEXT_DMA_NOTIFIES: %x", ARGS(0)); - } - break; - - case NV0039_SET_CONTEXT_DMA_BUFFER_IN: // [E : RSXThread]: TODO: unknown/illegal method [0x00002184](0xfeed0000, 0xfeed0000) + case NV0039_SET_CONTEXT_DMA_BUFFER_IN: { const u32 srcContext = ARGS(0); const u32 dstContext = ARGS(1); - - if (srcContext == 0xfeed0000 && dstContext == 0xfeed0000) - { - } - else - { - LOG_WARNING(RSX, "NV0039_SET_CONTEXT_DMA_BUFFER_IN: TODO: srcContext=0x%x, dstContext=0x%x", srcContext, dstContext); - } + m_context_dma_buffer_in_src = srcContext; + m_context_dma_buffer_in_dst = dstContext; } break; - case NV0039_SET_CONTEXT_DMA_BUFFER_OUT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV0039_SET_CONTEXT_DMA_BUFFER_OUT: %x", ARGS(0)); - } - break; - - case NV0039_OFFSET_IN: // [E : RSXThread]: TODO: unknown/illegal method [0x0000230c](0x0, 0xb00400, 0x0, 0x0, 0x384000, 0x1, 0x101, 0x0) + case NV0039_OFFSET_IN: { const u32 inOffset = ARGS(0); const u32 outOffset = ARGS(1); @@ -1816,12 +1742,16 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 const u32 outPitch = ARGS(3); const u32 lineLength = ARGS(4); const u32 lineCount = ARGS(5); - const u32 format = ARGS(6); - const u8 outFormat = (format >> 8); - const u8 inFormat = (format >> 0); + const u8 outFormat = (ARGS(6) >> 8); + const u8 inFormat = (ARGS(6) >> 0); const u32 notify = ARGS(7); - if (lineCount == 1 && !inPitch && !outPitch && !notify && format == 0x101) + // The existing GCM commands use only the value 0x1 for inFormat and outFormat + if (inFormat != 0x01 || outFormat != 0x01) { + LOG_ERROR(RSX, "NV0039_OFFSET_IN: Unsupported format: inFormat=%d, outFormat=%d", inFormat, outFormat); + } + + if (lineCount == 1 && !inPitch && !outPitch && !notify) { memcpy(&Memory[GetAddress(outOffset, 0)], &Memory[GetAddress(inOffset, 0)], lineLength); } @@ -1854,34 +1784,6 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 } break; - case NV0039_PITCH_OUT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV0039_PITCH_OUT: %x", ARGS(0)); - } - break; - - case NV0039_LINE_LENGTH_IN: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV0039_LINE_LENGTH_IN: %x", ARGS(0)); - } - break; - - case NV0039_LINE_COUNT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV0039_LINE_COUNT: %x", ARGS(0)); - } - break; - - case NV0039_FORMAT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV0039_FORMAT: %x", ARGS(0)); - } - break; - case NV0039_BUFFER_NOTIFY: { if (ARGS(0)) @@ -1890,33 +1792,18 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 break; // NV3062 - case NV3062_SET_OBJECT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3062_SET_OBJECT: %x", ARGS(0)); - } - break; - - case NV3062_SET_CONTEXT_DMA_NOTIFIES: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3062_SET_CONTEXT_DMA_NOTIFIES: %x", ARGS(0)); - } - break; - - case NV3062_SET_CONTEXT_DMA_IMAGE_SOURCE: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3062_SET_CONTEXT_DMA_IMAGE_SOURCE: %x", ARGS(0)); - } - break; - case NV3062_SET_CONTEXT_DMA_IMAGE_DESTIN: { m_context_dma_img_dst = ARGS(0); } break; + case NV3062_SET_OFFSET_DESTIN: + { + m_dst_offset = ARGS(0); + } + break; + case NV3062_SET_COLOR_FORMAT: { m_color_format = ARGS(0); @@ -1925,41 +1812,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 } break; - case NV3062_SET_PITCH: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3062_SET_PITCH: %x", ARGS(0)); - } - break; - - case NV3062_SET_OFFSET_SOURCE: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3062_SET_OFFSET_SOURCE: %x", ARGS(0)); - } - break; - - case NV3062_SET_OFFSET_DESTIN: - { - m_dst_offset = ARGS(0); - } - break; - // NV309E - case NV309E_SET_OBJECT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV309E_SET_OBJECT: %x", ARGS(0)); - } - break; - - case NV309E_SET_CONTEXT_DMA_NOTIFIES: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV309E_SET_CONTEXT_DMA_NOTIFIES: %x", ARGS(0)); - } - break; - case NV309E_SET_CONTEXT_DMA_IMAGE: { if (ARGS(0)) @@ -1977,98 +1830,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 } break; - case NV309E_SET_OFFSET: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV309E_SET_OFFSET: %x", ARGS(0)); - } - break; - // NV308A - case NV308A_SET_OBJECT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_OBJECT: %x", ARGS(0)); - } - break; - - case NV308A_SET_CONTEXT_DMA_NOTIFIES: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_CONTEXT_DMA_NOTIFIES: %x", ARGS(0)); - } - break; - - case NV308A_SET_CONTEXT_COLOR_KEY: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_CONTEXT_COLOR_KEY: %x", ARGS(0)); - } - break; - - case NV308A_SET_CONTEXT_CLIP_RECTANGLE: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_CONTEXT_CLIP_RECTANGLE: %x", ARGS(0)); - } - break; - - case NV308A_SET_CONTEXT_PATTERN: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_CONTEXT_PATTERN: %x", ARGS(0)); - } - break; - - case NV308A_SET_CONTEXT_ROP: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_CONTEXT_ROP: %x", ARGS(0)); - } - break; - - case NV308A_SET_CONTEXT_BETA1: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_CONTEXT_BETA1: %x", ARGS(0)); - } - break; - - case NV308A_SET_CONTEXT_BETA4: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_CONTEXT_BETA4: %x", ARGS(0)); - } - break; - - case NV308A_SET_CONTEXT_SURFACE: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_CONTEXT_SURFACE: %x", ARGS(0)); - } - break; - - case NV308A_SET_COLOR_CONVERSION: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_COLOR_CONVERSION: %x", ARGS(0)); - } - break; - - case NV308A_SET_OPERATION: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_OPERATION: %x", ARGS(0)); - } - break; - - case NV308A_SET_COLOR_FORMAT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SET_COLOR_FORMAT: %x", ARGS(0)); - } - break; - case NV308A_POINT: { const u32 a0 = ARGS(0); @@ -2077,20 +1839,6 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 } break; - case NV308A_SIZE_OUT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SIZE_OUT: %x", ARGS(0)); - } - break; - - case NV308A_SIZE_IN: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV308A_SIZE_IN: %x", ARGS(0)); - } - break; - case NV308A_COLOR: { RSXTransformConstant c; @@ -2135,54 +1883,12 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 break; // NV3089 - case NV3089_SET_OBJECT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_SET_OBJECT: %x", ARGS(0)); - } - break; - - case NV3089_SET_CONTEXT_DMA_NOTIFIES: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_SET_CONTEXT_DMA_NOTIFIES: %x", ARGS(0)); - } - break; - case NV3089_SET_CONTEXT_DMA_IMAGE: { m_context_dma_img_src = ARGS(0); } break; - case NV3089_SET_CONTEXT_PATTERN: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_SET_CONTEXT_PATTERN: %x", ARGS(0)); - } - break; - - case NV3089_SET_CONTEXT_ROP: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_SET_CONTEXT_ROP: %x", ARGS(0)); - } - break; - - case NV3089_SET_CONTEXT_BETA1: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_SET_CONTEXT_BETA1: %x", ARGS(0)); - } - break; - - case NV3089_SET_CONTEXT_BETA4: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_SET_CONTEXT_BETA4: %x", ARGS(0)); - } - break; - case NV3089_SET_CONTEXT_SURFACE: { if (ARGS(0) != CELL_GCM_CONTEXT_SURFACE2D) @@ -2192,80 +1898,6 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 } break; - case NV3089_SET_COLOR_CONVERSION: - { - m_color_conv = ARGS(0); - m_color_conv_fmt = ARGS(1); - m_color_conv_op = ARGS(2); - m_color_conv_in_x = ARGS(3); - m_color_conv_in_y = ARGS(3) >> 16; - m_color_conv_in_w = ARGS(4); - m_color_conv_in_h = ARGS(4) >> 16; - m_color_conv_out_x = ARGS(5); - m_color_conv_out_y = ARGS(5) >> 16; - m_color_conv_out_w = ARGS(6); - m_color_conv_out_h = ARGS(6) >> 16; - m_color_conv_dsdx = ARGS(7); - m_color_conv_dtdy = ARGS(8); - } - break; - - case NV3089_SET_COLOR_FORMAT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_SET_COLOR_FORMAT: %x", ARGS(0)); - } - break; - - case NV3089_SET_OPERATION: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_SET_OPERATION: %x", ARGS(0)); - } - break; - - case NV3089_CLIP_POINT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_CLIP_POINT: %x", ARGS(0)); - } - break; - - case NV3089_CLIP_SIZE: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_CLIP_SIZE: %x", ARGS(0)); - } - break; - - case NV3089_IMAGE_OUT_POINT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_IMAGE_OUT_POINT: %x", ARGS(0)); - } - break; - - case NV3089_IMAGE_OUT_SIZE: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_IMAGE_OUT_SIZE: %x", ARGS(0)); - } - break; - - case NV3089_DS_DX: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_DS_DX: %x", ARGS(0)); - } - break; - - case NV3089_DT_DY: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_DT_DY: %x", ARGS(0)); - } - break; - case NV3089_IMAGE_IN_SIZE: { u16 width = ARGS(0); @@ -2294,25 +1926,22 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 } } break; - - case NV3089_IMAGE_IN_FORMAT: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_IMAGE_IN_FORMAT: %x", ARGS(0)); - } - break; - case NV3089_IMAGE_IN_OFFSET: + case NV3089_SET_COLOR_CONVERSION: { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_IMAGE_IN_OFFSET: %x", ARGS(0)); - } - break; - - case NV3089_IMAGE_IN: - { - if (ARGS(0)) - LOG_WARNING(RSX, "NV3089_IMAGE_IN: %x", ARGS(0)); + m_color_conv = ARGS(0); + m_color_conv_fmt = ARGS(1); + m_color_conv_op = ARGS(2); + m_color_conv_in_x = ARGS(3); + m_color_conv_in_y = ARGS(3) >> 16; + m_color_conv_in_w = ARGS(4); + m_color_conv_in_h = ARGS(4) >> 16; + m_color_conv_out_x = ARGS(5); + m_color_conv_out_y = ARGS(5) >> 16; + m_color_conv_out_w = ARGS(6); + m_color_conv_out_h = ARGS(6) >> 16; + m_color_conv_dsdx = ARGS(7); + m_color_conv_dtdy = ARGS(8); } break; @@ -2324,14 +1953,105 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32 } break; + // Note: What is this? NV4097 offsets? + case 0x000002c8: + case 0x000002d0: + case 0x000002d8: + case 0x000002e0: + case 0x000002e8: + case 0x000002f0: + case 0x000002f8: + break; + + // The existing GCM commands don't use any of the following NV4097 / NV0039 / NV3062 / NV309E / NV308A / NV3089 methods + case NV4097_SET_WINDOW_CLIP_TYPE: + case NV4097_SET_WINDOW_CLIP_HORIZONTAL: + case NV4097_SET_WINDOW_CLIP_VERTICAL: + { + LOG_WARNING(RSX, "Unused NV4097 method 0x%x detected!", cmd); + } + break; + + case NV0039_SET_CONTEXT_DMA_BUFFER_OUT: + case NV0039_PITCH_OUT: + case NV0039_LINE_LENGTH_IN: + case NV0039_LINE_COUNT: + case NV0039_FORMAT: + case NV0039_SET_OBJECT: + case NV0039_SET_CONTEXT_DMA_NOTIFIES: + { + LOG_WARNING(RSX, "Unused NV0039 method 0x%x detected!", cmd); + } + break; + + case NV3062_SET_OBJECT: + case NV3062_SET_CONTEXT_DMA_NOTIFIES: + case NV3062_SET_CONTEXT_DMA_IMAGE_SOURCE: + case NV3062_SET_PITCH: + case NV3062_SET_OFFSET_SOURCE: + { + LOG_WARNING(RSX, "Unused NV3062 method 0x%x detected!", cmd); + } + break; + + case NV308A_SET_OBJECT: + case NV308A_SET_CONTEXT_DMA_NOTIFIES: + case NV308A_SET_CONTEXT_COLOR_KEY: + case NV308A_SET_CONTEXT_CLIP_RECTANGLE: + case NV308A_SET_CONTEXT_PATTERN: + case NV308A_SET_CONTEXT_ROP: + case NV308A_SET_CONTEXT_BETA1: + case NV308A_SET_CONTEXT_BETA4: + case NV308A_SET_CONTEXT_SURFACE: + case NV308A_SET_COLOR_CONVERSION: + case NV308A_SET_OPERATION: + case NV308A_SET_COLOR_FORMAT: + case NV308A_SIZE_OUT: + case NV308A_SIZE_IN: + { + LOG_WARNING(RSX, "Unused NV308A method 0x%x detected!", cmd); + } + break; + + case NV309E_SET_OBJECT: + case NV309E_SET_CONTEXT_DMA_NOTIFIES: + case NV309E_SET_OFFSET: + { + LOG_WARNING(RSX, "Unused NV309E method 0x%x detected!", cmd); + } + break; + + case NV3089_SET_OBJECT: + case NV3089_SET_CONTEXT_DMA_NOTIFIES: + case NV3089_SET_CONTEXT_PATTERN: + case NV3089_SET_CONTEXT_ROP: + case NV3089_SET_CONTEXT_BETA1: + case NV3089_SET_CONTEXT_BETA4: + case NV3089_SET_COLOR_FORMAT: + case NV3089_SET_OPERATION: + case NV3089_CLIP_POINT: + case NV3089_CLIP_SIZE: + case NV3089_IMAGE_OUT_POINT: + case NV3089_IMAGE_OUT_SIZE: + case NV3089_DS_DX: + case NV3089_DT_DY: + case NV3089_IMAGE_IN_FORMAT: + case NV3089_IMAGE_IN_OFFSET: + case NV3089_IMAGE_IN: + { + LOG_WARNING(RSX, "Unused NV3089 method 0x%x detected!", cmd); + } + break; + default: { std::string log = GetMethodName(cmd); log += "("; - for(u32 i=0; iAddFunc(0xbd28fdbf, sceNpInit); @@ -141,4 +2280,361 @@ void sceNp_init() sceNp->AddFunc(0xf283c143, sceNpDrmExecuteGamePurchase); sceNp->AddFunc(0xcf51864b, sceNpDrmGetTimelimit); sceNp->AddFunc(0xa7bff757, sceNpManagerGetStatus); + sceNp->AddFunc(0x000e53cc, sceNpManagerSubSignout); + sceNp->AddFunc(0x01cd9cfd, sceNpCommerceGetChildProductSkuInfo); + sceNp->AddFunc(0x01fbbc9b, sceNpBasicSendMessageGui); + sceNp->AddFunc(0x03c741a7, sceNpMatchingGetResult); + sceNp->AddFunc(0x04372385, sceNpBasicGetFriendListEntry); + sceNp->AddFunc(0x04ca5e6a, sceNpScoreRecordGameData); + sceNp->AddFunc(0x0561448b, sceNpCommerceGetDataFlagAbort); + sceNp->AddFunc(0x05af1cb8, sceNpBasicGetMatchingInvitationEntry); + sceNp->AddFunc(0x05d65dff, sceNpScoreGetRankingByNpId); + sceNp->AddFunc(0x0968aa36, sceNpManagerGetTicket); + sceNp->AddFunc(0x14497465, sceNpMatchingQuickMatchGUI); + sceNp->AddFunc(0x155de760, sceNpSignalingGetConnectionInfo); + sceNp->AddFunc(0x166dcc11, sceNpLookupNpId); + sceNp->AddFunc(0x1672170e, sceNpScoreRecordScore); + sceNp->AddFunc(0x168a3117, sceNpBasicAddPlayersHistory); + sceNp->AddFunc(0x168fcece, sceNpManagerGetAccountAge); + sceNp->AddFunc(0x16f88a6f, sceNpManagerGetPsHandle); + sceNp->AddFunc(0x1a2704f7, sceNpScoreWaitAsync); + sceNp->AddFunc(0x1a3fcb69, sceNpCommerceGetSkuUserData); + sceNp->AddFunc(0x1ae8a549, sceNpBasicAddBlockListEntry); + sceNp->AddFunc(0x1fdb3ec2, sceNpLookupUserProfileWithAvatarSizeAsync); + sceNp->AddFunc(0x21206642, sceNpScoreGetRankingByRangeAsync); + sceNp->AddFunc(0x227f8763, sceNpScoreGetClansRankingByClanIdAsync); + sceNp->AddFunc(0x259113b8, sceNpScoreDestroyTitleCtx); + sceNp->AddFunc(0x260caedd, sceNpBasicGetFriendPresenceByNpId2); + sceNp->AddFunc(0x2687a127, sceNpSignalingGetCtxOpt); + sceNp->AddFunc(0x26b3bc94, sceNpMatchingGetResultGUI); + sceNp->AddFunc(0x26f33146, sceNpCommerceGetProductCategoryStart); + sceNp->AddFunc(0x2706eaa1, sceNpScoreSetPlayerCharacterId); + sceNp->AddFunc(0x276c72b2, sceNpSignalingSetCtxOpt); + sceNp->AddFunc(0x27c69eba, sceNpBasicAddFriend); + sceNp->AddFunc(0x29dd45dc, sceNpScoreSetTimeout); + sceNp->AddFunc(0x2a76895a, sceNpScoreGetClansRankingByClanId); + sceNp->AddFunc(0x2ad7837d, sceNpMatchingAcceptInvitationGUI); + sceNp->AddFunc(0x2be41ece, sceNpCommerceGetNumOfChildCategory); + sceNp->AddFunc(0x2cd2a1af, sceNpScoreSanitizeCommentAsync); + sceNp->AddFunc(0x2e1c5068, sceNpMatchingDestroyCtx); + sceNp->AddFunc(0x2f2c6b3e, sceNpProfileAbortGui); + sceNp->AddFunc(0x2fccbfe0, sceNpLookupUserProfileWithAvatarSize); + sceNp->AddFunc(0x30d1cbde, sceNpBasicGetMessageEntry); + sceNp->AddFunc(0x32200389, sceNpManagerGetMyLanguages); + sceNp->AddFunc(0x32c78a6a, sceNpBasicGetFriendPresenceByIndex); + sceNp->AddFunc(0x32cf311f, sceNpScoreInit); + sceNp->AddFunc(0x32febb4c, sceNpMatchingSearchJoinRoomGUI); + sceNp->AddFunc(0x34cc0ca4, sceNpMatchingKickRoomMember); + sceNp->AddFunc(0x34ce82a0, sceNpSignalingGetConnectionFromPeerAddress); + sceNp->AddFunc(0x359642a6, sceNpCommerceGetCategoryDescription); + sceNp->AddFunc(0x36d0c2c5, sceNpManagerGetAvatarUrl); + sceNp->AddFunc(0x39a69619, sceNpCommerceGetSkuId); + sceNp->AddFunc(0x3b02418d, sceNpScoreGetGameData); + sceNp->AddFunc(0x3cc8588a, sceNpMatchingCreateRoomGUI); + sceNp->AddFunc(0x3d1760dc, sceNpLookupAbortTransaction); + sceNp->AddFunc(0x3db7914d, sceNpScoreGetRankingByNpIdAsync); + sceNp->AddFunc(0x3f0808aa, sceNpBasicSetPresence); + sceNp->AddFunc(0x3f195b3a, sceNpCommerceGetProductCategoryResult); + sceNp->AddFunc(0x4026eac5, sceNpBasicRegisterContextSensitiveHandler); + sceNp->AddFunc(0x41ffd4f2, sceNpScoreGetClansMembersRankingByNpIdPcId); + sceNp->AddFunc(0x433fcb30, sceNpScoreGetClansMembersRankingByNpIdPcIdAsync); + sceNp->AddFunc(0x43b989f5, sceNpBasicSendMessageAttachment); + sceNp->AddFunc(0x442381f7, sceNpManagerSubSignin); + sceNp->AddFunc(0x45f8f3aa, sceNpCustomMenuRegisterActions); + sceNp->AddFunc(0x474b7b13, sceNpMatchingJoinRoomGUI); + sceNp->AddFunc(0x481ce0e8, sceNpBasicAbortGui); + sceNp->AddFunc(0x4a18a89e, sceNpMatchingSetRoomInfoNoLimit); + sceNp->AddFunc(0x4b9efb7a, sceNpManagerGetCachedInfo); + sceNp->AddFunc(0x4d5e0670, sceNpScoreGetClansMembersRankingByRangeAsync); + sceNp->AddFunc(0x4d9c615d, sceNpBasicGetClanMessageEntry); + sceNp->AddFunc(0x50b86d94, sceNpSignalingAddExtendedHandler); + sceNp->AddFunc(0x52a6b523, sceNpManagerUnregisterCallback); + sceNp->AddFunc(0x58fa4fcd, sceNpManagerGetTicketParam); + sceNp->AddFunc(0x5d543bbe, sceNpBasicGetMessageAttachmentEntry); + sceNp->AddFunc(0x5de61626, sceNpLookupDestroyTitleCtx); + sceNp->AddFunc(0x5e117ed5, sceNpLookupTitleStorageAsync); + sceNp->AddFunc(0x5e849303, sceNpBasicSetPresenceDetails2); + sceNp->AddFunc(0x5f2d9257, sceNpLookupInit); + sceNp->AddFunc(0x60440c73, sceNpManagerSubSigninAbortGui); + sceNp->AddFunc(0x60897c38, sceNpSignalingActivateConnection); + sceNp->AddFunc(0x6356082e, sceNpSignalingCreateCtx); + sceNp->AddFunc(0x6453b27b, sceNpBasicGetFriendPresenceByIndex2); + sceNp->AddFunc(0x64a704cc, sceNpBasicRecvMessageAttachmentLoad); + sceNp->AddFunc(0x64dbb89d, sceNpSignalingCancelPeerNetInfo); + sceNp->AddFunc(0x674bb9ff, sceNpCommerceGetProductCategoryAbort); + sceNp->AddFunc(0x691f429d, sceNpMatchingGetRoomInfo); + sceNp->AddFunc(0x6cb81eb2, sceNpCommerceDestroyProductCategory); + sceNp->AddFunc(0x6d4adc3b, sceNpScoreGetClansMembersRankingByRange); + sceNp->AddFunc(0x6e2ab18b, sceNpCommerceGetCategoryName); + sceNp->AddFunc(0x6ee62ed2, sceNpManagerGetContentRatingFlag); + sceNp->AddFunc(0x6f5e8143, sceNpScoreCreateTransactionCtx); + sceNp->AddFunc(0x6f8fd267, sceNpMatchingSetRoomInfo); + sceNp->AddFunc(0x71e5af7e, sceNpLookupSetTimeout); + sceNp->AddFunc(0x7208dc08, sceNpCommerceGetNumOfChildProductSku); + sceNp->AddFunc(0x73931bd0, sceNpBasicGetBlockListEntryCount); + sceNp->AddFunc(0x73a2e36b, sceNpMatchingGetRoomMemberListLocal); + sceNp->AddFunc(0x741fbf24, sceNpScoreGetClanMemberGameData); + sceNp->AddFunc(0x7508112e, sceNpLookupPollAsync); + sceNp->AddFunc(0x75eb50cb, sceNpSignalingGetPeerNetInfo); + sceNp->AddFunc(0x78d7f9ad, sceNpCommerceGetSkuPrice); + sceNp->AddFunc(0x79225aa3, sceNpCommerceGetCurrencyCode); + sceNp->AddFunc(0x7b7e9137, sceNpScoreGetClansRankingByRangeAsync); + sceNp->AddFunc(0x7be47e61, sceNpScoreCensorCommentAsync); + sceNp->AddFunc(0x7deb244c, sceNpScoreCensorComment); + sceNp->AddFunc(0x7e2fef28, sceNpManagerRequestTicket); + sceNp->AddFunc(0x806960ab, sceNpBasicRecvMessageCustom); + sceNp->AddFunc(0x816c6a5f, _sceNpSysutilClientFree); + sceNp->AddFunc(0x8297f1ec, sceNpManagerRequestTicket2); + sceNp->AddFunc(0x8440537c, sceNpLookupTerm); + sceNp->AddFunc(0x860b1756, sceNpLookupTitleSmallStorageAsync); + sceNp->AddFunc(0x8b7bbd73, sceNpMatchingSendInvitationGUI); + sceNp->AddFunc(0x8d1d096c, sceNpCommerceInitProductCategory); + sceNp->AddFunc(0x8d4518a0, sceNpCommerceSetDataFlagFinish); + sceNp->AddFunc(0x9153bdf4, sceNpBasicGetMessageAttachmentEntryCount); + sceNp->AddFunc(0x9281e87a, sceNpCommerceGetDataFlagFinish); + sceNp->AddFunc(0x936df4aa, sceNpCommerceGetProductId); + sceNp->AddFunc(0x9452f4f8, sceNpCommerceGetCategoryImageURL); + sceNp->AddFunc(0x9458f464, sceNpCustomMenuRegisterExceptionList); + sceNp->AddFunc(0x95c7bba3, sceNpSignalingTerminateConnection); + sceNp->AddFunc(0x9851f805, sceNpScoreTerm); + sceNp->AddFunc(0x99ac9952, sceNpCommerceSetDataFlagStart); + sceNp->AddFunc(0x9ad7fbd1, sceNpSignalingGetLocalNetInfo); + sceNp->AddFunc(0x9ee9f97e, sceNpLookupTitleStorage); + sceNp->AddFunc(0xa15f35fe, sceNpBasicGetPlayersHistoryEntryCount); + sceNp->AddFunc(0xa1709abd, sceNpManagerGetEntitlementById); + sceNp->AddFunc(0xa284bd1d, sceNpMatchingSetRoomSearchFlag); + sceNp->AddFunc(0xa7a090e5, sceNpScorePollAsync); + sceNp->AddFunc(0xa85a4951, sceNpCommerceGetSkuDescription); + sceNp->AddFunc(0xa8afa7d4, sceNpBasicGetCustomInvitationEntryCount); + sceNp->AddFunc(0xaa16695f, sceNpDrmProcessExitSpawn); + sceNp->AddFunc(0xac66568c, sceNpMatchingCreateCtx); + sceNp->AddFunc(0xacb9ee8e, sceNpBasicUnregisterHandler); + sceNp->AddFunc(0xaee8cf71, sceNpCommerceGetCategoryId); + sceNp->AddFunc(0xaf3eba5a, sceNpCommerceDoCheckoutFinishAsync); + sceNp->AddFunc(0xaf505def, sceNpBasicGetMatchingInvitationEntryCount); + sceNp->AddFunc(0xaf57d9c9, sceNpCommerceGetCurrencyDecimals); + sceNp->AddFunc(0xafef640d, sceNpBasicGetFriendListEntryCount); + sceNp->AddFunc(0xb020684e, sceNpMatchingGetRoomInfoNoLimit); + sceNp->AddFunc(0xb082003b, sceNpScoreGetClansRankingByRange); + sceNp->AddFunc(0xb1c02d66, sceNpCommerceGetCurrencyInfo); + sceNp->AddFunc(0xb1e0718b, sceNpManagerGetAccountRegion); + sceNp->AddFunc(0xb5cb2d56, sceNpBasicRecvMessageAttachment); + sceNp->AddFunc(0xb6017827, sceNpLookupAvatarImage); + sceNp->AddFunc(0xb66d1c46, sceNpManagerGetEntitlementIdList); + sceNp->AddFunc(0xb9f93bbb, sceNpScoreCreateTitleCtx); + sceNp->AddFunc(0xba65de6d, sceNpCommerceGetChildCategoryInfo); + sceNp->AddFunc(0xbab91fc9, sceNpBasicGetPlayersHistoryEntry); + sceNp->AddFunc(0xbcc09fe7, sceNpBasicRegisterHandler); + sceNp->AddFunc(0xbcdbb2ab, sceNpBasicAddPlayersHistoryAsync); + sceNp->AddFunc(0xbdc07fd5, sceNpManagerGetNetworkTime); + sceNp->AddFunc(0xbe07c708, sceNpManagerGetOnlineId); + sceNp->AddFunc(0xbe81c71c, sceNpBasicSetPresenceDetails); + sceNp->AddFunc(0xbef887e5, sceNpScoreGetClanMemberGameDataAsync); + sceNp->AddFunc(0xbf607ec6, sceNpBasicGetClanMessageEntryCount); + sceNp->AddFunc(0xbf9eea93, sceNpLookupAvatarImageAsync); + sceNp->AddFunc(0xc3a991ee, sceNpScoreGetRankingByNpIdPcId); + sceNp->AddFunc(0xc4b6cd8f, sceNpScoreGetRankingByNpIdPcIdAsync); + sceNp->AddFunc(0xc5f4cf82, sceNpScoreDestroyTransactionCtx); + sceNp->AddFunc(0xca0a2d04, sceNpSignalingGetConnectionStatus); + sceNp->AddFunc(0xca39c4b2, sceNpLookupTitleSmallStorage); + sceNp->AddFunc(0xccbe2e69, sceNpCommerceGetSkuImageURL); + sceNp->AddFunc(0xce81c7f0, sceNpLookupCreateTitleCtx); + sceNp->AddFunc(0xceeebc7a, sceNpProfileCallGui); + sceNp->AddFunc(0xcfd469e4, sceNpCommerceGetProductCategoryFinish); + sceNp->AddFunc(0xd03cea35, sceNpCommerceGetDataFlagState); + sceNp->AddFunc(0xd053f113, sceNpBasicGetCustomInvitationEntry); + sceNp->AddFunc(0xd0958814, sceNpSignalingGetPeerNetInfoResult); + sceNp->AddFunc(0xd12e40ae, sceNpLookupNpIdAsync); + sceNp->AddFunc(0xd208f91d, sceNpUtilCmpNpId); + sceNp->AddFunc(0xd20d7798, sceNpMatchingKickRoomMemberWithOpt); + sceNp->AddFunc(0xd737fd2d, sceNpLookupWaitAsync); + sceNp->AddFunc(0xd7fb1fa6, sceNpFriendlistCustom); + sceNp->AddFunc(0xdae2d351, sceNpMatchingGrantOwnership); + sceNp->AddFunc(0xdb2e4dc2, sceNpScoreGetGameDataAsync); + sceNp->AddFunc(0xdbdb909f, sceNpCommerceGetDataFlagStart); + sceNp->AddFunc(0xddce7d15, sceNpScoreGetBoardInfoAsync); + sceNp->AddFunc(0xded17c26, sceNpScoreGetClansMembersRankingByNpId); + sceNp->AddFunc(0xdfd63b62, sceNpLookupUserProfile); + sceNp->AddFunc(0xe035f7d6, sceNpBasicGetEvent); + sceNp->AddFunc(0xe1c9f675, sceNpBasicMarkMessageAsUsed); + sceNp->AddFunc(0xe24eea19, sceNpMatchingGetRoomListLimitGUI); + sceNp->AddFunc(0xe2877bea, sceNpCommerceDestroyCtx); + sceNp->AddFunc(0xe36c660e, sceNpCommerceDoCheckoutStartAsync); + sceNp->AddFunc(0xe6c8f3f9, sceNpDrmProcessExitSpawn2); + sceNp->AddFunc(0xe7dcd3b4, sceNpManagerRegisterCallback); + sceNp->AddFunc(0xe853d388, sceNpSignalingGetConnectionFromNpId); + sceNp->AddFunc(0xe8a67160, sceNpScoreGetClansMembersRankingByNpIdAsync); + sceNp->AddFunc(0xea2e9ffc, sceNpLookupCreateTransactionCtx); + sceNp->AddFunc(0xeb5f2544, sceNpCommerceGetProductName); + sceNp->AddFunc(0xeb7a3d84, sceNpManagerGetChatRestrictionFlag); + sceNp->AddFunc(0xeb9df054, sceNpCommerceGetCategoryInfo); + sceNp->AddFunc(0xec0a1fbf, sceNpBasicSendMessage); + sceNp->AddFunc(0xecd503de, sceNpBasicGetMessageEntryCount); + sceNp->AddFunc(0xee0cc40c, _sceNpSysutilClientMalloc); + sceNp->AddFunc(0xee530059, sceNpCommerceGetSkuName); + sceNp->AddFunc(0xee5b20d9, sceNpScoreAbortTransaction); + sceNp->AddFunc(0xee64cf8e, sceNpMatchingGetRoomSearchFlag); + sceNp->AddFunc(0xf0a9182b, sceNpFriendlist); + sceNp->AddFunc(0xf0b1e399, sceNpScoreRecordScoreAsync); + sceNp->AddFunc(0xf1b77918, sceNpScoreSanitizeComment); + sceNp->AddFunc(0xf2b3338a, sceNpBasicGetBlockListEntry); + sceNp->AddFunc(0xf42c0df8, sceNpManagerGetOnlineName); + sceNp->AddFunc(0xf4e0f607, sceNpScoreGetBoardInfo); + sceNp->AddFunc(0xf59e1da8, sceNpFriendlistAbortGui); + sceNp->AddFunc(0xf5ff5f31, sceNpUtilCmpNpIdInOrder); + sceNp->AddFunc(0xf76847c2, sceNpScoreRecordGameDataAsync); + sceNp->AddFunc(0xf806c54c, sceNpMatchingLeaveRoom); + sceNp->AddFunc(0xf9732ac8, sceNpCustomMenuActionSetActivation); + sceNp->AddFunc(0xfb87cf5e, sceNpLookupDestroyTransactionCtx); + sceNp->AddFunc(0xfbc82301, sceNpScoreGetRankingByRange); + sceNp->AddFunc(0xfcac355a, sceNpCommerceCreateCtx); + sceNp->AddFunc(0xfd0eb5ae, sceNpSignalingDeactivateConnection); + sceNp->AddFunc(0xfd39ae13, sceNpBasicGetFriendPresenceByNpId); + sceNp->AddFunc(0xfe37a7f4, sceNpManagerGetNpId); + sceNp->AddFunc(0xff0a2378, sceNpLookupUserProfileAsync); + sceNp->AddFunc(0x095e12c6, sceNpClansSendInvitationResponse); + sceNp->AddFunc(0x09f9e1a9, sceNpClansUpdateClanInfo); + sceNp->AddFunc(0x0df25834, sceNpClansRetrieveChallenges); + sceNp->AddFunc(0x1221a1bf, sceNpClansSearchByProfile); + sceNp->AddFunc(0x20472da0, sceNpClansGetMemberInfo); + sceNp->AddFunc(0x299ccc9b, sceNpClansCancelMembershipRequest); + sceNp->AddFunc(0x38dadf1f, sceNpClansGetAutoAcceptStatus); + sceNp->AddFunc(0x42332cb7, sceNpClansTerm); + sceNp->AddFunc(0x4826f6d5, sceNpClansDisbandClan); + sceNp->AddFunc(0x487de998, sceNpClansGetClanInfo); + sceNp->AddFunc(0x4d06aef7, sceNpClansAddBlacklistEntry); + sceNp->AddFunc(0x560f717b, sceNpClansLeaveClan); + sceNp->AddFunc(0x56bc5a7c, sceNpClansGetBlacklist); + sceNp->AddFunc(0x59743b2b, sceNpClansSendMembershipRequest); + sceNp->AddFunc(0x5bff9da1, sceNpClansRemoveBlacklistEntry); + sceNp->AddFunc(0x5da94854, sceNpClansUpdateAutoAcceptStatus); + sceNp->AddFunc(0x672399a8, sceNpClansGetClanListByNpId); + sceNp->AddFunc(0x726dffd5, sceNpClansCancelInvitation); + sceNp->AddFunc(0x727aa7f8, sceNpClansRetrieveAnnouncements); + sceNp->AddFunc(0x83d65529, sceNpClansPostChallenge); + sceNp->AddFunc(0x856ff5c0, sceNpClansGetMemberList); + sceNp->AddFunc(0x8e785b97, sceNpClansRetrievePostedChallenges); + sceNp->AddFunc(0x942dbdc4, sceNpClansSendMembershipResponse); + sceNp->AddFunc(0x9a72232d, sceNpClansCreateRequest); + sceNp->AddFunc(0x9b820047, sceNpClansInit); + sceNp->AddFunc(0x9cac2085, sceNpClansChangeMemberRole); + sceNp->AddFunc(0xa6a31a38, sceNpClansCreateClan); + sceNp->AddFunc(0xaa7912b5, sceNpClansKickMember); + sceNp->AddFunc(0xace0cfba, sceNpClansSearchByName); + sceNp->AddFunc(0xada45b84, sceNpClansPostAnnouncement); + sceNp->AddFunc(0xbc05ef31, sceNpClansSendInvitation); + sceNp->AddFunc(0xca4181b4, sceNpClansGetClanList); + sceNp->AddFunc(0xce6dc0f0, sceNpClansRemoveChallenge); + sceNp->AddFunc(0xd3346dc4, sceNpClansRemovePostedChallenge); + sceNp->AddFunc(0xd6551cd1, sceNpClansDestroyRequest); + sceNp->AddFunc(0xdbf300ca, sceNpClansJoinClan); + sceNp->AddFunc(0xe2590f60, sceNpClansRemoveAnnouncement); + sceNp->AddFunc(0xe82969e2, sceNpClansAbortRequest); + sceNp->AddFunc(0xf4a2d52b, sceNpClansUpdateMemberInfo); + sceNp->AddFunc(0x104551a6, sceNpCommerce2DoCheckoutStartAsync); + sceNp->AddFunc(0x146618df, sceNpCommerce2GetProductInfoListGetResult); + sceNp->AddFunc(0x150fdca3, sceNpCommerce2GetContentRatingDescriptor); + sceNp->AddFunc(0x1fa1b312, sceNpCommerce2GetStoreBrowseUserdata); + sceNp->AddFunc(0x2a910f05, sceNpCommerce2DestroyReq); + sceNp->AddFunc(0x3539d233, sceNpCommerce2Init); + sceNp->AddFunc(0x371a2edd, sceNpCommerce2GetCategoryContentsStart); + sceNp->AddFunc(0x3d627d81, sceNpCommerce2GetBGDLAvailability); + sceNp->AddFunc(0x410d42be, sceNpCommerce2DoDlListFinishAsync); + sceNp->AddFunc(0x4d4a094c, sceNpCommerce2Term); + sceNp->AddFunc(0x62023e98, sceNpCommerce2CreateSessionAbort); + sceNp->AddFunc(0x6ca9efd4, sceNpCommerce2DoDlListStartAsync); + sceNp->AddFunc(0x6f67ea80, sceNpCommerce2DestroyCtx); + sceNp->AddFunc(0x7370d8d0, sceNpCommerce2GetCategoryContentsCreateReq); + sceNp->AddFunc(0x8df0057f, sceNpCommerce2AbortReq); + sceNp->AddFunc(0x8f46325b, sceNpCommerce2GetProductInfoStart); + sceNp->AddFunc(0x91f8843d, sceNpCommerce2CreateSessionFinish); + sceNp->AddFunc(0x972ab46c, sceNpCommerce2GetContentInfo); + sceNp->AddFunc(0x9825a0fc, sceNpCommerce2DoProductBrowseStartAsync); + sceNp->AddFunc(0x9cde07cc, sceNpCommerce2GetProductInfoListStart); + sceNp->AddFunc(0x9d9cb96b, sceNpCommerce2DestroyGetCategoryContentsResult); + sceNp->AddFunc(0xa5a863fe, sceNpCommerce2SetBGDLAvailability); + sceNp->AddFunc(0xa975ebb4, sceNpCommerce2GetProductInfoCreateReq); + sceNp->AddFunc(0xa9f945b3, sceNpCommerce2DoProductCodeFinishAsync); + sceNp->AddFunc(0xac78c1f3, sceNpCommerce2GetContentRatingInfoFromCategoryInfo); + sceNp->AddFunc(0xb23e3bd1, sceNpCommerce2DoProductBrowseFinishAsync); + sceNp->AddFunc(0xbd49eab2, sceNpCommerce2GetCategoryInfo); + sceNp->AddFunc(0xbf5f58ea, sceNpCommerce2GetProductInfoGetResult); + sceNp->AddFunc(0xca0ea996, sceNpCommerce2GetCategoryContentsGetResult); + sceNp->AddFunc(0xcc18cd2c, sceNpCommerce2CreateSessionStart); + sceNp->AddFunc(0xd43a130e, sceNpCommerce2DoCheckoutFinishAsync); + sceNp->AddFunc(0xd8a473a3, sceNpCommerce2InitGetCategoryContentsResult); + sceNp->AddFunc(0xd9956ce7, sceNpCommerce2GetGameProductInfoFromGetProductInfoListResult); + sceNp->AddFunc(0xd9fdcec2, sceNpCommerce2CreateCtx); + sceNp->AddFunc(0xda8e322d, sceNpCommerce2GetPrice); + sceNp->AddFunc(0xdb19194c, sceNpCommerce2GetGameSkuInfoFromGameProductInfo); + sceNp->AddFunc(0xde7ab33d, sceNpCommerce2DoProductCodeStartAsync); + sceNp->AddFunc(0xe0f90e44, sceNpCommerce2InitGetProductInfoListResult); + sceNp->AddFunc(0xe1e7b5ac, sceNpCommerce2GetProductInfoListCreateReq); + sceNp->AddFunc(0xe51a4944, sceNpCommerce2GetGameProductInfoFromContentInfo); + sceNp->AddFunc(0xec324c8f, sceNpCommerce2GetContentRatingInfoFromGameProductInfo); + sceNp->AddFunc(0xeef51be0, sceNpCommerce2ExecuteStoreBrowse); + sceNp->AddFunc(0xef645654, sceNpCommerce2GetGameProductInfo); + sceNp->AddFunc(0xef8eafcd, sceNpCommerce2DestroyGetProductInfoResult); + sceNp->AddFunc(0xf6139b58, sceNpCommerce2DestroyGetProductInfoListResult); + sceNp->AddFunc(0xf798f5e3, sceNpCommerce2InitGetProductInfoResult); + sceNp->AddFunc(0xfc216890, sceNpCommerce2GetCategoryInfoFromContentInfo); + sceNp->AddFunc(0x01711e81, sceNpTusDeleteMultiSlotDataVUser); + sceNp->AddFunc(0x0423e622, sceNpTusGetMultiSlotVariable); + sceNp->AddFunc(0x065b610d, sceNpTusSetMultiSlotVariableAsync); + sceNp->AddFunc(0x0835deb2, sceNpTusSetDataVUser); + sceNp->AddFunc(0x0d15043b, sceNpTusGetMultiUserVariable); + sceNp->AddFunc(0x17db7aa7, sceNpTusTryAndSetVariableVUserAsync); + sceNp->AddFunc(0x1904435e, sceNpTusCreateTransactionCtx); + sceNp->AddFunc(0x19bce18c, sceNpTusPollAsync); + sceNp->AddFunc(0x1fa5c87d, sceNpTusAddAndGetVariableAsync); + sceNp->AddFunc(0x225aed26, sceNpTusTerm); + sceNp->AddFunc(0x2357ba9e, sceNpTusGetMultiSlotVariableVUser); + sceNp->AddFunc(0x2ab21ea9, sceNpTusGetMultiSlotDataStatusVUserAsync); + sceNp->AddFunc(0x2d1b9f1a, sceNpTusGetMultiUserDataStatusVUser); + sceNp->AddFunc(0x2e162a62, sceNpTusDestroyTitleCtx); + sceNp->AddFunc(0x3175af23, sceNpTusDeleteMultiSlotDataAsync); + sceNp->AddFunc(0x325c6284, sceNpTusAbortTransaction); + sceNp->AddFunc(0x348dbcb4, sceNpTusGetMultiUserDataStatus); + sceNp->AddFunc(0x3602bc80, sceNpTusTryAndSetVariableVUser); + sceNp->AddFunc(0x368fec59, sceNpTusGetMultiUserDataStatusVUserAsync); + sceNp->AddFunc(0x38f364b0, sceNpTusGetDataVUserAsync); + sceNp->AddFunc(0x44eca8b4, sceNpTusDestroyTransactionCtx); + sceNp->AddFunc(0x47e9424a, sceNpTusTryAndSetVariable); + sceNp->AddFunc(0x5175abb9, sceNpTusGetDataAsync); + sceNp->AddFunc(0x59432970, sceNpTusSetTimeout); + sceNp->AddFunc(0x651fd79f, sceNpTusGetMultiSlotDataStatusAsync); + sceNp->AddFunc(0x6c511024, sceNpTusGetMultiUserVariableVUser); + sceNp->AddFunc(0x7caf58ee, sceNpTusCreateTitleCtx); + sceNp->AddFunc(0x7d5f0f0e, sceNpTusSetData); + sceNp->AddFunc(0x8ddd0d85, sceNpTusGetData); + sceNp->AddFunc(0x8f87a06b, sceNpTusInit); + sceNp->AddFunc(0x94989003, sceNpTusAddAndGetVariable); + sceNp->AddFunc(0x9549d22c, sceNpTusGetMultiUserVariableVUserAsync); + sceNp->AddFunc(0x96a06212, sceNpTusSetMultiSlotVariableVUserAsync); + sceNp->AddFunc(0x9cc0cf44, sceNpTusSetDataVUserAsync); + sceNp->AddFunc(0xa3abfadb, sceNpTusGetMultiSlotDataStatusVUser); + sceNp->AddFunc(0xa7993bf3, sceNpTusAddAndGetVariableVUserAsync); + sceNp->AddFunc(0xae4e590e, sceNpTusGetDataVUser); + sceNp->AddFunc(0xaf985783, sceNpTusDeleteMultiSlotVariable); + sceNp->AddFunc(0xb8e8ff22, sceNpTusWaitAsync); + sceNp->AddFunc(0xbb2877f2, sceNpTusGetMultiSlotVariableAsync); + sceNp->AddFunc(0xbbb244b7, sceNpTusTryAndSetVariableAsync); + sceNp->AddFunc(0xc2e18da8, sceNpTusDeleteMultiSlotVariableVUserAsync); + sceNp->AddFunc(0xc4e51fbf, sceNpTusDeleteMultiSlotVariableVUser); + sceNp->AddFunc(0xc66ba67e, sceNpTusGetMultiUserDataStatusAsync); + sceNp->AddFunc(0xc815b219, sceNpTusDeleteMultiSlotDataVUserAsync); + sceNp->AddFunc(0xc848d425, sceNpTusGetMultiSlotDataStatus); + sceNp->AddFunc(0xcc7a31cd, sceNpTusGetMultiUserVariableAsync); + sceNp->AddFunc(0xcc86a8f6, sceNpTusSetMultiSlotVariable); + sceNp->AddFunc(0xe0719847, sceNpTusDeleteMultiSlotData); + sceNp->AddFunc(0xe847341f, sceNpTusSetDataAsync); + sceNp->AddFunc(0xf5363608, sceNpTusDeleteMultiSlotVariableAsync); + sceNp->AddFunc(0xf60be06f, sceNpTusAddAndGetVariableVUser); + sceNp->AddFunc(0xf819be91, sceNpTusSetMultiSlotVariableVUser); + sceNp->AddFunc(0xfc7d346e, sceNpTusGetMultiSlotVariableVUserAsync); + sceNp->AddFunc(0x432b3cbf, sceNpUtilBandwidthTestShutdown); + sceNp->AddFunc(0xc2ced2b7, sceNpUtilBandwidthTestInitStart); + sceNp->AddFunc(0xc880f37d, sceNpUtilBandwidthTestGetStatus); + sceNp->AddFunc(0xc99ee313, sceNpUtilBandwidthTestAbort); + sceNp->AddFunc(0xa8cf8451, sceNpSignalingDestroyCtx); } diff --git a/rpcs3/Emu/SysCalls/SysCalls.cpp b/rpcs3/Emu/SysCalls/SysCalls.cpp index e92997781f..a8917cb195 100644 --- a/rpcs3/Emu/SysCalls/SysCalls.cpp +++ b/rpcs3/Emu/SysCalls/SysCalls.cpp @@ -18,6 +18,11 @@ static func_caller *null_func = bind_func(default_syscall); static const int kSyscallTableLength = 1024; +// UNS = Unused +// ROOT = Root +// DBG = Debug +// PM = Product Mode +// AuthID = Authentication ID static func_caller* sc_table[kSyscallTableLength] = { null_func, @@ -27,19 +32,17 @@ static func_caller* sc_table[kSyscallTableLength] = bind_func(sys_process_get_status), //4 (0x004) DBG bind_func(sys_process_detach_child), //5 (0x005) DBG - // Unused: 6-11 - null_func, null_func, null_func, null_func, null_func, null_func, + null_func, null_func, null_func, null_func, null_func, null_func, //6-11 UNS bind_func(sys_process_get_number_of_object), //12 (0x00B) bind_func(sys_process_get_id), //13 (0x00C) null_func,//bind_func(sys_process_is_spu_lock_line_reservation_address), //14 (0x00D) - // Unused: 15-17 - null_func, null_func, null_func, + null_func, null_func, null_func, //15-17 UNS bind_func(sys_process_getppid), //18 (0x012) bind_func(sys_process_kill), //19 (0x013) - null_func, // + null_func, //20 (0x014) UNS null_func,//bind_func(_sys_process_spawn), //21 (0x015) DBG bind_func(sys_process_exit), //22 (0x016) bind_func(sys_process_wait_for_child2), //23 (0x017) DBG @@ -52,11 +55,10 @@ static func_caller* sc_table[kSyscallTableLength] = bind_func(sys_process_get_paramsfo), //30 (0x01E) null_func,//bind_func(sys_process_get_ppu_guid), //31 (0x01F) - // Unused: 32-40 - null_func, null_func, null_func, null_func, null_func, null_func, null_func, null_func, null_func, + null_func, null_func, null_func, null_func, null_func, null_func, null_func, null_func, null_func, //32-40 UNS - bind_func(sys_internal_ppu_thread_exit), //41 (0x029) - null_func, // + bind_func(sys_internal_ppu_thread_exit), //41 (0x029) + null_func, //42 (0x02A) UNS bind_func(sys_ppu_thread_yield), //43 (0x02B) bind_func(sys_ppu_thread_join), //44 (0x02C) bind_func(sys_ppu_thread_detach), //45 (0x02D) @@ -68,15 +70,12 @@ static func_caller* sc_table[kSyscallTableLength] = null_func,//bind_func(sys_ppu_thread_restart), //51 (0x033) ROOT null_func,//bind_func(sys_ppu_thread_create), //52 (0x034) DBG null_func,//bind_func(sys_ppu_thread_start), //53 (0x035) - null_func,//bind_func(), //54 (0x036) ROOT - null_func,//bind_func(), //55 (0x037) ROOT + null_func,//bind_func(sys_ppu_...), //54 (0x036) ROOT + null_func,//bind_func(sys_ppu_...), //55 (0x037) ROOT null_func,//bind_func(sys_ppu_thread_rename), //56 (0x038) null_func,//bind_func(sys_ppu_thread_recover_page_fault)//57 (0x039) null_func,//bind_func(sys_ppu_thread_get_page_fault_context),//58 (0x03A) - - // Unused: 59 - null_func, - + null_func, //59 (0x03B) UNS bind_func(sys_trace_create), //60 (0x03C) bind_func(sys_trace_start), //61 (0x03D) bind_func(sys_trace_stop), //62 (0x03E) @@ -95,11 +94,8 @@ static func_caller* sc_table[kSyscallTableLength] = bind_func(sys_timer_connect_event_queue), //75 (0x04B) bind_func(sys_timer_disconnect_event_queue), //76 (0x04C) null_func,//bind_func(sys_trace_create2_in_cbepm), //77 (0x04D) - null_func,//bind_func() //78 (0x04E) - - // Unused: 79 - null_func, - + null_func,//bind_func(sys_trace_...) //78 (0x04E) + null_func, //79 (0x04F) UNS null_func,//bind_func(sys_interrupt_tag_create) //80 (0x050) bind_func(sys_interrupt_tag_destroy), //81 (0x051) bind_func(sys_event_flag_create), //82 (0x052) @@ -135,11 +131,11 @@ static func_caller* sc_table[kSyscallTableLength] = null_func,//bind_func(sys_lwcond_destroy) //112 (0x070) null_func,//bind_func(sys_lwcond_queue_wait) //113 (0x071) bind_func(sys_semaphore_get_value), //114 (0x072) - null_func,//bind_func() //115 (0x073) - null_func,//bind_func() //116 (0x074) - null_func,//bind_func() //117 (0x075) + null_func,//bind_func(sys_semaphore_...) //115 (0x073) + null_func,//bind_func(sys_semaphore_...) //116 (0x074) + null_func,//bind_func(sys_semaphore_...) //117 (0x075) bind_func(sys_event_flag_clear), //118 (0x076) - null_func,//bind_func() //119 (0x077) ROOT + null_func,//bind_func(sys_event_...) //119 (0x077) ROOT bind_func(sys_rwlock_create), //120 (0x078) bind_func(sys_rwlock_destroy), //121 (0x079) bind_func(sys_rwlock_rlock), //122 (0x07A) @@ -169,10 +165,7 @@ static func_caller* sc_table[kSyscallTableLength] = null_func,//bind_func(sys_time_get_system_time), //146 (0x092) ROOT bind_func(sys_time_get_timebase_frequency), //147 (0x093) null_func,//bind_func(sys_rwlock_trywlock) //148 (0x094) - - // Unused: 149 - null_func, - + null_func, //149 (0x095) UNS bind_func(sys_raw_spu_create_interrupt_tag), //150 (0x096) bind_func(sys_raw_spu_set_int_mask), //151 (0x097) bind_func(sys_raw_spu_get_int_mask), //152 (0x098) @@ -185,13 +178,13 @@ static func_caller* sc_table[kSyscallTableLength] = null_func,//bind_func(sys_raw_spu_load) //159 (0x09F) bind_func(sys_raw_spu_create), //160 (0x0A0) bind_func(sys_raw_spu_destroy), //161 (0x0A1) - null_func, // + null_func, //162 (0x0A2) UNS bind_func(sys_raw_spu_read_puint_mb), //163 (0x0A3) - null_func, // + null_func, //164 (0x0A4) UNS bind_func(sys_spu_thread_get_exit_status), //165 (0x0A5) bind_func(sys_spu_thread_set_argument), //166 (0x0A6) null_func,//bind_func(sys_spu_thread_group_start_on_exit)//167(0x0A7) - null_func, // + null_func, //168 (0x0A8) UNS bind_func(sys_spu_initialize), //169 (0x0A9) bind_func(sys_spu_thread_group_create), //170 (0x0AA) bind_func(sys_spu_thread_group_destroy), //171 (0x0AB) @@ -206,54 +199,75 @@ static func_caller* sc_table[kSyscallTableLength] = null_func,//bind_func(sys_spu_thread_group_get_priority)//180 (0x0B4) bind_func(sys_spu_thread_write_ls), //181 (0x0B5) bind_func(sys_spu_thread_read_ls), //182 (0x0B6) - null_func, // + null_func, //183 (0x0B7) UNS bind_func(sys_spu_thread_write_snr), //184 (0x0B8) bind_func(sys_spu_thread_group_connect_event), //185 (0x0B9) bind_func(sys_spu_thread_group_disconnect_event), //186 (0x0BA) bind_func(sys_spu_thread_set_spu_cfg), //187 (0x0BB) bind_func(sys_spu_thread_get_spu_cfg), //188 (0x0BC) - null_func, // + null_func, //189 (0x0BD) UNS bind_func(sys_spu_thread_write_spu_mb), //190 (0x0BE) bind_func(sys_spu_thread_connect_event), //191 (0x0BF) bind_func(sys_spu_thread_disconnect_event), //192 (0x0C0) bind_func(sys_spu_thread_bind_queue), //193 (0x0C1) bind_func(sys_spu_thread_unbind_queue), //194 (0x0C2) - null_func, // + null_func, //195 (0x0C3) UNS bind_func(sys_raw_spu_set_spu_cfg), //196 (0x0C4) bind_func(sys_raw_spu_get_spu_cfg), //197 (0x0C5) null_func,//bind_func(sys_spu_thread_recover_page_fault)//198 (0x0C6) null_func,//bind_func(sys_raw_spu_recover_page_fault) //199 (0x0C7) - null_func, null_func, null_func, null_func, null_func, //204(0x104) - null_func, null_func, null_func, null_func, null_func, //209 - null_func, null_func, null_func, null_func, null_func, //214 - null_func, null_func, null_func, null_func, null_func, //219 - null_func, null_func, null_func, null_func, null_func, //224 - null_func, null_func, null_func, null_func, null_func, //229 - null_func, null_func, null_func, null_func, null_func, //234 - null_func, null_func, null_func, null_func, null_func, //239 - null_func, null_func, null_func, null_func, null_func, //244 - null_func, null_func, null_func, null_func, null_func, //249 - null_func, //250 + null_func, null_func, null_func, null_func, null_func, //204 UNS? + null_func, null_func, null_func, null_func, null_func, //209 UNS? + null_func, null_func, null_func, null_func, null_func, //214 UNS? - bind_func(sys_spu_thread_group_connect_event_all_threads),//251 (0x0FB) - bind_func(sys_spu_thread_group_disconnect_event_all_threads),//252 (0x0FC) + null_func,//bind_func(sys_dbg_mat_set_condition) //215 (0x0D7) + null_func,//bind_func(sys_dbg_mat_get_condition) //216 (0x0D8) + null_func,//bind_func(sys_dbg_...) //217 (0x0D9) DBG UNS? + null_func,//bind_func(sys_dbg_...) //218 (0x0DA) DBG UNS? + null_func,//bind_func(sys_dbg_...) //219 (0x0DB) DBG UNS? + + null_func, null_func, null_func, null_func, null_func, //224 UNS + null_func, null_func, null_func, null_func, null_func, //229 UNS? + + null_func,//bind_func(sys_isolated_spu_create) //230 (0x0E6) ROOT + null_func,//bind_func(sys_isolated_spu_destroy) //231 (0x0E7) ROOT + null_func,//bind_func(sys_isolated_spu_start) //232 (0x0E8) ROOT + null_func,//bind_func(sys_isolated_spu_create_interrupt_tag) //233 (0x0E9) ROOT + null_func,//bind_func(sys_isolated_spu_set_int_mask) //234 (0x0EA) ROOT + null_func,//bind_func(sys_isolated_spu_get_int_mask) //235 (0x0EB) ROOT + null_func,//bind_func(sys_isolated_spu_set_int_stat) //236 (0x0EC) ROOT + null_func,//bind_func(sys_isolated_spu_get_int_stat) //237 (0x0ED) ROOT + null_func,//bind_func(sys_isolated_spu_set_spu_cfg) //238 (0x0EE) ROOT + null_func,//bind_func(sys_isolated_spu_get_spu_cfg) //239 (0x0EF) ROOT + null_func,//bind_func(sys_isolated_spu_read_puint_mb) //240 (0x0F0) ROOT + null_func, //241 (0x0F1) ROOT UNS + null_func, //242 (0x0F2) ROOT UNS + null_func, //243 (0x0F3) ROOT UNS + null_func,//bind_func(sys_spu_thread_group_system_set_next_group) //244 (0x0F4) ROOT + null_func,//bind_func(sys_spu_thread_group_system_unset_next_group) //245 (0x0F5) ROOT + null_func,//bind_func(sys_spu_thread_group_system_set_switch_group) //246 (0x0F6) ROOT + null_func,//bind_func(sys_spu_thread_group_system_unset_switch_group) //247 (0x0F7) ROOT + null_func,//bind_func(sys_spu_thread_group...) //248 (0x0F8) ROOT + null_func,//bind_func(sys_spu_thread_group...) //249 (0x0F9) ROOT + null_func,//bind_func(sys_spu_thread_group_set_cooperative_victims) //250 (0x0FA) + bind_func(sys_spu_thread_group_connect_event_all_threads), //251 (0x0FB) + bind_func(sys_spu_thread_group_disconnect_event_all_threads), //252 (0x0FC) null_func,//bind_func() //253 (0x0FD) null_func,//bind_func(sys_spu_thread_group_log) //254 (0x0FE) - // Unused: 255-259 - null_func, null_func, null_func, null_func, null_func, + null_func, null_func, null_func, null_func, null_func, //255-259 UNS null_func,//bind_func(sys_spu_image_open_by_fd) //260 (0x104) - null_func, null_func, null_func, null_func, //264 - null_func, null_func, null_func, null_func, null_func, //269 - null_func, null_func, null_func, null_func, null_func, //274 - null_func, null_func, null_func, null_func, null_func, //279 - null_func, null_func, null_func, null_func, null_func, //284 - null_func, null_func, null_func, null_func, null_func, //289 - null_func, null_func, null_func, null_func, null_func, //294 - null_func, null_func, null_func, null_func, null_func, //299 + null_func, null_func, null_func, null_func, //264 UNS + null_func, null_func, null_func, null_func, null_func, //269 UNS + null_func, null_func, null_func, null_func, null_func, //274 UNS + null_func, null_func, null_func, null_func, null_func, //279 UNS + null_func, null_func, null_func, null_func, null_func, //284 UNS + null_func, null_func, null_func, null_func, null_func, //289 UNS + null_func, null_func, null_func, null_func, null_func, //294 UNS + null_func, null_func, null_func, null_func, null_func, //299 UNS bind_func(sys_vm_memory_map), //300 (0x12C) bind_func(sys_vm_unmap), //301 (0x12D) @@ -268,18 +282,17 @@ static func_caller* sc_table[kSyscallTableLength] = bind_func(sys_vm_sync), //310 (0x136) bind_func(sys_vm_test), //311 (0x137) bind_func(sys_vm_get_statistics), //312 (0x138) - null_func,//bind_func() //313 (0x139) - null_func,//bind_func() //314 (0x13A) - null_func,//bind_func() //315 (0x13B) + null_func,//bind_func(sys_vm_memory_map (different)) //313 (0x139) + null_func,//bind_func(sys_...) //314 (0x13A) + null_func,//bind_func(sys_...) //315 (0x13B) - // Unused: 316-323 - null_func, null_func, null_func, null_func, null_func, null_func, null_func, null_func, + null_func, null_func, null_func, null_func, null_func, null_func, null_func, null_func, //316-323 UNS - bind_func(sys_memory_container_create), //324 (0x144) - bind_func(sys_memory_container_destroy), //325 (0x145) + bind_func(sys_memory_container_create), //324 (0x144) DBG + bind_func(sys_memory_container_destroy), //325 (0x145) DBG bind_func(sys_mmapper_allocate_fixed_address), //326 (0x146) bind_func(sys_mmapper_enable_page_fault_notification), //327 (0x147) - null_func,//bind_func() //328 (0x148) + null_func,//bind_func(sys_mmapper_...) //328 (0x148) null_func,//bind_func(sys_mmapper_free_shared_memory) //329 (0x149) bind_func(sys_mmapper_allocate_address), //330 (0x14A) bind_func(sys_mmapper_free_address), //331 (0x14B) @@ -290,57 +303,121 @@ static func_caller* sc_table[kSyscallTableLength] = bind_func(sys_mmapper_change_address_access_right), //336 (0x150) bind_func(sys_mmapper_search_and_map), //337 (0x151) null_func,//bind_func(sys_mmapper_get_shared_memory_attribute) //338 (0x152) - null_func,//bind_func() //339 (0x153) - null_func,//bind_func() //340 (0x154) + null_func,//bind_func(sys_...) //339 (0x153) + null_func,//bind_func(sys_...) //340 (0x154) bind_func(sys_memory_container_create), //341 (0x155) bind_func(sys_memory_container_destroy), //342 (0x156) bind_func(sys_memory_container_get_size), //343 (0x157) null_func,//bind_func(sys_memory_budget_set) //344 (0x158) - null_func,//bind_func() //345 (0x159) - null_func,//bind_func() //346 (0x15A) - null_func, // + null_func,//bind_func(sys_memory_...) //345 (0x159) + null_func,//bind_func(sys_memory_...) //346 (0x15A) + null_func, //347 (0x15B) UNS bind_func(sys_memory_allocate), //348 (0x15C) bind_func(sys_memory_free), //349 (0x15D) bind_func(sys_memory_allocate_from_container), //350 (0x15E) bind_func(sys_memory_get_page_attribute), //351 (0x15F) bind_func(sys_memory_get_user_memory_size), //352 (0x160) null_func,//bind_func(sys_memory_get_user_memory_stat) //353 (0x161) - null_func,//bind_func() //354 (0x162) - null_func,//bind_func() //355 (0x163) + null_func,//bind_func(sys_memory_...) //354 (0x162) + null_func,//bind_func(sys_memory_...) //355 (0x163) null_func,//bind_func(sys_memory_allocate_colored) //356 (0x164) - null_func,//bind_func() //357 (0x165) - null_func,//bind_func() //358 (0x166) - null_func,//bind_func() //359 (0x167) - null_func,//bind_func() //360 (0x168) + null_func,//bind_func(sys_memory_...) //357 (0x165) + null_func,//bind_func(sys_memory_...) //358 (0x166) + null_func,//bind_func(sys_memory_...) //359 (0x167) + null_func,//bind_func(sys_memory_...) //360 (0x168) null_func,//bind_func(sys_memory_allocate_from_container_colored) //361 (0x169) null_func,//bind_func(sys_mmapper_allocate_memory_from_container) //362 (0x16A) - null_func,//bind_func() //363 (0x16B) - null_func,//bind_func() //364 (0x16C) + null_func,//bind_func(sys_mmapper_...) //363 (0x16B) + null_func,//bind_func(sys_mmapper_...) //364 (0x16C) + null_func, //365 (0x16D) UNS + null_func, //366 (0x16E) UNS + null_func,//bind_func(sys_uart_initialize) //367 (0x16F) ROOT + null_func,//bind_func(sys_uart_receive) //368 (0x170) ROOT + null_func,//bind_func(sys_uart_send) //369 (0x171) ROOT + null_func,//bind_func(sys_uart_get_params) //370 (0x172) ROOT + null_func, //371 (0x173) UNS + null_func,//bind_func(sys_game_watchdog_start) //372 (0x174) + null_func,//bind_func(sys_game_watchdog_stop) //373 (0x175) + null_func,//bind_func(sys_game_watchdog_clear) //374 (0x176) + null_func,//bind_func(sys_game_set_system_sw_version) //375 (0x177) ROOT + null_func,//bind_func(sys_game_get_system_sw_version) //376 (0x178) ROOT + null_func,//bind_func(sys_sm_set_shop_mode) //377 (0x179) ROOT + null_func,//bind_func(sys_sm_get_ext_event2) //378 (0x17A) ROOT + null_func,//bind_func(sys_sm_shutdown) //379 (0x17B) ROOT + null_func,//bind_func(sys_sm_get_params) //380 (0x17C) DBG + null_func,//bind_func(sys_sm_get_inter_lpar_parameter) //381 (0x17D) ROOT + null_func,//bind_func(sys_sm_) //382 (0x17E) ROOT + null_func,//bind_func(sys_game_get_temperature) //383 (0x17F) ROOT + null_func,//bind_func(sys_sm_get_tzpb) //384 (0x180) ROOT + null_func,//bind_func(sys_sm_request_led) //385 (0x181) ROOT + null_func,//bind_func(sys_sm_control_led) //386 (0x182) ROOT + null_func,//bind_func(sys_sm_get_platform_info) //387 (0x183) DBG + null_func,//bind_func(sys_sm_ring_buzzer) //388 (0x184) ROOT + null_func,//bind_func(sys_sm_set_fan_policy) //389 (0x185) PM + null_func,//bind_func(sys_sm_request_error_log) //390 (0x186) ROOT + null_func,//bind_func(sys_sm_request_be_count) //391 (0x187) ROOT + null_func,//bind_func(sys_sm_ring_buzzer) //392 (0x188) ROOT + null_func,//bind_func(sys_sm_get_hw_config) //393 (0x189) ROOT + null_func,//bind_func(sys_sm_request_scversion) //394 (0x18A) ROOT + null_func,//bind_func(sys_sm_request_system_event_log) //395 (0x18B) PM + null_func,//bind_func(sys_sm_set_rtc_alarm) //396 (0x18C) ROOT + null_func,//bind_func(sys_sm_get_rtc_alarm) //397 (0x18D) ROOT + null_func,//bind_func(sys_console_write) //398 (0x18E) ROOT + null_func, //399 (0x18F) UNS + null_func,//bind_func(sys_sm_...) //400 (0x190) PM + null_func,//bind_func(sys_sm_...) //401 (0x191) ROOT + bind_func(sys_tty_read), //402 (0x192) + bind_func(sys_tty_write), //403 (0x193) + null_func,//bind_func(sys_...) //404 (0x194) ROOT + null_func,//bind_func(sys_...) //405 (0x195) PM + null_func,//bind_func(sys_...) //406 (0x196) PM + null_func,//bind_func(sys_...) //407 (0x197) PM + null_func,//bind_func(sys_sm_get_tzpb) //408 (0x198) PM + null_func,//bind_func(sys_sm_get_fan_policy) //409 (0x199) PM + null_func,//bind_func(sys_game_board_storage_read) //410 (0x19A) + null_func,//bind_func(sys_game_board_storage_write) //411 (0x19B) + null_func,//bind_func(sys_game_get_rtc_status) //412 (0x19C) + null_func,//bind_func(sys_...) //413 (0x19D) ROOT + null_func,//bind_func(sys_...) //414 (0x19E) ROOT + null_func,//bind_func(sys_...) //415 (0x19F) ROOT + null_func, null_func, null_func, null_func, //419 UNS + null_func, null_func, null_func, null_func, null_func, //424 UNS + null_func, null_func, null_func, null_func, null_func, //429 UNS + null_func, null_func, null_func, null_func, null_func, //434 UNS + null_func, null_func, null_func, null_func, null_func, //439 UNS + null_func, null_func, null_func, null_func, null_func, //444 UNS + null_func, null_func, null_func, null_func, null_func, //449 UNS - null_func, null_func, null_func, null_func, null_func, //369 - null_func, null_func, null_func, null_func, null_func, //374 - null_func, null_func, null_func, null_func, null_func, //379 - null_func, null_func, null_func, null_func, null_func, //384 - null_func, null_func, null_func, null_func, null_func, //389 - null_func, null_func, null_func, null_func, null_func, //394 - null_func, null_func, null_func, null_func, null_func, //399 - null_func, null_func, bind_func(sys_tty_read), bind_func(sys_tty_write), null_func, //404 - null_func, null_func, null_func, null_func, null_func, //409 - null_func, null_func, null_func, null_func, null_func, //414 - null_func, null_func, null_func, null_func, null_func, //419 - null_func, null_func, null_func, null_func, null_func, //424 - null_func, null_func, null_func, null_func, null_func, //429 - null_func, null_func, null_func, null_func, null_func, //434 - null_func, null_func, null_func, null_func, null_func, //439 - null_func, null_func, null_func, null_func, null_func, //444 - null_func, null_func, null_func, null_func, null_func, //449 - null_func, null_func, null_func, null_func, null_func, //454 - null_func, null_func, null_func, null_func, null_func, //459 - null_func, null_func, null_func, null_func, null_func, //464 - null_func, null_func, null_func, null_func, null_func, //469 - null_func, null_func, null_func, null_func, null_func, //474 - null_func, null_func, null_func, null_func, null_func, //479 + null_func,//bind_func(sys_overlay_load_module) //450 (0x1C2) + null_func,//bind_func(sys_overlay_unload_module) //451 (0x1C3) + null_func,//bind_func(sys_overlay_get_module_list) //452 (0x1C4) + null_func,//bind_func(sys_overlay_get_module_info) //453 (0x1C5) + null_func,//bind_func(sys_overlay_load_module_by_fd) //454 (0x1C6) + null_func,//bind_func(sys_overlay_get_module_info2) //455 (0x1C7) + null_func,//bind_func(sys_overlay_get_sdk_version) //456 (0x1C8) + null_func,//bind_func(sys_overlay_get_module_dbg_info) //457 (0x1C9) + null_func,//bind_func(sys_overlay_get_module_dbg_info) //458 (0x1CA) + null_func, //459 (0x1CB) UNS + null_func,//bind_func(sys_prx_dbg_get_module_id_list) //460 (0x1CC) ROOT + null_func,//bind_func(sys_prx_get_module_id_by_address) //461 (0x1CD) + null_func, //462 (0x1CE) UNS + null_func,//bind_func(sys_prx_load_module_by_fd) //463 (0x1CF) + null_func,//bind_func(sys_prx_load_module_on_memcontainer_by_fd) //464 (0x1D0) + null_func,//bind_func(sys_prx_load_module_list) //465 (0x1D1) + null_func,//bind_func(sys_prx_load_module_list_on_memcontainer) //466 (0x1D2) + null_func,//bind_func(sys_prx_get_ppu_guid) //467 (0x1D3) + null_func,//bind_func(sys_...) //468 (0x1D4) ROOT + null_func, //469 (0x1D5) UNS + null_func,//bind_func(sys_...) //470 (0x1D6) ROOT + null_func,//bind_func(sys_...) //471 (0x1D7) ROOT + null_func,//bind_func(sys_...) //472 (0x1D8) ROOT + null_func,//bind_func(sys_...) //473 (0x1D9) + null_func,//bind_func(sys_...) //474 (0x1DA) + null_func,//bind_func(sys_...) //475 (0x1DB) ROOT + null_func,//bind_func(sys_...) //476 (0x1DC) ROOT + + null_func, null_func, null_func, //477-479 UNS null_func,//bind_func(sys_prx_load_module), //480 (0x1E0) null_func,//bind_func(sys_prx_start_module), //481 (0x1E1) @@ -353,50 +430,172 @@ static func_caller* sc_table[kSyscallTableLength] = bind_func(sys_prx_link_library), //488 (0x1E8) bind_func(sys_prx_unlink_library), //489 (0x1E9) bind_func(sys_prx_query_library), //490 (0x1EA) - null_func, //491 (0x1EB) - null_func, //492 (0x1EC) - null_func,//sys_prx_dbg_get_module_info //493 (0x1ED) + null_func, //491 (0x1EB) UNS + null_func,//bind_func(sys_...) //492 (0x1EC) DBG + null_func,//bind_func(sys_prx_dbg_get_module_info) //493 (0x1ED) DBG null_func,//bind_func(sys_prx_get_module_list), //494 (0x1EE) null_func,//bind_func(sys_prx_get_module_info), //495 (0x1EF) null_func,//bind_func(sys_prx_get_module_id_by_name), //496 (0x1F0) null_func,//bind_func(sys_prx_load_module_on_memcontainer),//497 (0x1F1) bind_func(sys_prx_start), //498 (0x1F2) bind_func(sys_prx_stop), //499 (0x1F3) + null_func,//bind_func(sys_hid_manager_open) //500 (0x1F4) + null_func,//bind_func(sys_hid_manager_close) //501 (0x1F5) + null_func,//bind_func(sys_hid_manager_read) //502 (0x1F6) ROOT + null_func,//bind_func(sys_hid_manager_ioctl) //503 (0x1F7) + null_func,//bind_func(sys_hid_manager_map_logical_id_to_port_id) //504 (0x1F8) ROOT + null_func,//bind_func(sys_hid_manager_unmap_logical_id_to_port_id) //505 (0x1F9) ROOT + null_func,//bind_func(sys_hid_manager_add_hot_key_observer) //506 (0x1FA) ROOT + null_func,//bind_func(sys_hid_manager_remove_hot_key_observer) //507 (0x1FB) ROOT + null_func,//bind_func(sys_hid_manager_grab_focus) //508 (0x1FC) ROOT + null_func,//bind_func(sys_hid_manager_release_focus) //509 (0x1FD) ROOT + null_func,//bind_func(sys_hid_manager_...) //510 (0x1FE) + null_func,//bind_func(sys_hid_manager_set_...) //511 (0x1FF) ROOT + null_func,//bind_func(sys_hid_manager_...) //512 (0x200) ROOT + null_func,//bind_func(sys_hid_manager_...) //513 (0x201) + null_func,//bind_func(sys_hid_manager_...) //514 (0x202) + null_func, //515 (0x203) UNS + null_func,//bind_func(sys_config_open) //516 (0x204) + null_func,//bind_func(sys_config_close) //517 (0x205) + null_func,//bind_func(sys_config_get_service_event) //518 (0x206) + null_func,//bind_func(sys_config_add_service_listener) //519 (0x207) + null_func,//bind_func(sys_config_remove_service_listener) //520 (0x208) + null_func,//bind_func(sys_config_register_service) //521 (0x209) + null_func,//bind_func(sys_config_unregister_service) //522 (0x20A) + null_func,//bind_func(sys_config_io_event) //523 (0x20B) + null_func,//bind_func(sys_config_...) //524 (0x20C) + null_func,//bind_func(sys_config_...) //525 (0x20D) + null_func, //526 (0x20E) UNS + null_func, //527 (0x20F) UNS + null_func, //528 (0x210) UNS + null_func, //529 (0x211) UNS + null_func,//bind_func(sys_usbd_initialize) //530 (0x212) + null_func,//bind_func(sys_usbd_finalize) //531 (0x213) + null_func,//bind_func(sys_usbd_get_device_list) //532 (0x214) + null_func,//bind_func(sys_usbd_get_descriptor_size) //533 (0x215) + null_func,//bind_func(sys_usbd_get_descriptor) //534 (0x216) + null_func,//bind_func(sys_usbd_register_ldd) //535 (0x217) + null_func,//bind_func(sys_usbd_unregister_ldd) //536 (0x218) + null_func,//bind_func(sys_usbd_open_pipe) //537 (0x219) + null_func,//bind_func(sys_usbd_open_default_pipe) //538 (0x21A) + null_func,//bind_func(sys_usbd_close_pipe) //539 (0x21B) + null_func,//bind_func(sys_usbd_receive_event) //540 (0x21C) + null_func,//bind_func(sys_usbd_detect_event) //541 (0x21D) + null_func,//bind_func(sys_usbd_attach) //542 (0x21E) + null_func,//bind_func(sys_usbd_transfer_data) //543 (0x21F) + null_func,//bind_func(sys_usbd_isochronous_transfer_data) //544 (0x220) + null_func,//bind_func(sys_usbd_get_transfer_status) //545 (0x221) + null_func,//bind_func(sys_usbd_get_isochronous_transfer_status) //546 (0x222) + null_func,//bind_func(sys_usbd_get_device_location) //547 (0x223) + null_func,//bind_func(sys_usbd_send_event) //548 (0x224) + null_func,//bind_func(sys_ubsd_...) //549 (0x225) + null_func,//bind_func(sys_usbd_allocate_memory) //550 (0x226) + null_func,//bind_func(sys_usbd_free_memory) //551 (0x227) + null_func,//bind_func(sys_ubsd_...) //552 (0x228) + null_func,//bind_func(sys_ubsd_...) //553 (0x229) + null_func,//bind_func(sys_ubsd_...) //554 (0x22A) + null_func,//bind_func(sys_ubsd_...) //555 (0x22B) + null_func,//bind_func(sys_usbd_get_device_speed) //556 (0x22C) + null_func,//bind_func(sys_ubsd_...) //557 (0x22D) + null_func,//bind_func(sys_ubsd_...) //558 (0x22E) + null_func,//bind_func(sys_usbd_register_extra_ldd) //559 (0x22F) + null_func,//bind_func(sys_...) //560 (0x230) ROOT + null_func,//bind_func(sys_...) //561 (0x231) ROOT + null_func,//bind_func(sys_...) //562 (0x232) ROOT + null_func,//bind_func(sys_...) //563 (0x233) + null_func,//bind_func(sys_...) //564 (0x234) + null_func,//bind_func(sys_...) //565 (0x235) + null_func,//bind_func(sys_...) //566 (0x236) + null_func,//bind_func(sys_...) //567 (0x237) + null_func,//bind_func(sys_...) //568 (0x238) + null_func,//bind_func(sys_...) //569 (0x239) + null_func,//bind_func(sys_...) //570 (0x23A) + null_func,//bind_func(sys_pad_ldd_unregister_controller) //571 (0x23B) + null_func,//bind_func(sys_pad_ldd_data_insert) //572 (0x23C) + null_func,//bind_func(sys_pad_dbg_ldd_set_data_insert_mode) //573 (0x23D) + null_func,//bind_func(sys_pad_ldd_register_controller) //574 (0x23E) + null_func,//bind_func(sys_pad_ldd_get_port_no) //575 (0x23F) + null_func, //576 (0x240) UNS + null_func,//bind_func(sys_pad_manager_...) //577 (0x241) ROOT PM + null_func,//bind_func(sys_bluetooth_...) //578 (0x242) + null_func,//bind_func(sys_bluetooth_...) //579 (0x243) + null_func,//bind_func(sys_bluetooth_...) //580 (0x244) ROOT + null_func,//bind_func(sys_bluetooth_...) //581 (0x245) ROOT + null_func,//bind_func(sys_bluetooth_...) //582 (0x246) ROOT + null_func,//bind_func(sys_bluetooth_...) //583 (0x247) ROOT + null_func,//bind_func(sys_bluetooth_...) //584 (0x248) ROOT + null_func,//bind_func(sys_bluetooth_...) //585 (0x249) + null_func,//bind_func(sys_bluetooth_...) //586 (0x24A) + null_func,//bind_func(sys_bluetooth_...) //587 (0x24B) ROOT + null_func,//bind_func(sys_bluetooth_...) //588 (0x24C) + null_func,//bind_func(sys_bluetooth_...) //589 (0x24D) + null_func,//bind_func(sys_bluetooth_...) //590 (0x24E) ROOT + null_func,//bind_func(sys_bluetooth_...) //591 (0x24F) + null_func,//bind_func(sys_bluetooth_...) //592 (0x250) + null_func,//bind_func(sys_bluetooth_...) //593 (0x251) ROOT + null_func,//bind_func(sys_bluetooth_...) //594 (0x252) + null_func,//bind_func(sys_bluetooth_...) //595 (0x253) + null_func,//bind_func(sys_bluetooth_...) //596 (0x254) + null_func,//bind_func(sys_bluetooth_...) //597 (0x255) + null_func,//bind_func(sys_bluetooth_...) //598 (0x256) ROOT + null_func,//bind_func(sys_bluetooth_...) //599 (0x257) ROOT + null_func,//bind_func(sys_storage_open) //600 (0x258) ROOT + null_func,//bind_func(sys_storage_close) //601 (0x259) + null_func,//bind_func(sys_storage_read) //602 (0x25A) + null_func,//bind_func(sys_storage_write) //603 (0x25B) + null_func,//bind_func(sys_storage_send_device_command) //604 (0x25C) + null_func,//bind_func(sys_storage_async_configure) //605 (0x25D) + null_func,//bind_func(sys_storage_async_read) //606 (0x25E) + null_func,//bind_func(sys_storage_async_write) //607 (0x25F) + null_func,//bind_func(sys_storage_async_cancel) //608 (0x260) + null_func,//bind_func(sys_storage_get_device_info) //609 (0x261) ROOT + null_func,//bind_func(sys_storage_get_device_config) //610 (0x262) ROOT + null_func,//bind_func(sys_storage_report_devices) //611 (0x263) ROOT + null_func,//bind_func(sys_storage_configure_medium_event) //612 (0x264) ROOT + null_func,//bind_func(sys_storage_set_medium_polling_interval) //613 (0x265) + null_func,//bind_func(sys_storage_create_region) //614 (0x266) + null_func,//bind_func(sys_storage_delete_region) //615 (0x267) + null_func,//bind_func(sys_storage_execute_device_command) //616 (0x268) + null_func,//bind_func(sys_storage_check_region_acl) //617 (0x269) + null_func,//bind_func(sys_storage_set_region_acl) //618 (0x26A) + null_func,//bind_func(sys_storage_async_send_device_command) //619 (0x26B) + null_func,//bind_func(sys_...) //620 (0x26C) ROOT + null_func,//bind_func(sys_gamepad_ycon_if) //621 (0x26D) + null_func,//bind_func(sys_storage_get_region_offset) //622 (0x26E) + null_func,//bind_func(sys_storage_set_emulated_speed) //623 (0x26F) + null_func,//bind_func(sys_io_buffer_create) //624 (0x270) + null_func,//bind_func(sys_io_buffer_destroy) //625 (0x271) + null_func,//bind_func(sys_io_buffer_allocate) //626 (0x272) + null_func,//bind_func(sys_io_buffer_free) //627 (0x273) + null_func, //628 (0x274) UNS + null_func, //629 (0x275) UNS + null_func,//bind_func(sys_gpio_set) //630 (0x276) + null_func,//bind_func(sys_gpio_get) //631 (0x277) + null_func, //632 (0x278) UNS + null_func,//bind_func(sys_fsw_connect_event) //633 (0x279) + null_func,//bind_func(sys_fsw_disconnect_event) //634 (0x27A) + null_func,//bind_func(sys_btsetting_if) //635 (0x27B) + null_func,//bind_func(sys_...) //636 (0x27C) + null_func,//bind_func(sys_...) //637 (0x27D) + null_func,//bind_func(sys_...) //638 (0x27E) - null_func, null_func, null_func, null_func, null_func, //504 - null_func, null_func, null_func, null_func, null_func, //509 - null_func, null_func, null_func, null_func, null_func, //514 - null_func, null_func, null_func, null_func, null_func, //519 - null_func, null_func, null_func, null_func, null_func, //524 - null_func, null_func, null_func, null_func, null_func, //529 - null_func, null_func, null_func, null_func, null_func, //534 - null_func, null_func, null_func, null_func, null_func, //539 - null_func, null_func, null_func, null_func, null_func, //544 - null_func, null_func, null_func, null_func, null_func, //549 - null_func, null_func, null_func, null_func, null_func, //554 - null_func, null_func, null_func, null_func, null_func, //559 - null_func, null_func, null_func, null_func, null_func, //564 - null_func, null_func, null_func, null_func, null_func, //569 - null_func, null_func, null_func, null_func, null_func, //574 - null_func, null_func, null_func, null_func, null_func, //579 - null_func, null_func, null_func, null_func, null_func, //584 - null_func, null_func, null_func, null_func, null_func, //589 - null_func, null_func, null_func, null_func, null_func, //594 - null_func, null_func, null_func, null_func, null_func, //599 - null_func, null_func, null_func, null_func, null_func, //604 - null_func, null_func, null_func, null_func, null_func, //609 - null_func, null_func, null_func, null_func, null_func, //614 - null_func, null_func, null_func, null_func, null_func, //619 - null_func, null_func, null_func, null_func, null_func, //624 - null_func, null_func, null_func, null_func, null_func, //629 - null_func, null_func, null_func, null_func, null_func, //634 - null_func, null_func, null_func, null_func, null_func, //639 - null_func, null_func, null_func, null_func, null_func, //644 - null_func, null_func, null_func, null_func, null_func, //649 - null_func, null_func, null_func, null_func, null_func, //654 - null_func, null_func, null_func, null_func, null_func, //659 - null_func, null_func, null_func, null_func, null_func, //664 - null_func, //665 + null_func, //639 DEPRECATED + null_func, null_func, null_func, null_func, null_func, //644 DEPRECATED + null_func, null_func, null_func, null_func, null_func, //649 DEPRECATED + + null_func,//bind_func(sys_rsxaudio_initialize) //650 (0x28A) + null_func,//bind_func(sys_rsxaudio_finalize) //651 (0x28B) + null_func,//bind_func(sys_rsxaudio_import_shared_memory) //652 (0x28C) + null_func,//bind_func(sys_rsxaudio_unimport_shared_memory) //653 (0x28D) + null_func,//bind_func(sys_rsxaudio_create_connection) //654 (0x28E) + null_func,//bind_func(sys_rsxaudio_close_connection) //655 (0x28F) + null_func,//bind_func(sys_rsxaudio_prepare_process) //656 (0x290) + null_func,//bind_func(sys_rsxaudio_start_process) //657 (0x291) + null_func,//bind_func(sys_rsxaudio_) //658 (0x292) + null_func,//bind_func(sys_rsxaudio_) //659 (0x293) + + null_func, null_func, null_func, null_func, null_func, //664 UNS + null_func, //665 UNS bind_func(sys_rsx_device_open), //666 (0x29A) bind_func(sys_rsx_device_close), //667 (0x29B) @@ -410,33 +609,71 @@ static func_caller* sc_table[kSyscallTableLength] = bind_func(sys_rsx_device_map), //675 (0x2A3) bind_func(sys_rsx_device_unmap), //676 (0x2A4) bind_func(sys_rsx_attribute), //677 (0x2A5) - null_func, //678 (0x2A6) - null_func, //679 (0x2A7) ROOT + null_func,//bind_func(sys_...) //678 (0x2A6) + null_func,//bind_func(sys_...) //679 (0x2A7) ROOT + null_func,//bind_func(sys_...) //680 (0x2A8) ROOT + null_func,//bind_func(sys_...) //681 (0x2A9) ROOT + null_func,//bind_func(sys_...) //682 (0x2AA) ROOT + null_func,//bind_func(sys_...) //683 (0x2AB) ROOT + null_func,//bind_func(sys_...) //684 (0x2AC) ROOT + null_func,//bind_func(sys_...) //685 (0x2AD) ROOT + null_func,//bind_func(sys_...) //686 (0x2AE) ROOT + null_func,//bind_func(sys_...) //687 (0x2AF) ROOT + null_func,//bind_func(sys_...) //688 (0x2B0) ROOT + null_func,//bind_func(sys_...) //689 (0x2B1) ROOT + null_func,//bind_func(sys_...) //690 (0x2B2) ROOT + null_func,//bind_func(sys_...) //691 (0x2B3) ROOT + null_func,//bind_func(sys_...) //692 (0x2B4) ROOT + null_func,//bind_func(sys_...) //693 (0x2B5) ROOT + null_func,//bind_func(sys_...) //694 (0x2B6) DEPRECATED + null_func,//bind_func(sys_...) //695 (0x2B7) DEPRECATED + null_func,//bind_func(sys_...) //696 (0x2B8) ROOT + null_func,//bind_func(sys_...) //697 (0x2B9) UNS + null_func,//bind_func(sys_...) //698 (0x2BA) UNS + null_func,//bind_func(sys_bdemu_send_command) //699 (0x2BB) + null_func,//bind_func(sys_net_bnet_accept) //700 (0x2BC) + null_func,//bind_func(sys_net_bnet_bind) //701 (0x2BD) + null_func,//bind_func(sys_net_bnet_connect) //702 (0x2BE) + null_func,//bind_func(sys_net_bnet_getpeername) //703 (0x2BF) + null_func,//bind_func(sys_net_bnet_getsockname) //704 (0x2C0) + null_func,//bind_func(sys_net_bnet_getsockopt) //705 (0x2C1) + null_func,//bind_func(sys_net_bnet_listen) //706 (0x2C2) + null_func,//bind_func(sys_net_bnet_recvfrom) //707 (0x2C3) + null_func,//bind_func(sys_net_bnet_recvmsg) //708 (0x2C4) + null_func,//bind_func(sys_net_bnet_sendmsg) //709 (0x2C5) + null_func,//bind_func(sys_net_bnet_sendto) //710 (0x2C6) + null_func,//bind_func(sys_net_bnet_setsockop) //711 (0x2C7) + null_func,//bind_func(sys_net_bnet_shutdown) //712 (0x2C8) + null_func,//bind_func(sys_net_bnet_socket) //713 (0x2C9) + null_func,//bind_func(sys_net_bnet_close) //714 (0x2CA) + null_func,//bind_func(sys_net_bnet_poll) //715 (0x2CB) + null_func,//bind_func(sys_net_bnet_select) //716 (0x2CC) + null_func,//bind_func(sys_net_open_dump) //717 (0x2CD) + null_func,//bind_func(sys_net_read_dump) //718 (0x2CE) + null_func,//bind_func(sys_net_close_dump) //719 (0x2CF) + null_func,//bind_func(sys_net_write_dump) //720 (0x2D0) + null_func,//bind_func(sys_net_abort) //721 (0x2D1) + null_func,//bind_func(sys_net_infoctl) //722 (0x2D2) + null_func,//bind_func(sys_net_control) //723 (0x2D3) + null_func,//bind_func(sys_net_bnet_ioctl) //724 (0x2D4) + null_func,//bind_func(sys_net_bnet_sysctl) //725 (0x2D5) + null_func,//bind_func(sys_net_eurus_post_command) //726 (0x2D6) - null_func, null_func, null_func, null_func, null_func, //684 - null_func, null_func, null_func, null_func, null_func, //689 - null_func, null_func, null_func, null_func, null_func, //694 - null_func, null_func, null_func, null_func, null_func, //699 - null_func, null_func, null_func, null_func, null_func, //704 - null_func, null_func, null_func, null_func, null_func, //709 - null_func, null_func, null_func, null_func, null_func, //714 - null_func, null_func, null_func, null_func, null_func, //719 - null_func, null_func, null_func, null_func, null_func, //724 - null_func, null_func, null_func, null_func, null_func, //729 - null_func, null_func, null_func, null_func, null_func, //734 - null_func, null_func, null_func, null_func, null_func, //739 - null_func, null_func, null_func, null_func, null_func, //744 - null_func, null_func, null_func, null_func, null_func, //749 - null_func, null_func, null_func, null_func, null_func, //754 - null_func, null_func, null_func, null_func, null_func, //759 - null_func, null_func, null_func, null_func, null_func, //764 - null_func, null_func, null_func, null_func, null_func, //769 - null_func, null_func, null_func, null_func, null_func, //774 - null_func, null_func, null_func, null_func, null_func, //779 - null_func, null_func, null_func, null_func, null_func, //784 - null_func, null_func, null_func, null_func, null_func, //789 - null_func, null_func, null_func, null_func, null_func, //794 - null_func, null_func, null_func, null_func, null_func, //799 + null_func, null_func, null_func, //729 UNS + null_func, null_func, null_func, null_func, null_func, //734 UNS + null_func, null_func, null_func, null_func, null_func, //739 UNS + null_func, null_func, null_func, null_func, null_func, //744 UNS + null_func, null_func, null_func, null_func, null_func, //749 UNS + null_func, null_func, null_func, null_func, null_func, //754 UNS + null_func, null_func, null_func, null_func, null_func, //759 UNS + null_func, null_func, null_func, null_func, null_func, //764 UNS + null_func, null_func, null_func, null_func, null_func, //769 UNS + null_func, null_func, null_func, null_func, null_func, //774 UNS + null_func, null_func, null_func, null_func, null_func, //779 UNS + null_func, null_func, null_func, null_func, null_func, //784 UNS + null_func, null_func, null_func, null_func, null_func, //789 UNS + null_func, null_func, null_func, null_func, null_func, //794 UNS + null_func, null_func, null_func, null_func, null_func, //799 UNS null_func,//bind_func(sys_fs_test), //800 (0x320) bind_func(cellFsOpen), //801 (0x321) @@ -487,42 +724,148 @@ static func_caller* sc_table[kSyscallTableLength] = null_func,//bind_func(sys_fs_mapped_free), //846 (0x34E) null_func,//bind_func(sys_fs_truncate2), //847 (0x34F) - null_func, null_func, //849 - null_func, null_func, null_func, null_func, null_func, //854 - null_func, null_func, null_func, null_func, null_func, //859 - null_func, null_func, null_func, null_func, null_func, //864 - null_func, null_func, null_func, null_func, null_func, //869 - null_func, null_func, null_func, null_func, null_func, //874 - null_func, null_func, null_func, null_func, null_func, //879 - null_func, null_func, null_func, null_func, null_func, //884 - null_func, null_func, null_func, null_func, null_func, //889 - null_func, null_func, null_func, null_func, null_func, //894 - null_func, null_func, null_func, null_func, null_func, //899 - null_func, null_func, null_func, null_func, null_func, //904 - null_func, null_func, null_func, null_func, null_func, //909 - null_func, null_func, null_func, null_func, null_func, //914 - null_func, null_func, null_func, null_func, null_func, //919 - null_func, null_func, null_func, null_func, null_func, //924 - null_func, null_func, null_func, null_func, null_func, //929 - null_func, null_func, null_func, null_func, null_func, //934 - null_func, null_func, null_func, null_func, null_func, //939 - null_func, null_func, null_func, null_func, null_func, //944 - null_func, null_func, null_func, null_func, null_func, //949 - null_func, null_func, null_func, null_func, null_func, //954 - null_func, null_func, null_func, null_func, null_func, //959 - null_func, null_func, null_func, null_func, null_func, //964 - null_func, null_func, null_func, null_func, null_func, //969 - null_func, null_func, null_func, null_func, null_func, //974 - null_func, null_func, null_func, null_func, null_func, //979 - null_func, null_func, null_func, null_func, null_func, //984 - null_func, null_func, null_func, null_func, null_func, //989 - null_func, null_func, null_func, null_func, null_func, //994 - null_func, null_func, null_func, null_func, null_func, //999 - null_func, null_func, null_func, null_func, null_func, //1004 - null_func, null_func, null_func, null_func, null_func, //1009 - null_func, null_func, null_func, null_func, null_func, //1014 - null_func, null_func, null_func, null_func, null_func, //1019 - null_func, null_func, null_func, bind_func(cellGcmCallback), //1023 + null_func, null_func, //849 UNS + null_func, null_func, null_func, null_func, null_func, //854 UNS + null_func, null_func, null_func, null_func, null_func, //859 UNS + + null_func,//bind_func(syscall_sys_ss_get_cache_of_analog_sunset_flag), //860 (0x35C) AUTHID + null_func,//bind_func(syscall_...) //861 ROOT + null_func,//bind_func(syscall_...) //862 ROOT + null_func,//bind_func(syscall_...) //863 ROOT + null_func,//bind_func(syscall_...) //864 DBG + null_func,//bind_func(sys_ss_random_number_generator), //865 (0x361) ROOT AUTHID + null_func,//bind_func(sys_...) //866 ROOT + null_func,//bind_func(sys_...) //867 ROOT + null_func,//bind_func(sys_...) //868 ROOT / DBG AUTHID + null_func,//bind_func(sys_...) //869 ROOT + null_func,//bind_func(sys_ss_get_console_id), //870 (0x366) + null_func,//bind_func(sys_ss_access_control_engine), //871 (0x367) DBG + null_func,//bind_func(sys_ss_get_open_psid), //872 (0x368) + null_func,//bind_func(sys_ss_get_cache_of_product_mode), //873 (0x369) + null_func,//bind_func(sys_ss_get_cache_of_flash_ext_flag), //874 (0x36A) + null_func,//bind_func(sys_ss_get_boot_device) //875 (0x36B) + null_func,//bind_func(sys_ss_disc_access_control) //876 (0x36C) + null_func,//bind_func(sys_ss_~utoken_if) //877 (0x36D) ROOT + null_func,//bind_func(sys_ss_ad_sign) //878 (0x36E) + null_func,//bind_func(sys_ss_media_id) //879 (0x36F) + null_func,//bind_func(sys_deci3_open) //880 (0x370) + null_func,//bind_func(sys_deci3_create_event_path) //881 (0x371) + null_func,//bind_func(sys_deci3_close) //882 (0x372) + null_func,//bind_func(sys_deci3_send) //883 (0x373) + null_func,//bind_func(sys_deci3_receive) //884 (0x374) + null_func,//bind_func(sys_deci3_open2) //885 (0x375) + null_func, //886 (0x376) UNS + null_func, //887 (0x377) UNS + null_func, //888 (0x378) UNS + null_func,//bind_func(sys_...) //889 (0x379) ROOT + null_func,//bind_func(sys_deci3_initialize) //890 (0x37A) + null_func,//bind_func(sys_deci3_terminate) //891 (0x37B) + null_func,//bind_func(sys_deci3_debug_mode) //892 (0x37C) + null_func,//bind_func(sys_deci3_show_status) //893 (0x37D) + null_func,//bind_func(sys_deci3_echo_test) //894 (0x37E) + null_func,//bind_func(sys_deci3_send_dcmp_packet) //895 (0x37F) + null_func,//bind_func(sys_deci3_dump_cp_register) //896 (0x380) + null_func,//bind_func(sys_deci3_dump_cp_buffer) //897 (0x381) + null_func, //898 (0x382) UNS + null_func,//bind_func(sys_deci3_test) //899 (0x383) + null_func,//bind_func(sys_dbg_stop_processes) //900 (0x384) + null_func,//bind_func(sys_dbg_continue_processes) //901 (0x385) + null_func,//bind_func(sys_dbg_stop_threads) //902 (0x386) + null_func,//bind_func(sys_dbg_continue_threads) //903 (0x387) + null_func,//bind_func(sys_dbg_read_process_memory) //904 (0x388) + null_func,//bind_func(sys_dbg_write_process_memory) //905 (0x389) + null_func,//bind_func(sys_dbg_read_thread_register) //906 (0x38A) + null_func,//bind_func(sys_dbg_write_thread_register) //907 (0x38B) + null_func,//bind_func(sys_dbg_get_process_list) //908 (0x38C) + null_func,//bind_func(sys_dbg_get_thread_list) //909 (0x38D) + null_func,//bind_func(sys_dbg_get_thread_info) //910 (0x38E) + null_func,//bind_func(sys_dbg_spu_thread_read_from_ls) //911 (0x38F) + null_func,//bind_func(sys_dbg_spu_thread_write_to_ls) //912 (0x390) + null_func,//bind_func(sys_dbg_kill_process) //913 (0x391) + null_func,//bind_func(sys_dbg_get_process_info) //914 (0x392) + null_func,//bind_func(sys_dbg_set_run_control_bit_to_spu) //915 (0x393) + null_func,//bind_func(sys_dbg_spu_thread_get_exception_cause) //916 (0x394) + null_func,//bind_func(sys_dbg_create_kernel_event_queue) //917 (0x395) + null_func,//bind_func(sys_dbg_read_kernel_event_queue) //918 (0x396) + null_func,//bind_func(sys_dbg_destroy_kernel_event_queue) //919 (0x397) + null_func,//bind_func(sys_dbg_get_process_event_ctrl_flag) //920 (0x398) + null_func,//bind_func(sys_dbg_set_process_event_cntl_flag) //921 (0x399) + null_func,//bind_func(sys_dbg_get_spu_thread_group_event_cntl_flag) //922 (0x39A) + null_func,//bind_func(sys_dbg_set_spu_thread_group_event_cntl_flag) //923 (0x39B) + null_func,//bind_func(sys_...) //924 (0x39C) + null_func,//bind_func(sys_dbg_get_raw_spu_list) //925 (0x39D) + null_func,//bind_func(sys_...) //926 (0x39E) + null_func,//bind_func(sys_...) //927 (0x3A0) + null_func,//bind_func(sys_...) //928 (0x3A1) + null_func,//bind_func(sys_...) //929 (0x3A2) + null_func,//bind_func(sys_...) //930 (0x3A3) + null_func,//bind_func(sys_...) //931 (0x3A4) + null_func,//bind_func(sys_dbg_get_mutex_list) //932 (0x3A4) + null_func,//bind_func(sys_dbg_get_mutex_information) //933 (0x3A5) + null_func,//bind_func(sys_dbg_get_cond_list) //934 (0x3A6) + null_func,//bind_func(sys_dbg_get_cond_information) //935 (0x3A7) + null_func,//bind_func(sys_dbg_get_rwlock_list) //936 (0x3A8) + null_func,//bind_func(sys_dbg_get_rwlock_information) //937 (0x3A9) + null_func,//bind_func(sys_dbg_get_lwmutex_list) //938 (0x3AA) + null_func,//bind_func(sys_dbg_get_address_from_dabr) //939 (0x3AB) + null_func,//bind_func(sys_dbg_set_address_to_dabr) //940 (0x3AC) + null_func,//bind_func(sys_dbg_get_lwmutex_information) //941 (0x3AD) + null_func,//bind_func(sys_dbg_get_event_queue_list) //942 (0x3AE) + null_func,//bind_func(sys_dbg_get_event_queue_information) //943 (0x3AF) + null_func,//bind_func(sys_dbg_initialize_ppu_exception_handler) //944 (0x3B0) + null_func,//bind_func(sys_dbg_finalize_ppu_exception_handler) //945 (0x3B1) DBG + null_func,//bind_func(sys_dbg_get_semaphore_list) //946 (0x3B2) + null_func,//bind_func(sys_dbg_get_semaphore_information) //947 (0x3B3) + null_func,//bind_func(sys_dbg_get_kernel_thread_list) //948 (0x3B4) + null_func,//bind_func(sys_dbg_get_kernel_thread_info) //949 (0x3B5) + null_func,//bind_func(sys_dbg_get_lwcond_list) //950 (0x3B6) + null_func,//bind_func(sys_dbg_get_lwcond_information) //951 (0x3B7) + null_func,//bind_func(sys_dbg_create_scratch_data_area_ext) //952 (0x3B8) + null_func,//bind_func(sys_dbg_vm_get_page_information) //953 (0x3B9) + null_func,//bind_func(sys_dbg_vm_get_info) //954 (0x3BA) + null_func,//bind_func(sys_dbg_enable_floating_point_enabled_exception) //955 (0x3BB) + null_func,//bind_func(sys_dbg_disable_floating_point_enabled_exception) //956 (0x3BC) + null_func,//bind_func(sys_dbg_...) //957 (0x3BD) DBG + null_func, //958 (0x3BE) UNS + null_func,//bind_func(sys_dbg_...) //959 (0x3BF) + null_func,//bind_func(sys_dbg_perfomance_monitor) //960 (0x3C0) + null_func,//bind_func(sys_dbg_...) //961 (0x3C1) + null_func,//bind_func(sys_dbg_...) //962 (0x3C2) + null_func,//bind_func(sys_dbg_...) //963 (0x3C3) + null_func,//bind_func(sys_dbg_...) //964 (0x3C4) + null_func,//bind_func(sys_dbg_...) //965 (0x3C5) + null_func,//bind_func(sys_dbg_...) //966 (0x3C6) + null_func,//bind_func(sys_dbg_...) //967 (0x3C7) + null_func,//bind_func(sys_dbg_...) //968 (0x3C8) + null_func,//bind_func(sys_dbg_...) //969 (0x3C9) + null_func,//bind_func(sys_dbg_get_event_flag_list) //970 (0x3CA) + null_func,//bind_func(sys_dbg_get_event_flag_information) //971 (0x3CB) + null_func,//bind_func(sys_dbg_...) //972 (0x3CC) + null_func,//bind_func(sys_dbg_...) //973 (0x3CD) + null_func,//bind_func(sys_dbg_...) //974 (0x3CE) + null_func,//bind_func(sys_dbg_read_spu_thread_context2) //975 (0x3CF) + null_func,//bind_func(sys_dbg_...) //976 (0x3D0) + null_func,//bind_func(sys_dbg_...) //977 (0x3D1) + null_func,//bind_func(sys_dbg_...) //978 (0x3D2) ROOT + null_func,//bind_func(sys_dbg_...) //979 (0x3D3) + null_func,//bind_func(sys_dbg_...) //980 (0x3D4) + null_func,//bind_func(sys_dbg_...) //981 (0x3D5) ROOT + null_func,//bind_func(sys_dbg_...) //982 (0x3D6) + null_func,//bind_func(sys_dbg_...) //983 (0x3D7) + null_func,//bind_func(sys_dbg_...) //984 (0x3D8) + null_func,//bind_func(sys_dbg_get_console_type) //985 (0x3D9) ROOT + null_func,//bind_func(sys_dbg_...) //986 (0x3DA) ROOT DBG + null_func,//bind_func(sys_dbg_...) //987 (0x3DB) ROOT + null_func,//bind_func(sys_dbg_..._ppu_exception_handler) //988 (0x3DC) + null_func,//bind_func(sys_dbg_...) //989 (0x3DD) + + null_func, null_func, null_func, null_func, null_func, //994 UNS + null_func, null_func, null_func, null_func, null_func, //999 UNS + null_func, null_func, null_func, null_func, null_func, //1004 UNS + null_func, null_func, null_func, null_func, null_func, //1009 UNS + null_func, null_func, null_func, null_func, null_func, //1014 UNS + null_func, null_func, null_func, null_func, null_func, //1019 UNS + null_func, null_func, null_func, bind_func(cellGcmCallback), //1023 UNS }; /** HACK: Used to delete func_caller objects that get allocated and stored in sc_table (above). diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index cfb31964fc..0b5741fae2 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -66,4 +66,4 @@ typedef int64_t s64; #include "Utilities/IdManager.h" #define _PRGNAME_ "RPCS3" -#define _PRGVER_ "0.0.0.4" +#define _PRGVER_ "0.0.0.5"