N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

IPCHelper Skip method + address comments for apt

Browse source
This commit is contained in:
Lectem 2017-03-18 11:47:40 +01:00
parent 77f4fc473f
commit 12ed746477
3 changed files with 46 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/hle/ipc_helpers.h
View file

@ -28,13 +28,19 @@ public:
header.raw); header.raw);
} }
void Skip(unsigned size_in_words, bool set_to_null) {
if (set_to_null)
memset(cmdbuf + index, 0, size_in_words * sizeof(u32));
index += size_in_words;
}
/** /**
* @brief Retrieves the address of a static buffer, used when a buffer is needed for output * @brief Retrieves the address of a static buffer, used when a buffer is needed for output
* @param buffer_id The index of the static buffer * @param buffer_id The index of the static buffer
* @param data_size If non-null, will store the size of the buffer * @param data_size If non-null, will store the size of the buffer
*/ */
VAddr PeekStaticBuffer(u8 buffer_id, size_t* data_size = nullptr) const { VAddr PeekStaticBuffer(u8 buffer_id, size_t* data_size = nullptr) const {
u32* static_buffer = cmdbuf + Kernel::kStaticBuffersOffset / 4 + buffer_id * 2; u32* static_buffer = cmdbuf + Kernel::kStaticBuffersOffset / sizeof(u32) + buffer_id * 2;
if (data_size) if (data_size)
*data_size = StaticBufferDescInfo{static_buffer[0]}.size; *data_size = StaticBufferDescInfo{static_buffer[0]}.size;
return static_buffer[1]; return static_buffer[1];

74
src/core/hle/service/apt/apt.cpp
View file

@ -69,10 +69,11 @@ void Initialize(Service::Interface* self) {
void GetSharedFont(Service::Interface* self) { void GetSharedFont(Service::Interface* self) {
IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x44, 0, 0); // 0x00440000 IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x44, 0, 0); // 0x00440000
IPC::RequestBuilder rb = rp.MakeBuilder(2, 2);
if (!shared_font_mem) { if (!shared_font_mem) {
LOG_ERROR(Service_APT, "shared font file missing - go dump it from your 3ds"); LOG_ERROR(Service_APT, "shared font file missing - go dump it from your 3ds");
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
rb.Push<u32>(-1); // TODO: Find the right error code rb.Push<u32>(-1); // TODO: Find the right error code
rb.Skip(1 + 2, true);
return; return;
} }
@ -85,7 +86,6 @@ void GetSharedFont(Service::Interface* self) {
shared_font_relocated = true; shared_font_relocated = true;
} }
IPC::RequestBuilder rb = rp.MakeBuilder(2, 2);
rb.Push(RESULT_SUCCESS); // No error rb.Push(RESULT_SUCCESS); // No error
// Since the SharedMemory interface doesn't provide the address at which the memory was // Since the SharedMemory interface doesn't provide the address at which the memory was
// allocated, the real APT service calculates this address by scanning the entire address space // allocated, the real APT service calculates this address by scanning the entire address space
@ -113,10 +113,10 @@ void GetLockHandle(Service::Interface* self) {
rb.Push(RESULT_SUCCESS); // No error rb.Push(RESULT_SUCCESS); // No error
rb.Push(applet_attributes); // Applet Attributes, this value is passed to Enable. rb.Push(applet_attributes); // Applet Attributes, this value is passed to Enable.
rb.Push<u32>(0); // Least significant bit = power button state rb.Push<u32>(0); // Least significant bit = power button state
Kernel::Handle handleCopy = Kernel::g_handle_table.Create(lock).MoveFrom(); Kernel::Handle handle_copy = Kernel::g_handle_table.Create(lock).MoveFrom();
rb.PushCopyHandles(handleCopy); rb.PushCopyHandles(handle_copy);
LOG_WARNING(Service_APT, "(STUBBED) called handle=0x%08X applet_attributes=0x%08X", handleCopy, LOG_WARNING(Service_APT, "(STUBBED) called handle=0x%08X applet_attributes=0x%08X", handle_copy,
applet_attributes); applet_attributes);
} }
@ -150,14 +150,14 @@ void IsRegistered(Service::Interface* self) {
// TODO(Subv): An application is considered "registered" if it has already called APT::Enable // TODO(Subv): An application is considered "registered" if it has already called APT::Enable
// handle this properly once we implement multiprocess support. // handle this properly once we implement multiprocess support.
bool isRegistered = false; // Set to not registered by default bool is_registered = false; // Set to not registered by default
if (app_id == static_cast<u32>(AppletId::AnyLibraryApplet)) { if (app_id == static_cast<u32>(AppletId::AnyLibraryApplet)) {
isRegistered = HLE::Applets::IsLibraryAppletRunning() ? true : false; is_registered = HLE::Applets::IsLibraryAppletRunning();
} else if (auto applet = HLE::Applets::Applet::Get(static_cast<AppletId>(app_id))) { } else if (auto applet = HLE::Applets::Applet::Get(static_cast<AppletId>(app_id))) {
isRegistered = true; // Set to registered is_registered = true; // Set to registered
} }
rb.Push(isRegistered); rb.Push(is_registered);
LOG_WARNING(Service_APT, "(STUBBED) called app_id=0x%08X", app_id); LOG_WARNING(Service_APT, "(STUBBED) called app_id=0x%08X", app_id);
} }
@ -177,10 +177,9 @@ void SendParameter(Service::Interface* self) {
u32 dst_app_id = rp.Pop<u32>(); u32 dst_app_id = rp.Pop<u32>();
u32 signal_type = rp.Pop<u32>(); u32 signal_type = rp.Pop<u32>();
u32 buffer_size = rp.Pop<u32>(); u32 buffer_size = rp.Pop<u32>();
u32 value = rp.Pop<u32>(); Kernel::Handle handle = rp.PopHandle();
u32 handle = rp.Pop<u32>(); size_t size;
u32 size = rp.Pop<u32>(); VAddr buffer = rp.PopStaticBuffer(&size);
u32 buffer = rp.Pop<u32>();
std::shared_ptr<HLE::Applets::Applet> dest_applet = std::shared_ptr<HLE::Applets::Applet> dest_applet =
HLE::Applets::Applet::Get(static_cast<AppletId>(dst_app_id)); HLE::Applets::Applet::Get(static_cast<AppletId>(dst_app_id));
@ -203,11 +202,10 @@ void SendParameter(Service::Interface* self) {
rb.Push(dest_applet->ReceiveParameter(param)); rb.Push(dest_applet->ReceiveParameter(param));
LOG_WARNING( LOG_WARNING(Service_APT,
Service_APT, "(STUBBED) called src_app_id=0x%08X, dst_app_id=0x%08X, signal_type=0x%08X,"
"(STUBBED) called src_app_id=0x%08X, dst_app_id=0x%08X, signal_type=0x%08X," "buffer_size=0x%08X, handle=0x%08X, size=0x%08zX, in_param_buffer_ptr=0x%08X",
"buffer_size=0x%08X, value=0x%08X, handle=0x%08X, size=0x%08X, in_param_buffer_ptr=0x%08X", src_app_id, dst_app_id, signal_type, buffer_size, handle, size, buffer);
src_app_id, dst_app_id, signal_type, buffer_size, value, handle, size, buffer);
} }
void ReceiveParameter(Service::Interface* self) { void ReceiveParameter(Service::Interface* self) {
@ -218,8 +216,9 @@ void ReceiveParameter(Service::Interface* self) {
size_t static_buff_size; size_t static_buff_size;
VAddr buffer = rp.PeekStaticBuffer(0, &static_buff_size); VAddr buffer = rp.PeekStaticBuffer(0, &static_buff_size);
if (buffer_size > static_buff_size) if (buffer_size > static_buff_size)
LOG_WARNING(Service_APT, "ReceiveParameter: buffer_size is bigger than the size in the " LOG_WARNING(Service_APT,
"buffer descriptor (0x%08X > 0x%08X)", "ReceiveParameter: buffer_size is bigger than the size in the "
"buffer descriptor (0x%08X > 0x%08zX)",
buffer_size, static_buff_size); buffer_size, static_buff_size);
IPC::RequestBuilder rb = rp.MakeBuilder(4, 4); IPC::RequestBuilder rb = rp.MakeBuilder(4, 4);
@ -236,7 +235,7 @@ void ReceiveParameter(Service::Interface* self) {
Memory::WriteBlock(buffer, next_parameter.buffer.data(), next_parameter.buffer.size()); Memory::WriteBlock(buffer, next_parameter.buffer.data(), next_parameter.buffer.size());
LOG_WARNING(Service_APT, "called app_id=0x%08X, buffer_size=0x%08X", app_id, buffer_size); LOG_WARNING(Service_APT, "called app_id=0x%08X, buffer_size=0x%08zX", app_id, buffer_size);
} }
void GlanceParameter(Service::Interface* self) { void GlanceParameter(Service::Interface* self) {
@ -247,8 +246,9 @@ void GlanceParameter(Service::Interface* self) {
size_t static_buff_size; size_t static_buff_size;
VAddr buffer = rp.PeekStaticBuffer(0, &static_buff_size); VAddr buffer = rp.PeekStaticBuffer(0, &static_buff_size);
if (buffer_size > static_buff_size) if (buffer_size > static_buff_size)
LOG_WARNING(Service_APT, "ReceiveParameter: buffer_size is bigger than the size in the " LOG_WARNING(Service_APT,
"buffer descriptor (0x%08X > 0x%08X)", "ReceiveParameter: buffer_size is bigger than the size in the "
"buffer descriptor (0x%08X > 0x%08zX)",
buffer_size, static_buff_size); buffer_size, static_buff_size);
IPC::RequestBuilder rb = rp.MakeBuilder(4, 4); IPC::RequestBuilder rb = rp.MakeBuilder(4, 4);
@ -265,7 +265,7 @@ void GlanceParameter(Service::Interface* self) {
Memory::WriteBlock(buffer, next_parameter.buffer.data(), next_parameter.buffer.size()); Memory::WriteBlock(buffer, next_parameter.buffer.data(), next_parameter.buffer.size());
LOG_WARNING(Service_APT, "called app_id=0x%08X, buffer_size=0x%08X", app_id, buffer_size); LOG_WARNING(Service_APT, "called app_id=0x%08X, buffer_size=0x%08zX", app_id, buffer_size);
} }
void CancelParameter(Service::Interface* self) { void CancelParameter(Service::Interface* self) {
@ -285,7 +285,7 @@ void CancelParameter(Service::Interface* self) {
} }
void PrepareToStartApplication(Service::Interface* self) { void PrepareToStartApplication(Service::Interface* self) {
IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x00150140); IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x15, 5, 0); // 0x00150140
u32 title_info1 = rp.Pop<u32>(); u32 title_info1 = rp.Pop<u32>();
u32 title_info2 = rp.Pop<u32>(); u32 title_info2 = rp.Pop<u32>();
u32 title_info3 = rp.Pop<u32>(); u32 title_info3 = rp.Pop<u32>();
@ -306,26 +306,26 @@ void PrepareToStartApplication(Service::Interface* self) {
} }
void StartApplication(Service::Interface* self) { void StartApplication(Service::Interface* self) {
IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x001B00C4); IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x1B, 3, 4); // 0x001B00C4
u32 buffer1_size = rp.Pop<u32>(); u32 buffer1_size = rp.Pop<u32>();
u32 buffer2_size = rp.Pop<u32>(); u32 buffer2_size = rp.Pop<u32>();
u32 flag = rp.Pop<u32>(); u32 flag = rp.Pop<u32>();
u32 size1 = rp.Pop<u32>(); size_t size1;
u32 buffer1_ptr = rp.Pop<u32>(); VAddr buffer1_ptr = rp.PopStaticBuffer(&size1);
u32 size2 = rp.Pop<u32>(); size_t size2;
u32 buffer2_ptr = rp.Pop<u32>(); VAddr buffer2_ptr = rp.PopStaticBuffer(&size2);
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
rb.Push(RESULT_SUCCESS); // No error rb.Push(RESULT_SUCCESS); // No error
LOG_WARNING(Service_APT, LOG_WARNING(Service_APT,
"(STUBBED) called buffer1_size=0x%08X, buffer2_size=0x%08X, flag=0x%08X," "(STUBBED) called buffer1_size=0x%08X, buffer2_size=0x%08X, flag=0x%08X,"
"size1=0x%08X, buffer1_ptr=0x%08X, size2=0x%08X, buffer2_ptr=0x%08X", "size1=0x%08zX, buffer1_ptr=0x%08X, size2=0x%08zX, buffer2_ptr=0x%08X",
buffer1_size, buffer2_size, flag, size1, buffer1_ptr, size2, buffer2_ptr); buffer1_size, buffer2_size, flag, size1, buffer1_ptr, size2, buffer2_ptr);
} }
void AppletUtility(Service::Interface* self) { void AppletUtility(Service::Interface* self) {
IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x004B00C2); IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x4B, 3, 2); // 0x004B00C2
// These are from 3dbrew - I'm not really sure what they're used for. // These are from 3dbrew - I'm not really sure what they're used for.
u32 utility_command = rp.Pop<u32>(); u32 utility_command = rp.Pop<u32>();
@ -438,7 +438,7 @@ void CancelLibraryApplet(Service::Interface* self) {
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
rb.Push<u32>(1); rb.Push<u32>(1);
LOG_WARNING(Service_APT, "(STUBBED) called exiting=%u", exiting); LOG_WARNING(Service_APT, "(STUBBED) called exiting=%d", exiting);
} }
void SetScreenCapPostPermission(Service::Interface* self) { void SetScreenCapPostPermission(Service::Interface* self) {
@ -501,8 +501,9 @@ void GetStartupArgument(Service::Interface* self) {
size_t static_buff_size; size_t static_buff_size;
VAddr addr = rp.PeekStaticBuffer(0, &static_buff_size); VAddr addr = rp.PeekStaticBuffer(0, &static_buff_size);
if (parameter_size > static_buff_size) if (parameter_size > static_buff_size)
LOG_WARNING(Service_APT, "GetStartupArgument: parameter_size is bigger than the size in " LOG_WARNING(Service_APT,
"the buffer descriptor (0x%08X > 0x%08X)", "GetStartupArgument: parameter_size is bigger than the size in "
"the buffer descriptor (0x%08X > 0x%08zX)",
parameter_size, static_buff_size); parameter_size, static_buff_size);
if (addr && parameter_size) { if (addr && parameter_size) {
@ -512,9 +513,10 @@ void GetStartupArgument(Service::Interface* self) {
LOG_WARNING(Service_APT, "(stubbed) called startup_argument_type=%u , parameter_size=0x%08x", LOG_WARNING(Service_APT, "(stubbed) called startup_argument_type=%u , parameter_size=0x%08x",
startup_argument_type, parameter_size); startup_argument_type, parameter_size);
IPC::RequestBuilder rb = rp.MakeBuilder(2, 0); IPC::RequestBuilder rb = rp.MakeBuilder(2, 2);
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push<u32>(0); rb.Push<u32>(0);
rb.PushStaticBuffer(addr, parameter_size, 0);
} }
void Wrap(Service::Interface* self) { void Wrap(Service::Interface* self) {

2
src/core/hle/service/ptm/ptm.cpp
View file

@ -107,7 +107,7 @@ void CheckNew3DS(IPC::RequestBuilder& rb) {
} }
void CheckNew3DS(Service::Interface* self) { void CheckNew3DS(Service::Interface* self) {
IPC::RequestBuilder rb(Kernel::GetCommandBuffer(), 0x040A0000); IPC::RequestBuilder rb(Kernel::GetCommandBuffer(), 0x40A, 0, 0); // 0x040A0000
CheckNew3DS(rb); CheckNew3DS(rb);
} }