mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 16:09:08 +01:00
Memory: Make ReadBlock and WriteBlock accept void pointers.
This commit is contained in:
parent
99695d03d2
commit
660499ac01
5 changed files with 19 additions and 21 deletions
|
@ -23,7 +23,7 @@ void GetMyPresence(Service::Interface* self) {
|
||||||
|
|
||||||
ASSERT(shifted_out_size == ((sizeof(MyPresence) << 14) | 2));
|
ASSERT(shifted_out_size == ((sizeof(MyPresence) << 14) | 2));
|
||||||
|
|
||||||
Memory::WriteBlock(my_presence_addr, reinterpret_cast<const u8*>(&my_presence), sizeof(MyPresence));
|
Memory::WriteBlock(my_presence_addr, &my_presence, sizeof(MyPresence));
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
|
||||||
|
@ -39,8 +39,7 @@ void GetFriendKeyList(Service::Interface* self) {
|
||||||
|
|
||||||
FriendKey zero_key = {};
|
FriendKey zero_key = {};
|
||||||
for (u32 i = 0; i < frd_count; ++i) {
|
for (u32 i = 0; i < frd_count; ++i) {
|
||||||
Memory::WriteBlock(frd_key_addr + i * sizeof(FriendKey),
|
Memory::WriteBlock(frd_key_addr + i * sizeof(FriendKey), &zero_key, sizeof(FriendKey));
|
||||||
reinterpret_cast<const u8*>(&zero_key), sizeof(FriendKey));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
@ -58,8 +57,7 @@ void GetFriendProfile(Service::Interface* self) {
|
||||||
|
|
||||||
Profile zero_profile = {};
|
Profile zero_profile = {};
|
||||||
for (u32 i = 0; i < count; ++i) {
|
for (u32 i = 0; i < count; ++i) {
|
||||||
Memory::WriteBlock(profiles_addr + i * sizeof(Profile),
|
Memory::WriteBlock(profiles_addr + i * sizeof(Profile), &zero_profile, sizeof(Profile));
|
||||||
reinterpret_cast<const u8*>(&zero_profile), sizeof(Profile));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
@ -88,7 +86,7 @@ void GetMyFriendKey(Service::Interface* self) {
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
Memory::WriteBlock(cmd_buff[2], reinterpret_cast<const u8*>(&my_friend_key), sizeof(FriendKey));
|
Memory::WriteBlock(cmd_buff[2], &my_friend_key, sizeof(FriendKey));
|
||||||
LOG_WARNING(Service_FRD, "(STUBBED) called");
|
LOG_WARNING(Service_FRD, "(STUBBED) called");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -568,7 +568,7 @@ static void SendTo(Service::Interface* self) {
|
||||||
Memory::ReadBlock(input_buff_address, input_buff.data(), input_buff.size());
|
Memory::ReadBlock(input_buff_address, input_buff.data(), input_buff.size());
|
||||||
|
|
||||||
CTRSockAddr ctr_dest_addr;
|
CTRSockAddr ctr_dest_addr;
|
||||||
Memory::ReadBlock(dest_addr_addr, reinterpret_cast<u8*>(&ctr_dest_addr), sizeof(ctr_dest_addr));
|
Memory::ReadBlock(dest_addr_addr, &ctr_dest_addr, sizeof(ctr_dest_addr));
|
||||||
|
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
if (addr_len > 0) {
|
if (addr_len > 0) {
|
||||||
|
@ -623,7 +623,7 @@ static void RecvFrom(Service::Interface* self) {
|
||||||
|
|
||||||
if (ret >= 0 && buffer_parameters.output_src_address_buffer != 0 && src_addr_len > 0) {
|
if (ret >= 0 && buffer_parameters.output_src_address_buffer != 0 && src_addr_len > 0) {
|
||||||
CTRSockAddr ctr_src_addr = CTRSockAddr::FromPlatform(src_addr);
|
CTRSockAddr ctr_src_addr = CTRSockAddr::FromPlatform(src_addr);
|
||||||
Memory::WriteBlock(buffer_parameters.output_src_address_buffer, reinterpret_cast<u8*>(&ctr_src_addr), sizeof(ctr_src_addr));
|
Memory::WriteBlock(buffer_parameters.output_src_address_buffer, &ctr_src_addr, sizeof(ctr_src_addr));
|
||||||
}
|
}
|
||||||
|
|
||||||
int result = 0;
|
int result = 0;
|
||||||
|
@ -654,7 +654,7 @@ static void Poll(Service::Interface* self) {
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<CTRPollFD> ctr_fds(nfds);
|
std::vector<CTRPollFD> ctr_fds(nfds);
|
||||||
Memory::ReadBlock(input_fds_addr, reinterpret_cast<u8*>(ctr_fds.data()), nfds * sizeof(CTRPollFD));
|
Memory::ReadBlock(input_fds_addr, ctr_fds.data(), nfds * sizeof(CTRPollFD));
|
||||||
|
|
||||||
// The 3ds_pollfd and the pollfd structures may be different (Windows/Linux have different sizes)
|
// The 3ds_pollfd and the pollfd structures may be different (Windows/Linux have different sizes)
|
||||||
// so we have to copy the data
|
// so we have to copy the data
|
||||||
|
@ -666,7 +666,7 @@ static void Poll(Service::Interface* self) {
|
||||||
// Now update the output pollfd structure
|
// Now update the output pollfd structure
|
||||||
std::transform(platform_pollfd.begin(), platform_pollfd.end(), ctr_fds.begin(), CTRPollFD::FromPlatform);
|
std::transform(platform_pollfd.begin(), platform_pollfd.end(), ctr_fds.begin(), CTRPollFD::FromPlatform);
|
||||||
|
|
||||||
Memory::WriteBlock(output_fds_addr, reinterpret_cast<u8*>(ctr_fds.data()), nfds * sizeof(CTRPollFD));
|
Memory::WriteBlock(output_fds_addr, ctr_fds.data(), nfds * sizeof(CTRPollFD));
|
||||||
|
|
||||||
int result = 0;
|
int result = 0;
|
||||||
if (ret == SOCKET_ERROR_VALUE)
|
if (ret == SOCKET_ERROR_VALUE)
|
||||||
|
@ -690,7 +690,7 @@ static void GetSockName(Service::Interface* self) {
|
||||||
|
|
||||||
if (ctr_dest_addr_addr != 0 && Memory::IsValidVirtualAddress(ctr_dest_addr_addr)) {
|
if (ctr_dest_addr_addr != 0 && Memory::IsValidVirtualAddress(ctr_dest_addr_addr)) {
|
||||||
CTRSockAddr ctr_dest_addr = CTRSockAddr::FromPlatform(dest_addr);
|
CTRSockAddr ctr_dest_addr = CTRSockAddr::FromPlatform(dest_addr);
|
||||||
Memory::WriteBlock(ctr_dest_addr_addr, reinterpret_cast<u8*>(&ctr_dest_addr), sizeof(ctr_dest_addr));
|
Memory::WriteBlock(ctr_dest_addr_addr, &ctr_dest_addr, sizeof(ctr_dest_addr));
|
||||||
} else {
|
} else {
|
||||||
cmd_buffer[1] = -1; // TODO(Subv): Verify error
|
cmd_buffer[1] = -1; // TODO(Subv): Verify error
|
||||||
return;
|
return;
|
||||||
|
@ -731,7 +731,7 @@ static void GetPeerName(Service::Interface* self) {
|
||||||
|
|
||||||
if (ctr_dest_addr_addr != 0 && Memory::IsValidVirtualAddress(ctr_dest_addr_addr)) {
|
if (ctr_dest_addr_addr != 0 && Memory::IsValidVirtualAddress(ctr_dest_addr_addr)) {
|
||||||
CTRSockAddr ctr_dest_addr = CTRSockAddr::FromPlatform(dest_addr);
|
CTRSockAddr ctr_dest_addr = CTRSockAddr::FromPlatform(dest_addr);
|
||||||
Memory::WriteBlock(ctr_dest_addr_addr, reinterpret_cast<u8*>(&ctr_dest_addr), sizeof(ctr_dest_addr));
|
Memory::WriteBlock(ctr_dest_addr_addr, &ctr_dest_addr, sizeof(ctr_dest_addr));
|
||||||
} else {
|
} else {
|
||||||
cmd_buffer[1] = -1;
|
cmd_buffer[1] = -1;
|
||||||
return;
|
return;
|
||||||
|
@ -761,7 +761,7 @@ static void Connect(Service::Interface* self) {
|
||||||
}
|
}
|
||||||
|
|
||||||
CTRSockAddr ctr_input_addr;
|
CTRSockAddr ctr_input_addr;
|
||||||
Memory::ReadBlock(ctr_input_addr_addr, reinterpret_cast<u8*>(&ctr_input_addr), sizeof(ctr_input_addr));
|
Memory::ReadBlock(ctr_input_addr_addr, &ctr_input_addr, sizeof(ctr_input_addr));
|
||||||
|
|
||||||
sockaddr input_addr = CTRSockAddr::ToPlatform(ctr_input_addr);
|
sockaddr input_addr = CTRSockAddr::ToPlatform(ctr_input_addr);
|
||||||
int ret = ::connect(socket_handle, &input_addr, sizeof(input_addr));
|
int ret = ::connect(socket_handle, &input_addr, sizeof(input_addr));
|
||||||
|
|
|
@ -364,7 +364,7 @@ u64 Read64(const VAddr addr) {
|
||||||
return Read<u64_le>(addr);
|
return Read<u64_le>(addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReadBlock(const VAddr src_addr, u8* dest_buffer, const size_t size) {
|
void ReadBlock(const VAddr src_addr, void* dest_buffer, const size_t size) {
|
||||||
size_t remaining_size = size;
|
size_t remaining_size = size;
|
||||||
size_t page_index = src_addr >> PAGE_BITS;
|
size_t page_index = src_addr >> PAGE_BITS;
|
||||||
size_t page_offset = src_addr & PAGE_MASK;
|
size_t page_offset = src_addr & PAGE_MASK;
|
||||||
|
@ -398,7 +398,7 @@ void ReadBlock(const VAddr src_addr, u8* dest_buffer, const size_t size) {
|
||||||
|
|
||||||
page_index++;
|
page_index++;
|
||||||
page_offset = 0;
|
page_offset = 0;
|
||||||
dest_buffer += copy_amount;
|
dest_buffer = static_cast<u8*>(dest_buffer) + copy_amount;
|
||||||
remaining_size -= copy_amount;
|
remaining_size -= copy_amount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -419,7 +419,7 @@ void Write64(const VAddr addr, const u64 data) {
|
||||||
Write<u64_le>(addr, data);
|
Write<u64_le>(addr, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WriteBlock(const VAddr dest_addr, const u8* src_buffer, const size_t size) {
|
void WriteBlock(const VAddr dest_addr, const void* src_buffer, const size_t size) {
|
||||||
size_t remaining_size = size;
|
size_t remaining_size = size;
|
||||||
size_t page_index = dest_addr >> PAGE_BITS;
|
size_t page_index = dest_addr >> PAGE_BITS;
|
||||||
size_t page_offset = dest_addr & PAGE_MASK;
|
size_t page_offset = dest_addr & PAGE_MASK;
|
||||||
|
@ -452,7 +452,7 @@ void WriteBlock(const VAddr dest_addr, const u8* src_buffer, const size_t size)
|
||||||
|
|
||||||
page_index++;
|
page_index++;
|
||||||
page_offset = 0;
|
page_offset = 0;
|
||||||
src_buffer += copy_amount;
|
src_buffer = static_cast<const u8*>(src_buffer) + copy_amount;
|
||||||
remaining_size -= copy_amount;
|
remaining_size -= copy_amount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -123,8 +123,8 @@ void Write16(VAddr addr, u16 data);
|
||||||
void Write32(VAddr addr, u32 data);
|
void Write32(VAddr addr, u32 data);
|
||||||
void Write64(VAddr addr, u64 data);
|
void Write64(VAddr addr, u64 data);
|
||||||
|
|
||||||
void ReadBlock(const VAddr src_addr, u8* dest_buffer, size_t size);
|
void ReadBlock(const VAddr src_addr, void* dest_buffer, size_t size);
|
||||||
void WriteBlock(const VAddr dest_addr, const u8* src_buffer, size_t size);
|
void WriteBlock(const VAddr dest_addr, const void* src_buffer, size_t size);
|
||||||
void ZeroBlock(const VAddr dest_addr, const size_t size);
|
void ZeroBlock(const VAddr dest_addr, const size_t size);
|
||||||
void CopyBlock(VAddr dest_addr, VAddr src_addr, size_t size);
|
void CopyBlock(VAddr dest_addr, VAddr src_addr, size_t size);
|
||||||
|
|
||||||
|
|
|
@ -25,14 +25,14 @@ public:
|
||||||
virtual u32 Read32(VAddr addr) = 0;
|
virtual u32 Read32(VAddr addr) = 0;
|
||||||
virtual u64 Read64(VAddr addr) = 0;
|
virtual u64 Read64(VAddr addr) = 0;
|
||||||
|
|
||||||
virtual bool ReadBlock(VAddr src_addr, u8* dest_buffer, size_t size) = 0;
|
virtual bool ReadBlock(VAddr src_addr, void* dest_buffer, size_t size) = 0;
|
||||||
|
|
||||||
virtual void Write8(VAddr addr, u8 data) = 0;
|
virtual void Write8(VAddr addr, u8 data) = 0;
|
||||||
virtual void Write16(VAddr addr, u16 data) = 0;
|
virtual void Write16(VAddr addr, u16 data) = 0;
|
||||||
virtual void Write32(VAddr addr, u32 data) = 0;
|
virtual void Write32(VAddr addr, u32 data) = 0;
|
||||||
virtual void Write64(VAddr addr, u64 data) = 0;
|
virtual void Write64(VAddr addr, u64 data) = 0;
|
||||||
|
|
||||||
virtual bool WriteBlock(VAddr dest_addr, const u8* src_buffer, size_t size) = 0;
|
virtual bool WriteBlock(VAddr dest_addr, const void* src_buffer, size_t size) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
using MMIORegionPointer = std::shared_ptr<MMIORegion>;
|
using MMIORegionPointer = std::shared_ptr<MMIORegion>;
|
||||||
|
|
Loading…
Reference in a new issue