#define LOW_BIT(x) ((x) & 0xFFFF)
#define NUM_BITS(x) ((x) >> 16)
-/* This seems nore a compiler issue than a Windows/non-Windows one */
-#ifdef MS_WIN32
-# define BIT_MASK(size) ((1 << NUM_BITS(size))-1)
-#else
-# define BIT_MASK(size) ((1LL << NUM_BITS(size))-1)
-#endif
+/* Doesn't work if NUM_BITS(size) == 0, but it never happens in SET() call. */
+#define BIT_MASK(type, size) (((((type)1 << (NUM_BITS(size) - 1)) - 1) << 1) + 1)
/* This macro CHANGES the first parameter IN PLACE. For proper sign handling,
we must first shift left, then right.
}
/* This macro RETURNS the first parameter with the bit field CHANGED. */
-#define SET(x, v, size) \
+#define SET(type, x, v, size) \
(NUM_BITS(size) ? \
- ( ( x & ~(BIT_MASK(size) << LOW_BIT(size)) ) | ( (v & BIT_MASK(size)) << LOW_BIT(size) ) ) \
- : v)
+ ( ( (type)x & ~(BIT_MASK(type, size) << LOW_BIT(size)) ) | ( ((type)v & BIT_MASK(type, size)) << LOW_BIT(size) ) ) \
+ : (type)v)
/* byte swapping macros */
#define SWAP_2(v) \
long val;
if (get_long(value, &val) < 0)
return NULL;
- *(signed char *)ptr = (signed char)SET(*(signed char *)ptr, (signed char)val, size);
+ *(signed char *)ptr = SET(signed char, *(signed char *)ptr, val, size);
_RET(value);
}
unsigned long val;
if (get_ulong(value, &val) < 0)
return NULL;
- *(unsigned char *)ptr = (unsigned char)SET(*(unsigned char*)ptr,
- (unsigned short)val, size);
+ *(unsigned char *)ptr = SET(unsigned char, *(unsigned char*)ptr, val, size);
_RET(value);
}
if (get_long(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, (short)val, size);
+ x = SET(short, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_2(field);
- field = SET(field, (short)val, size);
+ field = SET(short, field, val, size);
field = SWAP_2(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
if (get_ulong(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, (unsigned short)val, size);
+ x = SET(unsigned short, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_2(field);
- field = SET(field, (unsigned short)val, size);
+ field = SET(unsigned short, field, val, size);
field = SWAP_2(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
if (get_long(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, (int)val, size);
+ x = SET(int, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_INT(field);
- field = SET(field, (int)val, size);
+ field = SET(int, field, val, size);
field = SWAP_INT(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
if (get_ulong(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, (unsigned int)val, size);
+ x = SET(unsigned int, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
if (get_ulong(value, &val) < 0)
return NULL;
memcpy(&field, ptr, sizeof(field));
- field = (unsigned int)SET(field, (unsigned int)val, size);
+ field = SET(unsigned int, field, (unsigned int)val, size);
field = SWAP_INT(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
if (get_long(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, val, size);
+ x = SET(long, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_LONG(field);
- field = (long)SET(field, val, size);
+ field = SET(long, field, val, size);
field = SWAP_LONG(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
if (get_ulong(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, val, size);
+ x = SET(unsigned long, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_LONG(field);
- field = (unsigned long)SET(field, val, size);
+ field = SET(unsigned long, field, val, size);
field = SWAP_LONG(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
if (get_longlong(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, val, size);
+ x = SET(PY_LONG_LONG, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_8(field);
- field = (PY_LONG_LONG)SET(field, val, size);
+ field = SET(PY_LONG_LONG, field, val, size);
field = SWAP_8(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
if (get_ulonglong(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, val, size);
+ x = SET(PY_LONG_LONG, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_8(field);
- field = (unsigned PY_LONG_LONG)SET(field, val, size);
+ field = SET(unsigned PY_LONG_LONG, field, val, size);
field = SWAP_8(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);