MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Clean up serialization helpers and add endianness check

Browse source 
We don't handle big endian at the moment, so let's
error out on that.
This commit is contained in:
Jonas Kulla 2013-10-14 12:57:30 +02:00
parent 2a83cfc1e1
commit 36b904ede3
1 changed files with 32 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/serial-util.h
View file

@ -23,13 +23,22 @@
#define SERIALUTIL_H #define SERIALUTIL_H
#include <stdint.h> #include <stdint.h>
#include <string.h>
#include <SDL_endian.h>
typedef unsigned uint; typedef unsigned uint;
#if SDL_BYTEORDER != SDL_LIL_ENDIAN
#error "Non little endian systems not supported"
#endif
static inline int16_t static inline int16_t
read_int16(const char *data, uint &i) read_int16(const char *data, uint &i)
{ {
int16_t result = (data[i] & 0x000000FF) | ((data[i+1] << 8) & 0x0000FF00); int16_t result;
memcpy(&result, &data[i], 2);
i += 2; i += 2;
return result; return result;
@ -38,68 +47,47 @@ read_int16(const char *data, uint &i)
static inline int32_t static inline int32_t
read_int32(const char *data, uint &i) read_int32(const char *data, uint &i)
{ {
int32_t result = ((data[i+0] << 0x00) & 0x000000FF) int32_t result;
| ((data[i+1] << 0x08) & 0x0000FF00)
| ((data[i+2] << 0x10) & 0x00FF0000) memcpy(&result, &data[i], 4);
| ((data[i+3] << 0x18) & 0xFF000000);
i += 4; i += 4;
return result; return result;
} }
static inline double
read_double(const char *data, uint &i)
{
double result;
memcpy(&result, &data[i], 8);
i += 8;
return result;
}
static inline void static inline void
write_int16(char **data, int16_t value) write_int16(char **data, int16_t value)
{ {
*(*data)++ = (value >> 0) & 0xFF; memcpy(*data, &value, 2);
*(*data)++ = (value >> 8) & 0xFF;
data += 2;
} }
static inline void static inline void
write_int32(char **data, int32_t value) write_int32(char **data, int32_t value)
{ {
*(*data)++ = (value >> 0x00) & 0xFF; memcpy(*data, &value, 4);
*(*data)++ = (value >> 0x08) & 0xFF;
*(*data)++ = (value >> 0x10) & 0xFF;
*(*data)++ = (value >> 0x18) & 0xFF;
}
union doubleInt data += 4;
{ }
double d;
int64_t i;
};
static inline void static inline void
write_double(char **data, double value) write_double(char **data, double value)
{ {
doubleInt di; memcpy(*data, &value, 8);
di.d = value;
*(*data)++ = (di.i >> 0x00) & 0xFF; data += 8;
*(*data)++ = (di.i >> 0x08) & 0xFF;
*(*data)++ = (di.i >> 0x10) & 0xFF;
*(*data)++ = (di.i >> 0x18) & 0xFF;
*(*data)++ = (di.i >> 0x20) & 0xFF;
*(*data)++ = (di.i >> 0x28) & 0xFF;
*(*data)++ = (di.i >> 0x30) & 0xFF;
*(*data)++ = (di.i >> 0x38) & 0xFF;
}
static inline double
read_double(const char *data, uint &i)
{
doubleInt di;
di.i = (((int64_t)data[i+0] << 0x00) & 0x00000000000000FF)
| (((int64_t)data[i+1] << 0x08) & 0x000000000000FF00)
| (((int64_t)data[i+2] << 0x10) & 0x0000000000FF0000)
| (((int64_t)data[i+3] << 0x18) & 0x00000000FF000000)
| (((int64_t)data[i+4] << 0x20) & 0x000000FF00000000)
| (((int64_t)data[i+5] << 0x28) & 0x0000FF0000000000)
| (((int64_t)data[i+6] << 0x30) & 0x00FF000000000000)
| (((int64_t)data[i+7] << 0x38) & 0xFF00000000000000);
i += 8;
return di.d;
} }
#endif // SERIALUTIL_H #endif // SERIALUTIL_H