d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite twowords() to access its argument through a char pointer and not

Browse Source 
a short pointer.  The previous implementation seems to be in a gray zone
of the C standard, and GCC generates incorrect code for it at -O2 or
higher on some platforms.
This commit is contained in:
des 2004-07-06 09:22:18 +00:00
parent 3a60494e74
commit c05f2ebe92
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libalias/alias.c
View File

@ -139,9 +139,16 @@ __FBSDID("$FreeBSD$");
static __inline int
twowords(void *p)
{
u_short *s = p;
uint8_t *c = p;
return (s[0] + s[1]);
#if BYTE_ORDER == LITTLE_ENDIAN
uint16_t s1 = ((uint16_t)c[1] << 8) + (uint16_t)c[0];
uint16_t s2 = ((uint16_t)c[3] << 8) + (uint16_t)c[2];
#else
uint16_t s1 = ((uint16_t)c[0] << 8) + (uint16_t)c[1];
uint16_t s2 = ((uint16_t)c[2] << 8) + (uint16_t)c[3];
#endif
return (s1 + s2);
}
/* TCP Handling Routines

11
sys/netinet/libalias/alias.c
View File

@ -139,9 +139,16 @@ __FBSDID("$FreeBSD$");
static __inline int
twowords(void *p)
{
u_short *s = p;
uint8_t *c = p;
return (s[0] + s[1]);
#if BYTE_ORDER == LITTLE_ENDIAN
uint16_t s1 = ((uint16_t)c[1] << 8) + (uint16_t)c[0];
uint16_t s2 = ((uint16_t)c[3] << 8) + (uint16_t)c[2];
#else
uint16_t s1 = ((uint16_t)c[0] << 8) + (uint16_t)c[1];
uint16_t s2 = ((uint16_t)c[2] << 8) + (uint16_t)c[3];
#endif
return (s1 + s2);
}
/* TCP Handling Routines