mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: Replace SaveLoad var length arrays with switch block and sizeof. (#12570) 

SlCalcConvMemLen(), SlCalcConfFileLen() and CalcOldVarLen() follow a pattern of looking up part of a value in an array.

These function returns the size of bytes of a variable type, but is not very clear. Replace with a switch block instead.

Removes lengthof, array indices, and magic numbers.
This commit is contained in:
Peter Nelson 2024-04-24 21:33:29 +01:00 committed by GitHub
parent 1dc94d0670
commit 26bb87ebf1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/saveload/oldloader.cpp
View File

@ -33,12 +33,24 @@ static inline OldChunkType GetOldChunkType(OldChunkType type) {return (OldCh
static inline OldChunkType GetOldChunkVarType(OldChunkType type) {return (OldChunkType)(GB(type, 8, 8) << 8);} static inline OldChunkType GetOldChunkVarType(OldChunkType type) {return (OldChunkType)(GB(type, 8, 8) << 8);}
static inline OldChunkType GetOldChunkFileType(OldChunkType type) {return (OldChunkType)(GB(type, 16, 8) << 16);} static inline OldChunkType GetOldChunkFileType(OldChunkType type) {return (OldChunkType)(GB(type, 16, 8) << 16);}
/**
* Return expected size in bytes of a OldChunkType
* @param type OldChunkType to get size of.
* @return size of type in bytes.
*/
static inline uint8_t CalcOldVarLen(OldChunkType type) static inline uint8_t CalcOldVarLen(OldChunkType type)
{ {
static const uint8_t type_mem_size[] = {0, 1, 1, 2, 2, 4, 4, 8}; switch (GetOldChunkVarType(type)) {
uint8_t length = GB(type, 8, 8); case OC_VAR_I8: return sizeof(int8_t);
assert(length != 0 && length < lengthof(type_mem_size)); case OC_VAR_U8: return sizeof(uint8_t);
return type_mem_size[length]; case OC_VAR_I16: return sizeof(int16_t);
case OC_VAR_U16: return sizeof(uint16_t);
case OC_VAR_I32: return sizeof(int32_t);
case OC_VAR_U32: return sizeof(uint32_t);
case OC_VAR_I64: return sizeof(int64_t);
case OC_VAR_U64: return sizeof(uint64_t);
default: NOT_REACHED();
}
} }
/** /**

37
src/saveload/saveload.cpp
View File

@ -599,17 +599,25 @@ static uint8_t GetSavegameFileType(const SaveLoad &sld)
*/ */
static inline uint SlCalcConvMemLen(VarType conv) static inline uint SlCalcConvMemLen(VarType conv)
{ {
static const uint8_t conv_mem_size[] = {1, 1, 1, 2, 2, 4, 4, 8, 8, 0};
switch (GetVarMemType(conv)) { switch (GetVarMemType(conv)) {
case SLE_VAR_BL: return sizeof(bool);
case SLE_VAR_I8: return sizeof(int8_t);
case SLE_VAR_U8: return sizeof(uint8_t);
case SLE_VAR_I16: return sizeof(int16_t);
case SLE_VAR_U16: return sizeof(uint16_t);
case SLE_VAR_I32: return sizeof(int32_t);
case SLE_VAR_U32: return sizeof(uint32_t);
case SLE_VAR_I64: return sizeof(int64_t);
case SLE_VAR_U64: return sizeof(uint64_t);
case SLE_VAR_NULL: return 0;
case SLE_VAR_STR: case SLE_VAR_STR:
case SLE_VAR_STRQ: case SLE_VAR_STRQ:
return SlReadArrayLength(); return SlReadArrayLength();
case SLE_VAR_NAME:
default: default:
uint8_t type = GetVarMemType(conv) >> 4; NOT_REACHED();
assert(type < lengthof(conv_mem_size));
return conv_mem_size[type];
} }
} }
@ -621,17 +629,24 @@ static inline uint SlCalcConvMemLen(VarType conv)
*/ */
static inline uint8_t SlCalcConvFileLen(VarType conv) static inline uint8_t SlCalcConvFileLen(VarType conv)
{ {
static const uint8_t conv_file_size[] = {0, 1, 1, 2, 2, 4, 4, 8, 8, 2};
switch (GetVarFileType(conv)) { switch (GetVarFileType(conv)) {
case SLE_FILE_END: return 0;
case SLE_FILE_I8: return sizeof(int8_t);
case SLE_FILE_U8: return sizeof(uint8_t);
case SLE_FILE_I16: return sizeof(int16_t);
case SLE_FILE_U16: return sizeof(uint16_t);
case SLE_FILE_I32: return sizeof(int32_t);
case SLE_FILE_U32: return sizeof(uint32_t);
case SLE_FILE_I64: return sizeof(int64_t);
case SLE_FILE_U64: return sizeof(uint64_t);
case SLE_FILE_STRINGID: return sizeof(uint16_t);
case SLE_FILE_STRING: case SLE_FILE_STRING:
return SlReadArrayLength(); return SlReadArrayLength();
case SLE_FILE_STRUCT:
default: default:
uint8_t type = GetVarFileType(conv); NOT_REACHED();
if (type >= lengthof(conv_file_size)) fmt::println("{}", type);
assert(type < lengthof(conv_file_size));
return conv_file_size[type];
} }
} }