summaryrefslogtreecommitdiff
path: root/msgpack/pack/inline_impl.h
diff options
context:
space:
mode:
Diffstat (limited to 'msgpack/pack/inline_impl.h')
-rw-r--r--msgpack/pack/inline_impl.h66
1 files changed, 36 insertions, 30 deletions
diff --git a/msgpack/pack/inline_impl.h b/msgpack/pack/inline_impl.h
index 5c4bfed..08a5bc1 100644
--- a/msgpack/pack/inline_impl.h
+++ b/msgpack/pack/inline_impl.h
@@ -23,25 +23,25 @@
#ifdef __LITTLE_ENDIAN__
-#define STORE_16(d) \
+#define STORE_BE16(d) \
((char*)&d)[1], ((char*)&d)[0]
-#define STORE_32(d) \
+#define STORE_BE32(d) \
((char*)&d)[3], ((char*)&d)[2], ((char*)&d)[1], ((char*)&d)[0]
-#define STORE_64(d) \
+#define STORE_BE64(d) \
((char*)&d)[7], ((char*)&d)[6], ((char*)&d)[5], ((char*)&d)[4], \
((char*)&d)[3], ((char*)&d)[2], ((char*)&d)[1], ((char*)&d)[0]
#elif __BIG_ENDIAN__
-#define STORE_16(d) \
- ((char*)&d)[2], ((char*)&d)[3]
+#define STORE_BE16(d) \
+ ((char*)&d)[0], ((char*)&d)[1]
-#define STORE_32(d) \
+#define STORE_BE32(d) \
((char*)&d)[0], ((char*)&d)[1], ((char*)&d)[2], ((char*)&d)[3]
-#define STORE_32(d) \
+#define STORE_BE64(d) \
((char*)&d)[0], ((char*)&d)[1], ((char*)&d)[2], ((char*)&d)[3], \
((char*)&d)[4], ((char*)&d)[5], ((char*)&d)[6], ((char*)&d)[7]
@@ -57,10 +57,10 @@ inline void msgpack_pack_int(msgpack_pack_context x, int d)
{
if(d < -32) {
if(d < -32768) { // signed 32
- const unsigned char buf[5] = {0xd2, STORE_32(d)};
+ const unsigned char buf[5] = {0xd2, STORE_BE32(d)};
msgpack_pack_append_buffer(x, buf, 5);
} else if(d < -128) { // signed 16
- const unsigned char buf[3] = {0xd1, STORE_16(d)};
+ const unsigned char buf[3] = {0xd1, STORE_BE16(d)};
msgpack_pack_append_buffer(x, buf, 3);
} else { // signed 8
const unsigned char buf[2] = {0xd0, (uint8_t)d};
@@ -75,11 +75,11 @@ inline void msgpack_pack_int(msgpack_pack_context x, int d)
msgpack_pack_append_buffer(x, buf, 2);
} else if(d < 65536) {
// unsigned 16
- const unsigned char buf[3] = {0xcd, STORE_16(d)};
+ const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
msgpack_pack_append_buffer(x, buf, 3);
} else {
// unsigned 32
- const unsigned char buf[5] = {0xce, STORE_32(d)};
+ const unsigned char buf[5] = {0xce, STORE_BE32(d)};
msgpack_pack_append_buffer(x, buf, 5);
}
}
@@ -97,11 +97,11 @@ inline void msgpack_pack_unsigned_int(msgpack_pack_context x, unsigned int d)
msgpack_pack_append_buffer(x, buf, 2);
} else if(d < 65536) {
// unsigned 16
- const unsigned char buf[3] = {0xcd, STORE_16(d)};
+ const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
msgpack_pack_append_buffer(x, buf, 3);
} else {
// unsigned 32
- const unsigned char buf[5] = {0xce, STORE_32(d)};
+ const unsigned char buf[5] = {0xce, STORE_BE32(d)};
msgpack_pack_append_buffer(x, buf, 5);
}
}
@@ -118,20 +118,20 @@ inline void msgpack_pack_unsigned_int_8(msgpack_pack_context x, uint8_t d)
inline void msgpack_pack_unsigned_int_16(msgpack_pack_context x, uint16_t d)
{
- const unsigned char buf[3] = {0xcd, STORE_16(d)};
+ const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
msgpack_pack_append_buffer(x, buf, 3);
}
inline void msgpack_pack_unsigned_int_32(msgpack_pack_context x, uint32_t d)
{
- const unsigned char buf[5] = {0xce, STORE_32(d)};
+ const unsigned char buf[5] = {0xce, STORE_BE32(d)};
msgpack_pack_append_buffer(x, buf, 5);
}
inline void msgpack_pack_unsigned_int_64(msgpack_pack_context x, uint64_t d)
{
- // FIXME
- const unsigned char buf[9] = {0xcf, STORE_64(d)};
+ // FIXME optimization
+ const unsigned char buf[9] = {0xcf, STORE_BE64(d)};
msgpack_pack_append_buffer(x, buf, 9);
}
@@ -149,20 +149,20 @@ inline void msgpack_pack_signed_int_8(msgpack_pack_context x, int8_t d)
inline void msgpack_pack_signed_int_16(msgpack_pack_context x, int16_t d)
{
- const unsigned char buf[3] = {0xd1, STORE_16(d)};
+ const unsigned char buf[3] = {0xd1, STORE_BE16(d)};
msgpack_pack_append_buffer(x, buf, 3);
}
inline void msgpack_pack_signed_int_32(msgpack_pack_context x, int32_t d)
{
- const unsigned char buf[5] = {0xd2, STORE_32(d)};
+ const unsigned char buf[5] = {0xd2, STORE_BE32(d)};
msgpack_pack_append_buffer(x, buf, 5);
}
inline void msgpack_pack_signed_int_64(msgpack_pack_context x, int64_t d)
{
- // FIXME
- const unsigned char buf[9] = {0xd3, STORE_64(d)};
+ // FIXME optimization
+ const unsigned char buf[9] = {0xd3, STORE_BE64(d)};
msgpack_pack_append_buffer(x, buf, 9);
}
@@ -174,14 +174,14 @@ inline void msgpack_pack_signed_int_64(msgpack_pack_context x, int64_t d)
inline void msgpack_pack_float(msgpack_pack_context x, float d)
{
uint32_t n = *((uint32_t*)&d); // FIXME
- const unsigned char buf[5] = {0xca, STORE_32(n)};
+ const unsigned char buf[5] = {0xca, STORE_BE32(n)};
msgpack_pack_append_buffer(x, buf, 5);
}
inline void msgpack_pack_double(msgpack_pack_context x, double d)
{
uint64_t n = *((uint64_t*)&d); // FIXME
- const unsigned char buf[9] = {0xcb, STORE_64(n)};
+ const unsigned char buf[9] = {0xcb, STORE_BE64(n)};
msgpack_pack_append_buffer(x, buf, 9);
}
@@ -200,6 +200,7 @@ inline void msgpack_pack_nil(msgpack_pack_context x)
/*
* Boolean
*/
+
inline void msgpack_pack_true(msgpack_pack_context x)
{
static const unsigned char d = 0xc3;
@@ -224,11 +225,11 @@ inline void msgpack_pack_array(msgpack_pack_context x, unsigned int n)
msgpack_pack_append_buffer(x, &d, 1);
} else if(n < 65536) {
uint16_t d = (uint16_t)n;
- unsigned char buf[3] = {0xdc, STORE_16(d)};
+ unsigned char buf[3] = {0xdc, STORE_BE16(d)};
msgpack_pack_append_buffer(x, buf, 3);
} else {
uint32_t d = (uint32_t)n;
- unsigned char buf[5] = {0xdd, STORE_32(d)};
+ unsigned char buf[5] = {0xdd, STORE_BE32(d)};
msgpack_pack_append_buffer(x, buf, 5);
}
}
@@ -245,18 +246,18 @@ inline void msgpack_pack_map(msgpack_pack_context x, unsigned int n)
msgpack_pack_append_buffer(x, &d, 1);
} else if(n < 65536) {
uint16_t d = (uint16_t)n;
- unsigned char buf[3] = {0xde, STORE_16(d)};
+ unsigned char buf[3] = {0xde, STORE_BE16(d)};
msgpack_pack_append_buffer(x, buf, 3);
} else {
uint32_t d = (uint32_t)n;
- unsigned char buf[5] = {0xdf, STORE_32(d)};
+ unsigned char buf[5] = {0xdf, STORE_BE32(d)};
msgpack_pack_append_buffer(x, buf, 5);
}
}
/*
- * String
+ * Raw
*/
inline void msgpack_pack_string(msgpack_pack_context x, const char* b)
@@ -272,16 +273,21 @@ inline void msgpack_pack_raw(msgpack_pack_context x, const void* b, size_t l)
msgpack_pack_append_buffer(x, &d, 1);
} else if(l < 65536) {
uint16_t d = (uint16_t)l;
- unsigned char buf[3] = {0xda, STORE_16(d)};
+ unsigned char buf[3] = {0xda, STORE_BE16(d)};
msgpack_pack_append_buffer(x, buf, 3);
} else {
uint32_t d = (uint32_t)l;
- unsigned char buf[5] = {0xdb, STORE_32(d)};
+ unsigned char buf[5] = {0xdb, STORE_BE32(d)};
msgpack_pack_append_buffer(x, buf, 5);
}
msgpack_pack_append_buffer(x, b, l);
}
+#undef STORE_BE16(d)
+#undef STORE_BE32(d)
+#undef STORE_BE64(d)
+
+
#endif /* msgpack/pack/inline_impl.h */
View Lorry Controller Status