diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-07-20 14:24:04 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-07-20 14:24:04 -0700 |
commit | bb3d8a7767cf260b97c7e019e4fec0ee7d7b65a8 (patch) | |
tree | 462cfa4e8a154eff20c6ebcc10a0a328fd9c3e5b /src | |
parent | 9561eca1ad28afee6dcd0aebea3dd20a154ec481 (diff) |
unifdef WORD64
Remove leftover remnants of CRAY support, which still had some
functions consisting solely of /* NOT IMPLEMENTED YET */ comments.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/ICElibint.h | 55 | ||||
-rw-r--r-- | src/misc.c | 85 |
2 files changed, 0 insertions, 140 deletions
diff --git a/src/ICElibint.h b/src/ICElibint.h index 0638fb0..240e295 100644 --- a/src/ICElibint.h +++ b/src/ICElibint.h @@ -155,8 +155,6 @@ typedef struct { _pBuf += 1; \ } -#ifndef WORD64 - #define STORE_CARD16(_pBuf, _val) \ { \ *((CARD16 *) _pBuf) = _val; \ @@ -169,30 +167,6 @@ typedef struct { _pBuf += 4; \ } -#else /* WORD64 */ - -#define STORE_CARD16(_pBuf, _val) \ -{ \ - struct { \ - int value :16; \ - int pad :16; \ - } _d; \ - _d.value = _val; \ - memcpy (_pBuf, &_d, 2); \ - _pBuf += 2; \ -} - -#define STORE_CARD32(_pBuf, _val) \ -{ \ - struct { \ - int value :32; \ - } _d; \ - _d.value = _val; \ - memcpy (_pBuf, &_d, 4); \ - _pBuf += 4; \ -} - -#endif /* WORD64 */ #define STORE_STRING(_pBuf, _string) \ { \ @@ -215,8 +189,6 @@ typedef struct { _pBuf += 1; \ } -#ifndef WORD64 - #define EXTRACT_CARD16(_pBuf, _swap, _val) \ { \ _val = *((CARD16 *) _pBuf); \ @@ -233,33 +205,6 @@ typedef struct { _val = lswapl (_val); \ } -#else /* WORD64 */ - -#define EXTRACT_CARD16(_pBuf, _swap, _val) \ -{ \ - _val = *(_pBuf + 0) & 0xff; /* 0xff incase _pBuf is signed */ \ - _val <<= 8; \ - _val |= *(_pBuf + 1) & 0xff;\ - _pBuf += 2; \ - if (_swap) \ - _val = lswaps (_val); \ -} - -#define EXTRACT_CARD32(_pBuf, _swap, _val) \ -{ \ - _val = *(_pBuf + 0) & 0xff; /* 0xff incase _pBuf is signed */ \ - _val <<= 8; \ - _val |= *(_pBuf + 1) & 0xff;\ - _val <<= 8; \ - _val |= *(_pBuf + 2) & 0xff;\ - _val <<= 8; \ - _val |= *(_pBuf + 3) & 0xff;\ - _pBuf += 4; \ - if (_swap) \ - _val = lswapl (_val); \ -} - -#endif /* WORD64 */ #define EXTRACT_STRING(_pBuf, _swap, _string) \ { \ @@ -406,91 +406,6 @@ _IceWrite ( } } -#ifdef WORD64 - -IceWriteData16 ( - IceConn iceConn, - unsigned long nbytes, - short *data -) -{ - int numShorts = nbytes / 2; - int index = 0; - - while (index < numShorts) - { - int spaceLeft, count, i; - int shortsLeft = numShorts - index; - - spaceLeft = iceConn->outbufmax - iceConn->outbufptr - 1; - - if (spaceLeft < 2) - { - IceFlush (iceConn); - spaceLeft = iceConn->outbufmax - iceConn->outbufptr - 1; - } - - count = (shortsLeft < spaceLeft / 2) ? shortsLeft : spaceLeft / 2; - - for (i = 0; i < count; i++) - STORE_CARD16 (iceConn->outbufptr, data[index++]); - } -} - - -IceWriteData32 ( - IceConn iceConn, - unsigned long nbytes, - int *data -) -{ - int numLongs = nbytes / 4; - int index = 0; - - while (index < numLongs) - { - int spaceLeft, count, i; - int longsLeft = numLongs - index; - - spaceLeft = iceConn->outbufmax - iceConn->outbufptr - 1; - - if (spaceLeft < 4) - { - IceFlush (iceConn); - spaceLeft = iceConn->outbufmax - iceConn->outbufptr - 1; - } - - count = (longsLeft < spaceLeft / 4) ? longsLeft : spaceLeft / 4; - - for (i = 0; i < count; i++) - STORE_CARD32 (iceConn->outbufptr, data[index++]); - } -} - - -IceReadData16 ( - IceConn iceConn, - Bool swap, - unsigned long nbytes, - short *data -) -{ - /* NOT IMPLEMENTED YET */ -} - - -IceReadData32 ( - IceConn iceConn, - Bool swap, - unsigned long nbytes, - int *data -) -{ - /* NOT IMPLEMENTED YET */ -} - -#endif /* WORD64 */ - void |