Expand codec bitfield from 32 bits to 64 bits.

Reviewboard: https://reviewboard.asterisk.org/r/416/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@227580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-11-04 14:05:12 +00:00
parent 6a50e7a031
commit d8e0c58437
124 changed files with 1777 additions and 1366 deletions

View File

@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
* Copyright (C) 1999 - 2005, Digium, Inc.
* Copyright (C) 1999 - 2009, Digium, Inc.
*
* Mark Spencer <markster@digium.com>
*
@@ -29,6 +29,12 @@ extern "C" {
#ifdef __GNUC__
/* If we just tell GCC what's going on, we can trust it to behave optimally */
static inline uint64_t get_unaligned_uint64(const void *p)
{
const struct { uint64_t d; } __attribute__((packed)) *pp = p;
return pp->d;
}
static inline unsigned int get_unaligned_uint32(const void *p)
{
const struct { unsigned int d; } __attribute__((packed)) *pp = p;
@@ -42,6 +48,13 @@ static inline unsigned short get_unaligned_uint16(const void *p)
return pp->d;
}
static inline void put_unaligned_uint64(void *p, uint64_t datum)
{
struct { uint64_t d; } __attribute__((packed)) *pp = p;
pp->d = datum;
}
static inline void put_unaligned_uint32(void *p, unsigned int datum)
{
struct { unsigned int d; } __attribute__((packed)) *pp = p;
@@ -56,6 +69,21 @@ static inline void put_unaligned_uint16(void *p, unsigned short datum)
pp->d = datum;
}
#elif defined(SOLARIS) && defined(__sparc__)
static inline uint64_t get_unaligned_uint64(const void *p)
{
const unsigned char *cp = p;
return
(((uint64_t) cp[0]) << 56) |
(((uint64_t) cp[1]) << 48) |
(((uint64_t) cp[2]) << 40) |
(((uint64_t) cp[3]) << 32) |
(((uint64_t) cp[4]) << 24) |
(((uint64_t) cp[5]) << 16) |
(((uint64_t) cp[6]) << 8) |
(((uint64_t) cp[7]) << 0);
}
static inline unsigned int get_unaligned_uint32(const void *p)
{
const unsigned char *cp = p;
@@ -70,6 +98,20 @@ static inline unsigned short get_unaligned_uint16(const void *p)
return (cp[0] << 8) | cp[1] ;
}
static inline void put_unaligned_uint64(void *p, uint64_t datum)
{
unsigned char *cp = p;
cp[0] = (datum >> 56) & 0xff;
cp[1] = (datum >> 48) & 0xff;
cp[2] = (datum >> 40) & 0xff;
cp[3] = (datum >> 32) & 0xff;
cp[4] = (datum >> 24) & 0xff;
cp[5] = (datum >> 16) & 0xff;
cp[6] = (datum >> 8) & 0xff;
cp[7] = (datum >> 0) & 0xff;
}
static inline void put_unaligned_uint32(void *p, unsigned int datum)
{
unsigned char *cp = p;
@@ -88,8 +130,10 @@ static inline void put_unaligned_uint16(void *p, unsigned int datum)
cp[1] = datum;
}
#else /* Not GCC, not Solaris/SPARC. Assume we can handle direct load/store. */
#define get_unaligned_uint64(p) (*((uint64_t *)(p)))
#define get_unaligned_uint32(p) (*((unsigned int *)(p)))
#define get_unaligned_uint16(p) (*((unsigned short *)(p)))
#define put_unaligned_uint64(p,d) do { uint64_t *__P = (p); *__P = d; } while(0)
#define put_unaligned_uint32(p,d) do { unsigned int *__P = (p); *__P = d; } while(0)
#define put_unaligned_uint16(p,d) do { unsigned short *__P = (p); *__P = d; } while(0)
#endif