From d1dbee20526e699978dc3de3a9c6cb338fdc2eed Mon Sep 17 00:00:00 2001 From: gibbed Date: Thu, 28 May 2015 05:28:59 -0500 Subject: [PATCH] Consistency in memset calls. --- src/xenia/apu/audio_system.cc | 2 +- src/xenia/cpu/backend/backend.cc | 2 +- src/xenia/cpu/compiler/passes/register_allocation_pass.cc | 2 +- src/xenia/cpu/frontend/ppc_hir_builder.cc | 4 ++-- src/xenia/cpu/symbol_info.cc | 2 +- src/xenia/gpu/register_file.cc | 2 +- src/xenia/kernel/object_table.cc | 2 +- src/xenia/kernel/xam_net.cc | 8 ++++---- src/xenia/kernel/xam_user.cc | 2 +- src/xenia/kernel/xboxkrnl_memory.cc | 2 +- src/xenia/kernel/xboxkrnl_video.cc | 4 ++-- src/xenia/memory.cc | 2 +- src/xenia/ui/win32/win32_window.cc | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/xenia/apu/audio_system.cc b/src/xenia/apu/audio_system.cc index c8894264d..65a0462e7 100644 --- a/src/xenia/apu/audio_system.cc +++ b/src/xenia/apu/audio_system.cc @@ -60,7 +60,7 @@ AudioSystem::AudioSystem(Emulator* emulator) memory_(emulator->memory()), worker_running_(false), decoder_running_(false) { - memset(clients_, 0, sizeof(clients_)); + std::memset(clients_, 0, sizeof(clients_)); for (size_t i = 0; i < maximum_client_count_; ++i) { unused_clients_.push(i); } diff --git a/src/xenia/cpu/backend/backend.cc b/src/xenia/cpu/backend/backend.cc index 2b8d307fe..741957d66 100644 --- a/src/xenia/cpu/backend/backend.cc +++ b/src/xenia/cpu/backend/backend.cc @@ -14,7 +14,7 @@ namespace cpu { namespace backend { Backend::Backend(Processor* processor) : processor_(processor) { - memset(&machine_info_, 0, sizeof(machine_info_)); + std::memset(&machine_info_, 0, sizeof(machine_info_)); } Backend::~Backend() = default; diff --git a/src/xenia/cpu/compiler/passes/register_allocation_pass.cc b/src/xenia/cpu/compiler/passes/register_allocation_pass.cc index 1a63eb8f8..8527b0365 100644 --- a/src/xenia/cpu/compiler/passes/register_allocation_pass.cc +++ b/src/xenia/cpu/compiler/passes/register_allocation_pass.cc @@ -39,7 +39,7 @@ RegisterAllocationPass::RegisterAllocationPass(const MachineInfo* machine_info) // Initialize register sets. // TODO(benvanik): rewrite in a way that makes sense - this is terrible. auto mi_sets = machine_info->register_sets; - memset(&usage_sets_, 0, sizeof(usage_sets_)); + std::memset(&usage_sets_, 0, sizeof(usage_sets_)); uint32_t n = 0; while (mi_sets[n].count) { auto& mi_set = mi_sets[n]; diff --git a/src/xenia/cpu/frontend/ppc_hir_builder.cc b/src/xenia/cpu/frontend/ppc_hir_builder.cc index af067fb51..b91e73bfa 100644 --- a/src/xenia/cpu/frontend/ppc_hir_builder.cc +++ b/src/xenia/cpu/frontend/ppc_hir_builder.cc @@ -70,8 +70,8 @@ bool PPCHIRBuilder::Emit(FunctionInfo* symbol_info, uint32_t flags) { size_t list_size = instr_count_ * sizeof(void*); instr_offset_list_ = (Instr**)arena_->Alloc(list_size); label_list_ = (Label**)arena_->Alloc(list_size); - memset(instr_offset_list_, 0, list_size); - memset(label_list_, 0, list_size); + std::memset(instr_offset_list_, 0, list_size); + std::memset(label_list_, 0, list_size); // Always mark entry with label. label_list_[0] = NewLabel(); diff --git a/src/xenia/cpu/symbol_info.cc b/src/xenia/cpu/symbol_info.cc index d7dbb346c..5732c3907 100644 --- a/src/xenia/cpu/symbol_info.cc +++ b/src/xenia/cpu/symbol_info.cc @@ -26,7 +26,7 @@ FunctionInfo::FunctionInfo(Module* module, uint32_t address) end_address_(0), behavior_(BEHAVIOR_DEFAULT), function_(0) { - memset(&extern_info_, 0, sizeof(extern_info_)); + std::memset(&extern_info_, 0, sizeof(extern_info_)); } FunctionInfo::~FunctionInfo() = default; diff --git a/src/xenia/gpu/register_file.cc b/src/xenia/gpu/register_file.cc index e5280ee67..a30af69ab 100644 --- a/src/xenia/gpu/register_file.cc +++ b/src/xenia/gpu/register_file.cc @@ -14,7 +14,7 @@ namespace xe { namespace gpu { -RegisterFile::RegisterFile() { memset(values, 0, sizeof(values)); } +RegisterFile::RegisterFile() { std::memset(values, 0, sizeof(values)); } const RegisterInfo* RegisterFile::GetRegisterInfo(uint32_t index) { switch (index) { diff --git a/src/xenia/kernel/object_table.cc b/src/xenia/kernel/object_table.cc index d80a93098..8defb54c5 100644 --- a/src/xenia/kernel/object_table.cc +++ b/src/xenia/kernel/object_table.cc @@ -68,7 +68,7 @@ X_STATUS ObjectTable::FindFreeSlot(uint32_t* out_slot) { } // Zero out new memory. if (new_table_size > old_table_size) { - memset(reinterpret_cast(new_table) + old_table_size, 0, + std::memset(reinterpret_cast(new_table) + old_table_size, 0, new_table_size - old_table_size); } last_free_entry_ = table_capacity_; diff --git a/src/xenia/kernel/xam_net.cc b/src/xenia/kernel/xam_net.cc index 8f3df0ada..fd5e63df4 100644 --- a/src/xenia/kernel/xam_net.cc +++ b/src/xenia/kernel/xam_net.cc @@ -39,7 +39,7 @@ void LoadSockaddr(const uint8_t* ptr, sockaddr* out_addr) { void StoreSockaddr(const sockaddr& addr, uint8_t* ptr) { switch (addr.sa_family) { case AF_UNSPEC: - memset(ptr, 0, sizeof(addr)); + std::memset(ptr, 0, sizeof(addr)); break; case AF_INET: { auto& in_addr = reinterpret_cast(addr); @@ -98,7 +98,7 @@ SHIM_CALL NetDll_XNetRandom_shim(PPCContext* ppc_state, KernelState* state) { // For now, constant values. // This makes replicating things easier. - memset(SHIM_MEM_ADDR(buffer_ptr), 0xBB, length); + std::memset(SHIM_MEM_ADDR(buffer_ptr), 0xBB, length); SHIM_SET_RETURN_32(0); } @@ -316,7 +316,7 @@ SHIM_CALL NetDll_accept_shim(PPCContext* ppc_state, KernelState* state) { SOCKET ret_socket = accept(socket_handle, &addr, &addrlen); if (ret_socket == INVALID_SOCKET) { - memset(SHIM_MEM_ADDR(addr_ptr), 0, sizeof(addr)); + std::memset(SHIM_MEM_ADDR(addr_ptr), 0, sizeof(addr)); SHIM_SET_MEM_32(addrlen_ptr, sizeof(addr)); SHIM_SET_RETURN_32(-1); } else { @@ -427,7 +427,7 @@ SHIM_CALL NetDll_recvfrom_shim(PPCContext* ppc_state, KernelState* state) { recvfrom(socket_handle, reinterpret_cast(SHIM_MEM_ADDR(buf_ptr)), len, flags, &from, &fromlen); if (ret == -1) { - memset(SHIM_MEM_ADDR(from_ptr), 0, sizeof(from)); + std::memset(SHIM_MEM_ADDR(from_ptr), 0, sizeof(from)); SHIM_SET_MEM_32(fromlen_ptr, sizeof(from)); } else { StoreSockaddr(from, SHIM_MEM_ADDR(from_ptr)); diff --git a/src/xenia/kernel/xam_user.cc b/src/xenia/kernel/xam_user.cc index b4aa0d57f..dad71c4d6 100644 --- a/src/xenia/kernel/xam_user.cc +++ b/src/xenia/kernel/xam_user.cc @@ -209,7 +209,7 @@ SHIM_CALL XamUserReadProfileSettings_shim(PPCContext* ppc_state, buffer_offset = setting->Append(SHIM_MEM_ADDR(user_data_ptr + 24), SHIM_MEM_ADDR(buffer_ptr), buffer_offset); } else { - memset(SHIM_MEM_ADDR(user_data_ptr + 24), 0, 16); + std::memset(SHIM_MEM_ADDR(user_data_ptr + 24), 0, 16); } user_data_ptr += kSettingSize; } diff --git a/src/xenia/kernel/xboxkrnl_memory.cc b/src/xenia/kernel/xboxkrnl_memory.cc index 5e861ce1d..f6d5b5f26 100644 --- a/src/xenia/kernel/xboxkrnl_memory.cc +++ b/src/xenia/kernel/xboxkrnl_memory.cc @@ -383,7 +383,7 @@ SHIM_CALL MmQueryStatistics_shim(PPCContext* ppc_state, KernelState* state) { X_STATUS result = X_STATUS_SUCCESS; // Zero out the struct. - memset(SHIM_MEM_ADDR(stats_ptr), 0, 104); + std::memset(SHIM_MEM_ADDR(stats_ptr), 0, 104); SHIM_SET_MEM_32(stats_ptr + 0, 104); // Set the constants the game is likely asking for. diff --git a/src/xenia/kernel/xboxkrnl_video.cc b/src/xenia/kernel/xboxkrnl_video.cc index 2b1c5eaa2..cfa38074f 100644 --- a/src/xenia/kernel/xboxkrnl_video.cc +++ b/src/xenia/kernel/xboxkrnl_video.cc @@ -277,7 +277,7 @@ SHIM_CALL VdGetSystemCommandBuffer_shim(PPCContext* ppc_state, XELOGD("VdGetSystemCommandBuffer(%.8X, %.8X)", p0_ptr, p1_ptr); - memset(SHIM_MEM_ADDR(p0_ptr), 0, 0x94); + std::memset(SHIM_MEM_ADDR(p0_ptr), 0, 0x94); SHIM_SET_MEM_32(p0_ptr, 0xBEEF0000); SHIM_SET_MEM_32(p1_ptr, 0xBEEF0001); } @@ -430,7 +430,7 @@ SHIM_CALL VdSwap_shim(PPCContext* ppc_state, KernelState* state) { // token value. It'd be nice to figure out what this is really doing so // that we could simulate it, though due to TCR I bet all games need to // use this method. - memset(SHIM_MEM_ADDR(unk0), 0, 64 * 4); + std::memset(SHIM_MEM_ADDR(unk0), 0, 64 * 4); auto dwords = reinterpret_cast(SHIM_MEM_ADDR(unk0)); dwords[0] = xe::byte_swap((0x3 << 30) | ((63 - 1) << 16) | (xe::gpu::xenos::PM4_XE_SWAP << 8)); diff --git a/src/xenia/memory.cc b/src/xenia/memory.cc index 5a74f7649..de26209f5 100644 --- a/src/xenia/memory.cc +++ b/src/xenia/memory.cc @@ -604,7 +604,7 @@ bool BaseHeap::AllocFixed(uint32_t base_address, uint32_t size, } if (FLAGS_scribble_heap && protect & kMemoryProtectWrite) { - memset(result, 0xCD, page_count * page_size_); + std::memset(result, 0xCD, page_count * page_size_); } } diff --git a/src/xenia/ui/win32/win32_window.cc b/src/xenia/ui/win32/win32_window.cc index f5ea3af14..67cced1b3 100644 --- a/src/xenia/ui/win32/win32_window.cc +++ b/src/xenia/ui/win32/win32_window.cc @@ -112,7 +112,7 @@ void Win32Window::EnableMMCSS() { "DwmSetPresentParameters"); if (pDwmSetPresentParameters) { DWM_PRESENT_PARAMETERS pp; - memset(&pp, 0, sizeof(DWM_PRESENT_PARAMETERS)); + std::memset(&pp, 0, sizeof(DWM_PRESENT_PARAMETERS)); pp.cbSize = sizeof(DWM_PRESENT_PARAMETERS); pp.fQueue = FALSE; pp.cBuffer = 2;