mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-29 00:34:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13537 from tygyh/DiscIO-Make-variables-constexpr

Browse source 
DiscIO: Make variables constexpr
This commit is contained in:
Tilka 2025-04-21 00:52:18 +01:00 • committed by GitHub
commit 7e7b75c1e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/DiscIO/CISOBlob.h
View file

@ -15,8 +15,8 @@ namespace DiscIO
{ {
static constexpr u32 CISO_MAGIC = 0x4F534943; // "CISO" (byteswapped to little endian) static constexpr u32 CISO_MAGIC = 0x4F534943; // "CISO" (byteswapped to little endian)
static const u32 CISO_HEADER_SIZE = 0x8000; static constexpr u32 CISO_HEADER_SIZE = 0x8000;
static const u32 CISO_MAP_SIZE = CISO_HEADER_SIZE - sizeof(u32) - sizeof(char) * 4; static constexpr u32 CISO_MAP_SIZE = CISO_HEADER_SIZE - sizeof(u32) - sizeof(char) * 4;
struct CISOHeader struct CISOHeader
{ {
@ -53,7 +53,7 @@ private:
CISOFileReader(File::IOFile file); CISOFileReader(File::IOFile file);
typedef u16 MapType; typedef u16 MapType;
static const MapType UNUSED_BLOCK_ID = UINT16_MAX; static constexpr MapType UNUSED_BLOCK_ID = UINT16_MAX;
File::IOFile m_file; File::IOFile m_file;
u64 m_size; u64 m_size;

2
Source/Core/DiscIO/FileSystemGCWii.cpp
View file

@ -247,7 +247,7 @@ FileSystemGCWii::FileSystemGCWii(const VolumeDisc* volume, const Partition& part
// 128 MiB is more than the total amount of RAM in a Wii. // 128 MiB is more than the total amount of RAM in a Wii.
// No file system should use anywhere near that much. // No file system should use anywhere near that much.
static const u32 ARBITRARY_FILE_SYSTEM_SIZE_LIMIT = 128 * 1024 * 1024; static constexpr u32 ARBITRARY_FILE_SYSTEM_SIZE_LIMIT = 128 * 1024 * 1024;
if (*fst_size > ARBITRARY_FILE_SYSTEM_SIZE_LIMIT) if (*fst_size > ARBITRARY_FILE_SYSTEM_SIZE_LIMIT)
{ {
// Without this check, Dolphin can crash by trying to allocate too much // Without this check, Dolphin can crash by trying to allocate too much

10
Source/Core/DiscIO/Volume.h
View file

@ -162,11 +162,11 @@ protected:
virtual u32 GetOffsetShift() const { return 0; } virtual u32 GetOffsetShift() const { return 0; }
static std::map<Language, std::string> ReadWiiNames(const std::vector<char16_t>& data); static std::map<Language, std::string> ReadWiiNames(const std::vector<char16_t>& data);
static const size_t NUMBER_OF_LANGUAGES = 10; static constexpr size_t NUMBER_OF_LANGUAGES = 10;
static const size_t NAME_CHARS_LENGTH = 42; static constexpr size_t NAME_CHARS_LENGTH = 42;
static const size_t NAME_BYTES_LENGTH = NAME_CHARS_LENGTH * sizeof(char16_t); static constexpr size_t NAME_BYTES_LENGTH = NAME_CHARS_LENGTH * sizeof(char16_t);
static const size_t NAMES_TOTAL_CHARS = NAME_CHARS_LENGTH * NUMBER_OF_LANGUAGES; static constexpr size_t NAMES_TOTAL_CHARS = NAME_CHARS_LENGTH * NUMBER_OF_LANGUAGES;
static const size_t NAMES_TOTAL_BYTES = NAME_BYTES_LENGTH * NUMBER_OF_LANGUAGES; static constexpr size_t NAMES_TOTAL_BYTES = NAME_BYTES_LENGTH * NUMBER_OF_LANGUAGES;
static const IOS::ES::TicketReader INVALID_TICKET; static const IOS::ES::TicketReader INVALID_TICKET;
static const IOS::ES::TMDReader INVALID_TMD; static const IOS::ES::TMDReader INVALID_TMD;

8
Source/Core/DiscIO/VolumeGC.h
View file

@ -53,8 +53,8 @@ public:
std::array<u8, 20> GetSyncHash() const override; std::array<u8, 20> GetSyncHash() const override;
private: private:
static const u32 GC_BANNER_WIDTH = 96; static constexpr u32 GC_BANNER_WIDTH = 96;
static const u32 GC_BANNER_HEIGHT = 32; static constexpr u32 GC_BANNER_HEIGHT = 32;
struct GCBannerInformation struct GCBannerInformation
{ {
@ -95,8 +95,8 @@ private:
ConvertedGCBanner LoadBannerFile() const; ConvertedGCBanner LoadBannerFile() const;
ConvertedGCBanner ExtractBannerInformation(const GCBanner& banner_file, bool is_bnr1) const; ConvertedGCBanner ExtractBannerInformation(const GCBanner& banner_file, bool is_bnr1) const;
static const size_t BNR1_SIZE = sizeof(GCBanner) - sizeof(GCBannerInformation) * 5; static constexpr size_t BNR1_SIZE = sizeof(GCBanner) - sizeof(GCBannerInformation) * 5;
static const size_t BNR2_SIZE = sizeof(GCBanner); static constexpr size_t BNR2_SIZE = sizeof(GCBanner);
Common::Lazy<ConvertedGCBanner> m_converted_banner; Common::Lazy<ConvertedGCBanner> m_converted_banner;

6
Source/Core/DiscIO/WbfsBlob.cpp
View file

@ -20,9 +20,9 @@
namespace DiscIO namespace DiscIO
{ {
static const u64 WII_SECTOR_SIZE = 0x8000; static constexpr u64 WII_SECTOR_SIZE = 0x8000;
static const u64 WII_SECTOR_COUNT = 143432 * 2; static constexpr u64 WII_SECTOR_COUNT = 143432 * 2;
static const u64 WII_DISC_HEADER_SIZE = 256; static constexpr u64 WII_DISC_HEADER_SIZE = 256;
WbfsFileReader::WbfsFileReader(File::IOFile file, const std::string& path) WbfsFileReader::WbfsFileReader(File::IOFile file, const std::string& path)
: m_size(0), m_good(false) : m_size(0), m_good(false)