Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 19:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve alignment issues and type-punning in multi_external.h

Browse Source 
$GIT/Descent3/multi_external.h:286:31: runtime error: store to misaligned address 0x7f3f760a3041 for type 'int16_t', which requires 2 byte alignment
$GIT/Descent3/multi_external.h:291:32: runtime error: store to misaligned address 0x7f3f760a3043 for type 'uint16_t', which requires 2 byte alignment
This commit is contained in:
Jan Engelhardt 2024-08-30 04:21:53 +02:00
parent e1af53bbcc
commit 6fd084b75d
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Descent3/multi_external.h
View File

@ -283,27 +283,32 @@ inline void MultiAddSbyte(int8_t element, uint8_t *data, int *count) {
}
inline void MultiAddShort(int16_t element, uint8_t *data, int *count) {
*(int16_t *)(data + *count) = INTEL_SHORT(element);
int16_t conv = INTEL_SHORT(element);
memcpy(&data[*count], &conv, sizeof(conv));
*count += sizeof(int16_t);
}
inline void MultiAddUshort(uint16_t element, uint8_t *data, int *count) {
*(uint16_t *)(data + *count) = INTEL_SHORT(element);
uint16_t conv = INTEL_SHORT(element);
memcpy(&data[*count], &conv, sizeof(conv));
*count += sizeof(uint16_t);
}
inline void MultiAddInt(int element, uint8_t *data, int *count) {
*(int *)(data + *count) = INTEL_INT(element);
int32_t conv = INTEL_INT(element);
memcpy(&data[*count], &conv, sizeof(conv));
*count += sizeof(int);
}
inline void MultiAddUint(uint32_t element, uint8_t *data, int *count) {
*(uint32_t *)(data + *count) = INTEL_INT(element);
uint32_t conv = INTEL_INT(element);
memcpy(&data[*count], &conv, sizeof(conv));
*count += sizeof(uint32_t);
}
inline void MultiAddFloat(float element, uint8_t *data, int *count) {
*(float *)(data + *count) = INTEL_FLOAT(element);
float conv = INTEL_FLOAT(element);
memcpy(&data[*count], &conv, sizeof(conv));
*count += sizeof(float);
}
@ -335,31 +340,36 @@ inline int8_t MultiGetSbyte(uint8_t *data, int *count) {
}
inline int16_t MultiGetShort(uint8_t *data, int *count) {
int16_t element = (*(int16_t *)(data + *count));
int16_t element;
memcpy(&element, &data[*count], sizeof(element));
*count += sizeof(int16_t);
return INTEL_SHORT(element);
}
inline uint16_t MultiGetUshort(uint8_t *data, int *count) {
uint16_t element = (*(uint16_t *)(data + *count));
uint16_t element;
memcpy(&element, &data[*count], sizeof(element));
*count += sizeof(int16_t);
return INTEL_SHORT(element);
}
inline int MultiGetInt(uint8_t *data, int *count) {
int element = (*(int *)(data + *count));
*count += sizeof(int);
int32_t element;
memcpy(&element, &data[*count], sizeof(element));
*count += sizeof(int32_t);
return INTEL_INT(element);
}
inline uint32_t MultiGetUint(uint8_t *data, int *count) {
uint32_t element = (*(uint32_t *)(data + *count));
*count += sizeof(int);
uint32_t element;
memcpy(&element, &data[*count], sizeof(element));
*count += sizeof(uint32_t);
return INTEL_INT(element);
}
inline float MultiGetFloat(uint8_t *data, int *count) {
float element = (*(float *)(data + *count));
float element;
memcpy(&element, &data[*count], sizeof(element));
*count += sizeof(float);
return INTEL_FLOAT(element);
}