From 3c071cefa02916c8665385c2762f6a48f054eb0f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 8 Feb 2017 11:47:29 -0500 Subject: [PATCH] Boot_WiiWAD: Simplify state_checksum Simplifies the interface and gets rid of pointer casts. --- Source/Core/Core/Boot/Boot_WiiWAD.cpp | 31 ++++++++++++++------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Boot/Boot_WiiWAD.cpp index 19d7468162..f03dfedb2e 100644 --- a/Source/Core/Core/Boot/Boot_WiiWAD.cpp +++ b/Source/Core/Core/Boot/Boot_WiiWAD.cpp @@ -2,7 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include +#include #include +#include #include #include "Common/CommonPaths.h" @@ -21,19 +24,6 @@ #include "DiscIO/Volume.h" #include "DiscIO/VolumeCreator.h" -static u32 state_checksum(u32* buf, int len) -{ - u32 checksum = 0; - len = len >> 2; - - for (int i = 0; i < len; i++) - { - checksum += buf[i]; - } - - return checksum; -} - struct StateFlags { u32 checksum; @@ -44,6 +34,17 @@ struct StateFlags u32 unknown[6]; }; +static u32 StateChecksum(const StateFlags& flags) +{ + constexpr size_t length_in_bytes = sizeof(StateFlags) - 4; + constexpr size_t num_elements = length_in_bytes / sizeof(u32); + std::array flag_data; + + std::memcpy(flag_data.data(), &flags.flags, length_in_bytes); + + return std::accumulate(flag_data.cbegin(), flag_data.cend(), 0U); +} + bool CBoot::Boot_WiiWAD(const std::string& _pFilename) { std::string state_filename(Common::GetTitleDataPath(TITLEID_SYSMENU, Common::FROM_SESSION_ROOT) + @@ -56,7 +57,7 @@ bool CBoot::Boot_WiiWAD(const std::string& _pFilename) state_file.ReadBytes(&state, sizeof(StateFlags)); state.type = 0x03; // TYPE_RETURN - state.checksum = state_checksum((u32*)&state.flags, sizeof(StateFlags) - 4); + state.checksum = StateChecksum(state); state_file.Seek(0, SEEK_SET); state_file.WriteBytes(&state, sizeof(StateFlags)); @@ -69,7 +70,7 @@ bool CBoot::Boot_WiiWAD(const std::string& _pFilename) memset(&state, 0, sizeof(StateFlags)); state.type = 0x03; // TYPE_RETURN state.discstate = 0x01; // DISCSTATE_WII - state.checksum = state_checksum((u32*)&state.flags, sizeof(StateFlags) - 4); + state.checksum = StateChecksum(state); state_file.WriteBytes(&state, sizeof(StateFlags)); }