VERY experimental Nintendo Switch 2 emulator
C++
service: Use ReadBufferSpan where it is trivial to do so
ameerjdb9a523aaec6
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cppindex 549fd8aead..9bc72da023 100644--- a/src/core/hle/kernel/hle_ipc.cpp+++ b/src/core/hle/kernel/hle_ipc.cpp@@ -346,7 +346,6 @@ std::vector<u8> HLERequestContext::ReadBuffer(std::size_t buffer_index) const {}std::span<const u8> HLERequestContext::ReadBufferSpan(std::size_t buffer_index) const {- LOG_CRITICAL(Debug, "called");const bool is_buffer_a{BufferDescriptorA().size() > buffer_index &&BufferDescriptorA()[buffer_index].Size()};if (is_buffer_a) {diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cppindex 6d1084fd13..398bbc7936 100644--- a/src/core/hle/service/acc/acc.cpp+++ b/src/core/hle/service/acc/acc.cpp@@ -367,7 +367,7 @@ protected:IPC::RequestParser rp{ctx};const auto base = rp.PopRaw<ProfileBase>();- const auto user_data = ctx.ReadBuffer();+ const auto user_data = ctx.ReadBufferSpan();LOG_DEBUG(Service_ACC, "called, username='{}', timestamp={:016X}, uuid=0x{}",Common::StringFromFixedZeroTerminatedBuffer(@@ -399,8 +399,8 @@ protected:IPC::RequestParser rp{ctx};const auto base = rp.PopRaw<ProfileBase>();- const auto user_data = ctx.ReadBuffer();- const auto image_data = ctx.ReadBuffer(1);+ const auto user_data = ctx.ReadBufferSpan();+ const auto image_data = ctx.ReadBufferSpan(1);LOG_DEBUG(Service_ACC, "called, username='{}', timestamp={:016X}, uuid=0x{}",Common::StringFromFixedZeroTerminatedBuffer(diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cppindex 22999c942f..958e406488 100644--- a/src/core/hle/service/am/am.cpp+++ b/src/core/hle/service/am/am.cpp@@ -1124,7 +1124,7 @@ void IStorageAccessor::Write(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const u64 offset{rp.Pop<u64>()};- const std::vector<u8> data{ctx.ReadBuffer()};+ const auto data{ctx.ReadBufferSpan()};const std::size_t size{std::min<u64>(data.size(), backing.GetSize() - offset)};LOG_DEBUG(Service_AM, "called, offset={}, size={}", offset, size);diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cppindex 368ccd52f5..cc976b155c 100644--- a/src/core/hle/service/aoc/aoc_u.cpp+++ b/src/core/hle/service/aoc/aoc_u.cpp@@ -72,7 +72,7 @@ private:IPC::RequestParser rp{ctx};const auto unknown_1 = rp.Pop<u64>();- [[maybe_unused]] const auto unknown_2 = ctx.ReadBuffer();+ [[maybe_unused]] const auto unknown_2 = ctx.ReadBufferSpan();LOG_WARNING(Service_AOC, "(STUBBED) called, unknown_1={}", unknown_1);@@ -84,7 +84,7 @@ private:IPC::RequestParser rp{ctx};const auto unknown_1 = rp.Pop<u64>();- [[maybe_unused]] const auto unknown_2 = ctx.ReadBuffer();+ [[maybe_unused]] const auto unknown_2 = ctx.ReadBufferSpan();LOG_WARNING(Service_AOC, "(STUBBED) called, unknown_1={}", unknown_1);diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cppindex 053e8f9dd1..f3dd8397da 100644--- a/src/core/hle/service/audio/audin_u.cpp+++ b/src/core/hle/service/audio/audin_u.cpp@@ -98,7 +98,7 @@ private:LOG_ERROR(Service_Audio, "Input buffer is too small for an AudioInBuffer!");}- const auto& in_buffer = ctx.ReadBuffer();+ const auto& in_buffer = ctx.ReadBufferSpan();AudioInBuffer buffer{};std::memcpy(&buffer, in_buffer.data(), sizeof(AudioInBuffer));@@ -266,7 +266,7 @@ void AudInU::OpenAudioIn(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};auto in_params{rp.PopRaw<AudioInParameter>()};auto applet_resource_user_id{rp.PopRaw<u64>()};- const auto device_name_data{ctx.ReadBuffer()};+ const auto device_name_data{ctx.ReadBufferSpan()};auto device_name = Common::StringFromBuffer(device_name_data);auto handle{ctx.GetCopyHandle(0)};@@ -317,7 +317,7 @@ void AudInU::OpenAudioInProtocolSpecified(Kernel::HLERequestContext& ctx) {auto protocol_specified{rp.PopRaw<u64>()};auto in_params{rp.PopRaw<AudioInParameter>()};auto applet_resource_user_id{rp.PopRaw<u64>()};- const auto device_name_data{ctx.ReadBuffer()};+ const auto device_name_data{ctx.ReadBufferSpan()};auto device_name = Common::StringFromBuffer(device_name_data);auto handle{ctx.GetCopyHandle(0)};diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cppindex 29751f075a..4bf3880554 100644--- a/src/core/hle/service/audio/audout_u.cpp+++ b/src/core/hle/service/audio/audout_u.cpp@@ -105,7 +105,7 @@ private:LOG_ERROR(Service_Audio, "Input buffer is too small for an AudioOutBuffer!");}- const auto& in_buffer = ctx.ReadBuffer();+ const auto& in_buffer = ctx.ReadBufferSpan();AudioOutBuffer buffer{};std::memcpy(&buffer, in_buffer.data(), sizeof(AudioOutBuffer));@@ -264,7 +264,7 @@ void AudOutU::OpenAudioOut(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};auto in_params{rp.PopRaw<AudioOutParameter>()};auto applet_resource_user_id{rp.PopRaw<u64>()};- const auto device_name_data{ctx.ReadBuffer()};+ const auto device_name_data{ctx.ReadBufferSpan()};auto device_name = Common::StringFromBuffer(device_name_data);auto handle{ctx.GetCopyHandle(0)};diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cppindex 3a1c231b64..1a48c155e9 100644--- a/src/core/hle/service/audio/audren_u.cpp+++ b/src/core/hle/service/audio/audren_u.cpp@@ -112,7 +112,7 @@ private:void RequestUpdate(Kernel::HLERequestContext& ctx) {LOG_TRACE(Service_Audio, "called");- std::vector<u8> input{ctx.ReadBuffer(0)};+ const auto input{ctx.ReadBufferSpan(0)};// These buffers are written manually to avoid an issue with WriteBuffer throwing errors for// checking size 0. Performance size is 0 for most games.@@ -306,7 +306,7 @@ private:IPC::RequestParser rp{ctx};const f32 volume = rp.Pop<f32>();- const auto device_name_buffer = ctx.ReadBuffer();+ const auto device_name_buffer = ctx.ReadBufferSpan();const std::string name = Common::StringFromBuffer(device_name_buffer);LOG_DEBUG(Service_Audio, "called. name={}, volume={}", name, volume);@@ -320,7 +320,7 @@ private:}void GetAudioDeviceOutputVolume(Kernel::HLERequestContext& ctx) {- const auto device_name_buffer = ctx.ReadBuffer();+ const auto device_name_buffer = ctx.ReadBufferSpan();const std::string name = Common::StringFromBuffer(device_name_buffer);LOG_DEBUG(Service_Audio, "called. Name={}", name);diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cppindex 825fb8bcca..7c3f25c679 100644--- a/src/core/hle/service/audio/hwopus.cpp+++ b/src/core/hle/service/audio/hwopus.cpp@@ -74,7 +74,7 @@ private:ResetDecoderContext();}- if (!DecodeOpusData(consumed, sample_count, ctx.ReadBuffer(), samples, performance)) {+ if (!DecodeOpusData(consumed, sample_count, ctx.ReadBufferSpan(), samples, performance)) {LOG_ERROR(Audio, "Failed to decode opus data");IPC::ResponseBuilder rb{ctx, 2};// TODO(ogniK): Use correct error code@@ -93,7 +93,7 @@ private:ctx.WriteBuffer(samples);}- bool DecodeOpusData(u32& consumed, u32& sample_count, const std::vector<u8>& input,+ bool DecodeOpusData(u32& consumed, u32& sample_count, std::span<const u8> input,std::vector<opus_int16>& output, u64* out_performance_time) const {const auto start_time = std::chrono::steady_clock::now();const std::size_t raw_output_sz = output.size() * sizeof(opus_int16);@@ -257,7 +257,7 @@ void HwOpus::GetWorkBufferSizeEx(Kernel::HLERequestContext& ctx) {void HwOpus::GetWorkBufferSizeForMultiStreamEx(Kernel::HLERequestContext& ctx) {OpusMultiStreamParametersEx param;- std::memcpy(¶m, ctx.ReadBuffer().data(), ctx.GetReadBufferSize());+ std::memcpy(¶m, ctx.ReadBufferSpan().data(), ctx.GetReadBufferSize());const auto sample_rate = param.sample_rate;const auto channel_count = param.channel_count;diff --git a/src/core/hle/service/bcat/bcat_module.cpp b/src/core/hle/service/bcat/bcat_module.cppindex cbe690a5d1..c1a012739d 100644--- a/src/core/hle/service/bcat/bcat_module.cpp+++ b/src/core/hle/service/bcat/bcat_module.cpp@@ -206,7 +206,7 @@ private:IPC::RequestParser rp{ctx};const auto title_id = rp.PopRaw<u64>();- const auto passphrase_raw = ctx.ReadBuffer();+ const auto passphrase_raw = ctx.ReadBufferSpan();LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase={}", title_id,Common::HexToString(passphrase_raw));diff --git a/src/core/hle/service/es/es.cpp b/src/core/hle/service/es/es.cppindex d183e5829a..5ea61c430e 100644--- a/src/core/hle/service/es/es.cpp+++ b/src/core/hle/service/es/es.cpp@@ -121,8 +121,8 @@ private:}void ImportTicket(Kernel::HLERequestContext& ctx) {- const auto ticket = ctx.ReadBuffer();- const auto cert = ctx.ReadBuffer(1);+ const auto ticket = ctx.ReadBufferSpan();+ [[maybe_unused]] const auto cert = ctx.ReadBufferSpan(1);if (ticket.size() < sizeof(Core::Crypto::Ticket)) {LOG_ERROR(Service_ETicket, "The input buffer is not large enough!");diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cppindex 27675615bc..ff896ea10b 100644--- a/src/core/hle/service/fatal/fatal.cpp+++ b/src/core/hle/service/fatal/fatal.cpp@@ -152,7 +152,7 @@ void Module::Interface::ThrowFatalWithCpuContext(Kernel::HLERequestContext& ctx)IPC::RequestParser rp(ctx);const auto error_code = rp.Pop<Result>();const auto fatal_type = rp.PopEnum<FatalType>();- const auto fatal_info = ctx.ReadBuffer();+ const auto fatal_info = ctx.ReadBufferSpan();FatalInfo info{};ASSERT_MSG(fatal_info.size() == sizeof(FatalInfo), "Invalid fatal info buffer size!");diff --git a/src/core/hle/service/glue/notif.cpp b/src/core/hle/service/glue/notif.cppindex 3ace2dabd7..ee5c6d3a4d 100644--- a/src/core/hle/service/glue/notif.cpp+++ b/src/core/hle/service/glue/notif.cpp@@ -38,7 +38,7 @@ void NOTIF_A::RegisterAlarmSetting(Kernel::HLERequestContext& ctx) {"application_parameter_size is bigger than 0x400 bytes");AlarmSetting new_alarm{};- memcpy(&new_alarm, ctx.ReadBuffer(0).data(), sizeof(AlarmSetting));+ memcpy(&new_alarm, ctx.ReadBufferSpan(0).data(), sizeof(AlarmSetting));// TODO: Count alarms per game idif (alarms.size() >= max_alarms) {@@ -73,7 +73,7 @@ void NOTIF_A::UpdateAlarmSetting(Kernel::HLERequestContext& ctx) {"application_parameter_size is bigger than 0x400 bytes");AlarmSetting alarm_setting{};- memcpy(&alarm_setting, ctx.ReadBuffer(0).data(), sizeof(AlarmSetting));+ memcpy(&alarm_setting, ctx.ReadBufferSpan(0).data(), sizeof(AlarmSetting));const auto alarm_it = GetAlarmFromId(alarm_setting.alarm_setting_id);if (alarm_it != alarms.end()) {diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cppindex 2f871de310..df63083a84 100644--- a/src/core/hle/service/hid/controllers/npad.cpp+++ b/src/core/hle/service/hid/controllers/npad.cpp@@ -737,7 +737,7 @@ Core::HID::NpadStyleTag Controller_NPad::GetSupportedStyleSet() const {return hid_core.GetSupportedStyleTag();}-void Controller_NPad::SetSupportedNpadIdTypes(u8* data, std::size_t length) {+void Controller_NPad::SetSupportedNpadIdTypes(const u8* const data, std::size_t length) {ASSERT(length > 0 && (length % sizeof(u32)) == 0);supported_npad_id_types.clear();supported_npad_id_types.resize(length / sizeof(u32));diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.hindex 1a589cca22..988ac8ec4b 100644--- a/src/core/hle/service/hid/controllers/npad.h+++ b/src/core/hle/service/hid/controllers/npad.h@@ -95,7 +95,7 @@ public:void SetSupportedStyleSet(Core::HID::NpadStyleTag style_set);Core::HID::NpadStyleTag GetSupportedStyleSet() const;- void SetSupportedNpadIdTypes(u8* data, std::size_t length);+ void SetSupportedNpadIdTypes(const u8* const data, std::size_t length);void GetSupportedNpadIdTypes(u32* data, std::size_t max_length);std::size_t GetSupportedNpadIdTypesSize() const;diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cppindex bf28440c62..80db6af066 100644--- a/src/core/hle/service/hid/hid.cpp+++ b/src/core/hle/service/hid/hid.cpp@@ -1026,7 +1026,7 @@ void Hid::SetSupportedNpadIdType(Kernel::HLERequestContext& ctx) {const auto applet_resource_user_id{rp.Pop<u64>()};applet_resource->GetController<Controller_NPad>(HidController::NPad)- .SetSupportedNpadIdTypes(ctx.ReadBuffer().data(), ctx.GetReadBufferSize());+ .SetSupportedNpadIdTypes(ctx.ReadBufferSpan().data(), ctx.GetReadBufferSize());LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);@@ -1564,8 +1564,8 @@ void Hid::SendVibrationValues(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto applet_resource_user_id{rp.Pop<u64>()};- const auto handles = ctx.ReadBuffer(0);- const auto vibrations = ctx.ReadBuffer(1);+ const auto handles = ctx.ReadBufferSpan(0);+ const auto vibrations = ctx.ReadBufferSpan(1);std::vector<Core::HID::VibrationDeviceHandle> vibration_device_handles(handles.size() / sizeof(Core::HID::VibrationDeviceHandle));@@ -2104,7 +2104,7 @@ void Hid::WritePalmaRgbLedPatternEntry(Kernel::HLERequestContext& ctx) {const auto connection_handle{rp.PopRaw<Controller_Palma::PalmaConnectionHandle>()};const auto unknown{rp.Pop<u64>()};- const auto buffer = ctx.ReadBuffer();+ [[maybe_unused]] const auto buffer = ctx.ReadBufferSpan();LOG_WARNING(Service_HID, "(STUBBED) called, connection_handle={}, unknown={}",connection_handle.npad_id, unknown);diff --git a/src/core/hle/service/jit/jit.cpp b/src/core/hle/service/jit/jit.cppindex 8f2920c515..534639ff92 100644--- a/src/core/hle/service/jit/jit.cpp+++ b/src/core/hle/service/jit/jit.cpp@@ -62,7 +62,7 @@ public:const auto parameters{rp.PopRaw<InputParameters>()};// Optional input/output buffers- std::vector<u8> input_buffer{ctx.CanReadBuffer() ? ctx.ReadBuffer() : std::vector<u8>()};+ const auto input_buffer{ctx.CanReadBuffer() ? ctx.ReadBufferSpan() : std::span<const u8>()};std::vector<u8> output_buffer(ctx.CanWriteBuffer() ? ctx.GetWriteBufferSize() : 0);// Function call prototype:@@ -132,7 +132,7 @@ public:const auto command{rp.PopRaw<u64>()};// Optional input/output buffers- std::vector<u8> input_buffer{ctx.CanReadBuffer() ? ctx.ReadBuffer() : std::vector<u8>()};+ const auto input_buffer{ctx.CanReadBuffer() ? ctx.ReadBufferSpan() : std::span<const u8>()};std::vector<u8> output_buffer(ctx.CanWriteBuffer() ? ctx.GetWriteBufferSize() : 0);// Function call prototype:@@ -176,7 +176,7 @@ public:IPC::RequestParser rp{ctx};const auto tmem_size{rp.PopRaw<u64>()};const auto tmem_handle{ctx.GetCopyHandle(0)};- const auto nro_plugin{ctx.ReadBuffer(1)};+ const auto nro_plugin{ctx.ReadBufferSpan(1)};if (tmem_size == 0) {LOG_ERROR(Service_JIT, "attempted to load plugin with empty transfer memory");diff --git a/src/core/hle/service/ldn/ldn.cpp b/src/core/hle/service/ldn/ldn.cppindex c49c61cff4..ad097a6efa 100644--- a/src/core/hle/service/ldn/ldn.cpp+++ b/src/core/hle/service/ldn/ldn.cpp@@ -412,7 +412,7 @@ public:}void SetAdvertiseData(Kernel::HLERequestContext& ctx) {- std::vector<u8> read_buffer = ctx.ReadBuffer();+ const auto read_buffer = ctx.ReadBufferSpan();IPC::ResponseBuilder rb{ctx, 2};rb.Push(lan_discovery.SetAdvertiseData(read_buffer));@@ -464,7 +464,7 @@ public:parameters.security_config.passphrase_size,parameters.security_config.security_mode, parameters.local_communication_version);- const std::vector<u8> read_buffer = ctx.ReadBuffer();+ const auto read_buffer = ctx.ReadBufferSpan();if (read_buffer.size() != sizeof(NetworkInfo)) {LOG_ERROR(Frontend, "NetworkInfo doesn't match read_buffer size!");IPC::ResponseBuilder rb{ctx, 2};diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cppindex ef4b540468..0da461e6cb 100644--- a/src/core/hle/service/lm/lm.cpp+++ b/src/core/hle/service/lm/lm.cpp@@ -94,7 +94,7 @@ public:private:void Log(Kernel::HLERequestContext& ctx) {std::size_t offset{};- const auto data = ctx.ReadBuffer();+ const auto data = ctx.ReadBufferSpan();// This function only succeeds - Get that out of the wayIPC::ResponseBuilder rb{ctx, 2};diff --git a/src/core/hle/service/nfc/mifare_user.cpp b/src/core/hle/service/nfc/mifare_user.cppindex 51523a3aee..7d391c9364 100644--- a/src/core/hle/service/nfc/mifare_user.cpp+++ b/src/core/hle/service/nfc/mifare_user.cpp@@ -168,7 +168,7 @@ void MFIUser::StopDetection(Kernel::HLERequestContext& ctx) {void MFIUser::Read(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto device_handle{rp.Pop<u64>()};- const auto buffer{ctx.ReadBuffer()};+ const auto buffer{ctx.ReadBufferSpan()};const auto number_of_commands{ctx.GetReadBufferNumElements<NFP::MifareReadBlockParameter>()};std::vector<NFP::MifareReadBlockParameter> read_commands(number_of_commands);@@ -209,7 +209,7 @@ void MFIUser::Read(Kernel::HLERequestContext& ctx) {void MFIUser::Write(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto device_handle{rp.Pop<u64>()};- const auto buffer{ctx.ReadBuffer()};+ const auto buffer{ctx.ReadBufferSpan()};const auto number_of_commands{ctx.GetReadBufferNumElements<NFP::MifareWriteBlockParameter>()};std::vector<NFP::MifareWriteBlockParameter> write_commands(number_of_commands);diff --git a/src/core/hle/service/nfc/nfc_user.cpp b/src/core/hle/service/nfc/nfc_user.cppindex 89aa6b3f59..5dcf8a4237 100644--- a/src/core/hle/service/nfc/nfc_user.cpp+++ b/src/core/hle/service/nfc/nfc_user.cpp@@ -325,7 +325,7 @@ void IUser::SendCommandByPassThrough(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto device_handle{rp.Pop<u64>()};const auto timeout{rp.PopRaw<Time::Clock::TimeSpanType>()};- const auto command_data{ctx.ReadBuffer()};+ const auto command_data{ctx.ReadBufferSpan()};LOG_INFO(Service_NFC, "(STUBBED) called, device_handle={}, timeout={}, data_size={}",device_handle, timeout.ToSeconds(), command_data.size());diff --git a/src/core/hle/service/nfp/nfp_user.cpp b/src/core/hle/service/nfp/nfp_user.cppindex a4d3d1bc7f..0a56067565 100644--- a/src/core/hle/service/nfp/nfp_user.cpp+++ b/src/core/hle/service/nfp/nfp_user.cpp@@ -290,7 +290,7 @@ void IUser::GetApplicationArea(Kernel::HLERequestContext& ctx) {void IUser::SetApplicationArea(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto device_handle{rp.Pop<u64>()};- const auto data{ctx.ReadBuffer()};+ const auto data{ctx.ReadBufferSpan()};LOG_INFO(Service_NFP, "called, device_handle={}, data_size={}", device_handle, data.size());if (state == State::NonInitialized) {@@ -370,7 +370,7 @@ void IUser::CreateApplicationArea(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto device_handle{rp.Pop<u64>()};const auto access_id{rp.Pop<u32>()};- const auto data{ctx.ReadBuffer()};+ const auto data{ctx.ReadBufferSpan()};LOG_INFO(Service_NFP, "called, device_handle={}, data_size={}, access_id={}", device_handle,access_id, data.size());@@ -637,7 +637,7 @@ void IUser::RecreateApplicationArea(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto device_handle{rp.Pop<u64>()};const auto access_id{rp.Pop<u32>()};- const auto data{ctx.ReadBuffer()};+ const auto data{ctx.ReadBufferSpan()};LOG_INFO(Service_NFP, "called, device_handle={}, data_size={}, access_id={}", device_handle,access_id, data.size());diff --git a/src/core/hle/service/ngct/ngct.cpp b/src/core/hle/service/ngct/ngct.cppindex 8af8a835d7..bee62b0546 100644--- a/src/core/hle/service/ngct/ngct.cpp+++ b/src/core/hle/service/ngct/ngct.cpp@@ -24,7 +24,7 @@ public:private:void Match(Kernel::HLERequestContext& ctx) {- const auto buffer = ctx.ReadBuffer();+ const auto buffer = ctx.ReadBufferSpan();const auto text = Common::StringFromFixedZeroTerminatedBuffer(reinterpret_cast<const char*>(buffer.data()), buffer.size());@@ -37,7 +37,7 @@ private:}void Filter(Kernel::HLERequestContext& ctx) {- const auto buffer = ctx.ReadBuffer();+ const auto buffer = ctx.ReadBufferSpan();const auto text = Common::StringFromFixedZeroTerminatedBuffer(reinterpret_cast<const char*>(buffer.data()), buffer.size());diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cppindex 4fa9f51a6d..a6446fdcc9 100644--- a/src/core/hle/service/nifm/nifm.cpp+++ b/src/core/hle/service/nifm/nifm.cpp@@ -414,7 +414,7 @@ void IGeneralService::CreateTemporaryNetworkProfile(Kernel::HLERequestContext& cASSERT_MSG(ctx.GetReadBufferSize() == 0x17c, "SfNetworkProfileData is not the correct size");u128 uuid{};- auto buffer = ctx.ReadBuffer();+ auto buffer = ctx.ReadBufferSpan();std::memcpy(&uuid, buffer.data() + 8, sizeof(u128));IPC::ResponseBuilder rb{ctx, 6, 0, 1};diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cppindex 78f897d3e6..f6a141b2eb 100644--- a/src/core/hle/service/prepo/prepo.cpp+++ b/src/core/hle/service/prepo/prepo.cpp@@ -57,13 +57,13 @@ private:IPC::RequestParser rp{ctx};const auto process_id = rp.PopRaw<u64>();- const auto data1 = ctx.ReadBuffer(0);+ const auto data1 = ctx.ReadBufferSpan(0);const auto data2 = [&ctx] {if (ctx.CanReadBuffer(1)) {- return ctx.ReadBuffer(1);+ return ctx.ReadBufferSpan(1);}- return std::vector<u8>{};+ return std::span<const u8>{};}();LOG_DEBUG(Service_PREPO,@@ -84,13 +84,13 @@ private:const auto user_id = rp.PopRaw<u128>();const auto process_id = rp.PopRaw<u64>();- const auto data1 = ctx.ReadBuffer(0);+ const auto data1 = ctx.ReadBufferSpan(0);const auto data2 = [&ctx] {if (ctx.CanReadBuffer(1)) {- return ctx.ReadBuffer(1);+ return ctx.ReadBufferSpan(1);}- return std::vector<u8>{};+ return std::span<const u8>{};}();LOG_DEBUG(Service_PREPO,@@ -136,13 +136,13 @@ private:IPC::RequestParser rp{ctx};const auto title_id = rp.PopRaw<u64>();- const auto data1 = ctx.ReadBuffer(0);+ const auto data1 = ctx.ReadBufferSpan(0);const auto data2 = [&ctx] {if (ctx.CanReadBuffer(1)) {- return ctx.ReadBuffer(1);+ return ctx.ReadBufferSpan(1);}- return std::vector<u8>{};+ return std::span<const u8>{};}();LOG_DEBUG(Service_PREPO, "called, title_id={:016X}, data1_size={:016X}, data2_size={:016X}",@@ -160,13 +160,13 @@ private:const auto user_id = rp.PopRaw<u128>();const auto title_id = rp.PopRaw<u64>();- const auto data1 = ctx.ReadBuffer(0);+ const auto data1 = ctx.ReadBufferSpan(0);const auto data2 = [&ctx] {if (ctx.CanReadBuffer(1)) {- return ctx.ReadBuffer(1);+ return ctx.ReadBufferSpan(1);}- return std::vector<u8>{};+ return std::span<const u8>{};}();LOG_DEBUG(Service_PREPO,diff --git a/src/core/hle/service/set/set_sys.cpp b/src/core/hle/service/set/set_sys.cppindex 94c20edda8..f1ace8184a 100644--- a/src/core/hle/service/set/set_sys.cpp+++ b/src/core/hle/service/set/set_sys.cpp@@ -131,12 +131,12 @@ void SET_SYS::GetSettingsItemValueSize(Kernel::HLERequestContext& ctx) {// The category of the setting. This corresponds to the top-level keys of// system_settings.ini.- const auto setting_category_buf{ctx.ReadBuffer(0)};+ const auto setting_category_buf{ctx.ReadBufferSpan(0)};const std::string setting_category{setting_category_buf.begin(), setting_category_buf.end()};// The name of the setting. This corresponds to the second-level keys of// system_settings.ini.- const auto setting_name_buf{ctx.ReadBuffer(1)};+ const auto setting_name_buf{ctx.ReadBufferSpan(1)};const std::string setting_name{setting_name_buf.begin(), setting_name_buf.end()};auto settings{GetSettings()};@@ -156,12 +156,12 @@ void SET_SYS::GetSettingsItemValue(Kernel::HLERequestContext& ctx) {// The category of the setting. This corresponds to the top-level keys of// system_settings.ini.- const auto setting_category_buf{ctx.ReadBuffer(0)};+ const auto setting_category_buf{ctx.ReadBufferSpan(0)};const std::string setting_category{setting_category_buf.begin(), setting_category_buf.end()};// The name of the setting. This corresponds to the second-level keys of// system_settings.ini.- const auto setting_name_buf{ctx.ReadBuffer(1)};+ const auto setting_name_buf{ctx.ReadBufferSpan(1)};const std::string setting_name{setting_name_buf.begin(), setting_name_buf.end()};auto settings{GetSettings()};diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cppindex 097c37d7ae..6d0e1dd6c1 100644--- a/src/core/hle/service/sockets/sfdnsres.cpp+++ b/src/core/hle/service/sockets/sfdnsres.cpp@@ -199,10 +199,10 @@ static std::pair<u32, s32> GetAddrInfoRequestImpl(Kernel::HLERequestContext& ctx"called with ignored parameters: use_nsd_resolve={}, unknown={}, process_id={}",parameters.use_nsd_resolve, parameters.unknown, parameters.process_id);- const auto host_buffer = ctx.ReadBuffer(0);+ const auto host_buffer = ctx.ReadBufferSpan(0);const std::string host = Common::StringFromBuffer(host_buffer);- const auto service_buffer = ctx.ReadBuffer(1);+ const auto service_buffer = ctx.ReadBufferSpan(1);const std::string service = Common::StringFromBuffer(service_buffer);addrinfo* addrinfo;@@ -243,4 +243,4 @@ void SFDNSRES::GetAddrInfoRequestWithOptions(Kernel::HLERequestContext& ctx) {rb.Push(0);}-} // namespace Service::Sockets\ No newline at end of file+} // namespace Service::Socketsdiff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cppindex 3735e0452d..10851f08fc 100644--- a/src/core/hle/service/ssl/ssl.cpp+++ b/src/core/hle/service/ssl/ssl.cpp@@ -101,7 +101,7 @@ private:void ImportServerPki(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto certificate_format = rp.PopEnum<CertificateFormat>();- const auto pkcs_12_certificates = ctx.ReadBuffer(0);+ [[maybe_unused]] const auto pkcs_12_certificates = ctx.ReadBufferSpan(0);constexpr u64 server_id = 0;@@ -113,13 +113,13 @@ private:}void ImportClientPki(Kernel::HLERequestContext& ctx) {- const auto pkcs_12_certificate = ctx.ReadBuffer(0);- const auto ascii_password = [&ctx] {+ [[maybe_unused]] const auto pkcs_12_certificate = ctx.ReadBufferSpan(0);+ [[maybe_unused]] const auto ascii_password = [&ctx] {if (ctx.CanReadBuffer(1)) {- return ctx.ReadBuffer(1);+ return ctx.ReadBufferSpan(1);}- return std::vector<u8>{};+ return std::span<const u8>{};}();constexpr u64 client_id = 0;diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cppindex f77cdbb430..9376e09028 100644--- a/src/core/hle/service/time/time.cpp+++ b/src/core/hle/service/time/time.cpp@@ -328,8 +328,8 @@ void Module::Interface::CalculateStandardUserSystemClockDifferenceByUser(Clock::ClockSnapshot snapshot_a;Clock::ClockSnapshot snapshot_b;- const auto snapshot_a_data = ctx.ReadBuffer(0);- const auto snapshot_b_data = ctx.ReadBuffer(1);+ const auto snapshot_a_data = ctx.ReadBufferSpan(0);+ const auto snapshot_b_data = ctx.ReadBufferSpan(1);std::memcpy(&snapshot_a, snapshot_a_data.data(), sizeof(Clock::ClockSnapshot));std::memcpy(&snapshot_b, snapshot_b_data.data(), sizeof(Clock::ClockSnapshot));@@ -355,8 +355,8 @@ void Module::Interface::CalculateSpanBetween(Kernel::HLERequestContext& ctx) {Clock::ClockSnapshot snapshot_a;Clock::ClockSnapshot snapshot_b;- const auto snapshot_a_data = ctx.ReadBuffer(0);- const auto snapshot_b_data = ctx.ReadBuffer(1);+ const auto snapshot_a_data = ctx.ReadBufferSpan(0);+ const auto snapshot_b_data = ctx.ReadBufferSpan(1);std::memcpy(&snapshot_a, snapshot_a_data.data(), sizeof(Clock::ClockSnapshot));std::memcpy(&snapshot_b, snapshot_b_data.data(), sizeof(Clock::ClockSnapshot));diff --git a/src/core/hle/service/time/time_zone_service.cpp b/src/core/hle/service/time/time_zone_service.cppindex 961040bfc1..6d05a66f1d 100644--- a/src/core/hle/service/time/time_zone_service.cpp+++ b/src/core/hle/service/time/time_zone_service.cpp@@ -84,7 +84,7 @@ void ITimeZoneService::ToCalendarTime(Kernel::HLERequestContext& ctx) {LOG_DEBUG(Service_Time, "called, posix_time=0x{:016X}", posix_time);TimeZone::TimeZoneRule time_zone_rule{};- const auto buffer{ctx.ReadBuffer()};+ const auto buffer{ctx.ReadBufferSpan()};std::memcpy(&time_zone_rule, buffer.data(), buffer.size());TimeZone::CalendarInfo calendar_info{};@@ -128,7 +128,7 @@ void ITimeZoneService::ToPosixTime(Kernel::HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto calendar_time{rp.PopRaw<TimeZone::CalendarTime>()};TimeZone::TimeZoneRule time_zone_rule{};- std::memcpy(&time_zone_rule, ctx.ReadBuffer().data(), sizeof(TimeZone::TimeZoneRule));+ std::memcpy(&time_zone_rule, ctx.ReadBufferSpan().data(), sizeof(TimeZone::TimeZoneRule));s64 posix_time{};if (const Result result{time_zone_content_manager.GetTimeZoneManager().ToPosixTime(diff --git a/src/core/reporter.cpp b/src/core/reporter.cppindex 77821e047d..59dfb87673 100644--- a/src/core/reporter.cpp+++ b/src/core/reporter.cpp@@ -312,7 +312,7 @@ void Reporter::SaveUnimplementedAppletReport(}void Reporter::SavePlayReport(PlayReportType type, u64 title_id,- const std::vector<std::vector<u8>>& data,+ const std::vector<std::span<const u8>>& data,std::optional<u64> process_id, std::optional<u128> user_id) const {if (!IsReportingEnabled()) {return;diff --git a/src/core/reporter.h b/src/core/reporter.hindex 9fdb9d6c1b..bb11f8e7c9 100644--- a/src/core/reporter.h+++ b/src/core/reporter.h@@ -5,6 +5,7 @@#include <array>#include <optional>+#include <span>#include <string>#include <vector>#include "common/common_types.h"@@ -56,7 +57,8 @@ public:System,};- void SavePlayReport(PlayReportType type, u64 title_id, const std::vector<std::vector<u8>>& data,+ void SavePlayReport(PlayReportType type, u64 title_id,+ const std::vector<std::span<const u8>>& data,std::optional<u64> process_id = {}, std::optional<u128> user_id = {}) const;// Used by error applet