[R-gregmisc-users] SF.net SVN: r-gregmisc: [1155] trunk/SASxport/src
Brought to you by:
warnes
Menu
▾
▴
[R-gregmisc-users] SF.net SVN: r-gregmisc: [1155] trunk/SASxport/src
|
From: <wa...@us...> - 2007-08-21 18:12:42
|
Revision: 1155
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1155&view=rev
Author: warnes
Date: 2007-08-21 11:12:39 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
Commit previous updates
Modified Paths:
--------------
trunk/SASxport/src/init.c
trunk/SASxport/src/reverse.c
trunk/SASxport/src/test_fields.c
Added Paths:
-----------
trunk/SASxport/src/ibm2ieee.c
trunk/SASxport/src/ieee2ibm.c
Removed Paths:
-------------
trunk/SASxport/src/htond.c
Deleted: trunk/SASxport/src/htond.c
===================================================================
--- trunk/SASxport/src/htond.c 2007-08-21 15:36:28 UTC (rev 1154)
+++ trunk/SASxport/src/htond.c 2007-08-21 18:12:39 UTC (rev 1155)
@@ -1,148 +0,0 @@
-/* H T O N D . C
- * BRL-CAD
- *
- * Copyright (c) 2004-2007 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * Minor changes (c) 2007 Random Technologies LLC by Gregory R. Warnes
- * <gr...@ra...>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-
-#include "writeSAS.h"
-#include <stdio.h>
-
-/****************************/
-/** NB: htond code ommitted */
-/****************************/
-
-/****************************
- * NB: The ntohd code assumes that 'in' points to a vector BIG-ENDIAN IEEE
- * double precision value of length 'count'. This extracted routine
- * returns IBM/360 format double precision values in *out
- ***************************/
-
-
-void R_ntohd(double out[], double in[], int *count)
-{
- int i;
- int j;
- unsigned char tmp;
- unsigned char *cptr;
-
- /* Flip byte order from little endian to big endian */
- for(i=0; i<*count; i++)
- reverse( (unsigned char*) &(in[i]), sizeof(double) );
- ieee2ibm( (unsigned char *) out, (unsigned char *) in, *count );
-}
-
-/**
- * N T O H D
- *
- * @brief Network to Host Doubles
- */
-// Original function name: "ntohd"
-void ieee2ibm(register unsigned char *out, register const unsigned char *in, int count)
-{
- /*
- * IBM Format.
- * 7-bit exponent, base 16.
- * No hidden bits in mantissa (56 bits).
- */
- register int i;
- for( i=count-1; i >= 0; i-- ) {
- register unsigned long left, right;
- register int fix, exp, signbit;
-
- left = (in[0]<<24) | (in[1]<<16) | (in[2]<<8) | in[3];
- right = (in[4]<<24) | (in[5]<<16) | (in[6]<<8) | in[7];
- in += 8;
-
- exp = ((left >> 20) & 0x7FF);
- signbit = (left & 0x80000000) >> 24;
- if( exp == 0 || exp == 0x7FF ) {
-ibm_undef: *out++ = 0; /* IBM zero. No NAN */
- *out++ = 0;
- *out++ = 0;
- *out++ = 0;
- *out++ = 0;
- *out++ = 0;
- *out++ = 0;
- *out++ = 0;
- continue;
- }
-
- left = (left & 0x000FFFFF) | 0x00100000;/* replace "hidden" bit */
-
- exp += 129 - 1023 -1; /* fudge, to make /4 and %4 work */
- fix = exp % 4; /* 2^4 == 16^1; get fractional exp */
- exp /= 4; /* excess 32, base 16 */
- exp += (64-32+1); /* excess 64, base 16, plus fudge */
- if( (exp & ~0xFF) != 0 ) {
- //WARNING("ntohd: IBM exponent overflow");
- fprintf(stderr,"ntohd: IBM exponent overflow\n");
- goto ibm_undef;
- }
-
- if( fix ) {
- left = (left<<fix) | (right >> (32-fix));
- right <<= fix;
- }
-
- if( signbit ) {
- /* The IBM actually uses complimented mantissa
- * and exponent.
- */
- left ^= 0xFFFFFFFF;
- right ^= 0xFFFFFFFF;
- if( right & 0x80000000 ) {
- /* There may be a carry */
- right += 1;
- if( (right & 0x80000000) == 0 ) {
- /* There WAS a carry */
- left += 1;
- }
- } else {
- /* There will be no carry to worry about */
- right += 1;
- }
- left &= 0x00FFFFFF;
- exp = (~exp) & 0x7F;
- }
-
-
- /* Not actually required, but for comparison purposes,
- * normalize the number. Remove for production speed.
- */
- while( (left & 0x00F00000) == 0 && left != 0 ) {
- if( signbit && exp <= 0x41 ) break;
-
- left = (left << 4) | (right >> (32-4));
- right <<= 4;
- if(signbit) exp--;
- else exp++;
- }
-
- *out++ = signbit | exp;
- *out++ = left>>16;
- *out++ = left>>8;
- *out++ = left;
- *out++ = right>>24;
- *out++ = right>>16;
- *out++ = right>>8;
- *out++ = right;
- }
- return;
-}
Added: trunk/SASxport/src/ibm2ieee.c
===================================================================
--- trunk/SASxport/src/ibm2ieee.c (rev 0)
+++ trunk/SASxport/src/ibm2ieee.c 2007-08-21 18:12:39 UTC (rev 1155)
@@ -0,0 +1,171 @@
+/*
+ * File: SASxport/src/ibm2ieee.c
+ *
+ * Originally from BRL-CAD file /brlcad/src/libbu/htond.c
+ *
+ * Copyright (c) 2004-2007 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * * Minor changes (c) 2007 Random Technologies LLC by Gregory R. Warnes
+ * <gr...@ra...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+
+#include "writeSAS.h"
+#include <stdio.h>
+
+/****************************
+ * ibm2ieee
+ *
+ * Convert an array of IBM/360 format double precision values of at *in
+ * of length 'count' to BIG-ENDIAN IEEE double precision value at *out.
+ *
+ * This code was extracted from the "ntohd" function, original author
+ * Michael John Muuss
+ *
+ * Note that neither the input or output buffers need be word aligned,
+ * for greatest flexability in converting data, even though this
+ * imposes a speed penalty here.
+ *
+ ***************************/
+
+#define OUT_IEEE_ZERO { \
+ *out++ = 0; \
+ *out++ = 0; \
+ *out++ = 0; \
+ *out++ = 0; \
+ *out++ = 0; \
+ *out++ = 0; \
+ *out++ = 0; \
+ *out++ = 0; \
+ continue; } \
+
+#define OUT_IEEE_NAN { /* Signaling NAN */ \
+ *out++ = 0xFF; \
+ *out++ = 0xF0; \
+ *out++ = 0x0B; \
+ *out++ = 0xAD; \
+ *out++ = 0x0B; \
+ *out++ = 0xAD; \
+ *out++ = 0x0B; \
+ *out++ = 0xAD; \
+ continue; } \
+
+
+void ibm2ieee(register unsigned char *out, register const unsigned char *in, int count)
+{
+ /*
+ * IBM Format.
+ * 7-bit exponent, base 16.
+ * No hidden bits in mantissa (56 bits).
+ */
+ register int i;
+ for( i=count-1; i >= 0; i-- ) {
+ register unsigned long left, right, signbit;
+ register int exp;
+
+ left = (in[0]<<24) | (in[1]<<16) | (in[2]<<8) | in[3];
+ right = (in[4]<<24) | (in[5]<<16) | (in[6]<<8) | in[7];
+ in += 8;
+
+ exp = (left>>24) & 0x7F; /* excess 64, base 16 */
+ if( left == 0 && right == 0 )
+ OUT_IEEE_ZERO;
+
+ signbit = left & 0x80000000;
+ left &= 0x00FFFFFF;
+ if( signbit ) {
+ /* The IBM uses 2's compliment on the mantissa,
+ * and IEEE does not.
+ */
+ left ^= 0xFFFFFFFF;
+ right ^= 0xFFFFFFFF;
+ if( right & 0x80000000 ) {
+ /* There may be a carry */
+ right += 1;
+ if( (right & 0x80000000) == 0 ) {
+ /* There WAS a carry */
+ left += 1;
+ }
+ } else {
+ /* There will be no carry to worry about */
+ right += 1;
+ }
+ left &= 0x00FFFFFF;
+ exp = (~exp) & 0x7F;
+ }
+ exp -= (64-32+1); /* excess 32, base 16, + fudge */
+ exp *= 4; /* excess 128, base 2 */
+ibm_normalized:
+ if( left & 0x00800000 ) {
+ /* fix = 0; */
+ exp += 1023-129+1+ 3-0;/* fudge, slide hidden bit */
+ } else if( left & 0x00400000 ) {
+ /* fix = 1; */
+ exp += 1023-129+1+ 3-1;
+ left = (left<<1) |
+ ( (right>>(32-1)) & (0x7FFFFFFF>>(31-1)) );
+ right <<= 1;
+ } else if( left & 0x00200000 ) {
+ /* fix = 2; */
+ exp += 1023-129+1+ 3-2;
+ left = (left<<2) |
+ ( (right>>(32-2)) & (0x7FFFFFFF>>(31-2)) );
+ right <<= 2;
+ } else if( left & 0x00100000 ){
+ /* fix = 3; */
+ exp += 1023-129+1+ 3-3;
+ left = (left<<3) |
+ ( (right>>(32-3)) & (0x7FFFFFFF>>(31-3)) );
+ right <<= 3;
+ } else {
+ /* Encountered 4 consecutive 0 bits of mantissa,
+ * attempt to normalize, and loop.
+ * This case was not expected, but does happen,
+ * at least on the Gould.
+ */
+ exp -= 4;
+ left = (left<<4) | (right>>(32-4));
+ right <<= 4;
+ goto ibm_normalized;
+ }
+
+ /* After suitable testing, this check can be deleted */
+ if( (left & 0x00800000) == 0 ) {
+ fprintf(stderr,"ibm->ieee missing 1, left=x%x\n", left);
+ left = (left<<1) | (right>>31);
+ right <<= 1;
+ goto ibm_normalized;
+ }
+
+ /* Having nearly VAX format, shift to IEEE, rounding. */
+# ifdef ROUNDING
+ right = (left<<(32-3)) | ((right+4)>>3);
+# else
+ right = (left<<(32-3)) | (right>>3);
+# endif
+ left = ((left & 0x007FFFFF)>>3) | signbit | (exp<<20);
+
+ *out++ = left>>24;
+ *out++ = left>>16;
+ *out++ = left>>8;
+ *out++ = left;
+ *out++ = right>>24;
+ *out++ = right>>16;
+ *out++ = right>>8;
+ *out++ = right;
+ }
+ return;
+}
Added: trunk/SASxport/src/ieee2ibm.c
===================================================================
--- trunk/SASxport/src/ieee2ibm.c (rev 0)
+++ trunk/SASxport/src/ieee2ibm.c 2007-08-21 18:12:39 UTC (rev 1155)
@@ -0,0 +1,135 @@
+/*
+ * File: SASxport/src/ibm2ieee.c
+ *
+ * Originally from BRL-CAD, file /brlcad/src/libbu/htond.c
+ *
+ * Copyright (c) 2004-2007 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * Minor changes (c) 2007 Random Technologies LLC by Gregory R. Warnes
+ * <gr...@ra...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+
+#include "writeSAS.h"
+#include <stdio.h>
+
+/****************************
+ * ieee2ibm
+ *
+ * Convert an array of BIG-ENDIAN IEEE double precision value at *in
+ * of length 'count'to IBM/360 format double precision values at *out
+ *
+ * This code was extracted from the "ntohd" function, original author
+ * Michael John Muuss
+ *
+ * Note that neither the input or output buffers need be word aligned,
+ * for greatest flexability in converting data, even though this
+ * imposes a speed penalty here.
+ *
+ ***************************/
+
+void ieee2ibm(register unsigned char *out, register const unsigned char *in, int count)
+{
+ /*
+ * IBM Format.
+ * 7-bit exponent, base 16.
+ * No hidden bits in mantissa (56 bits).
+ */
+ register int i;
+ for( i=count-1; i >= 0; i-- ) {
+ register unsigned long left, right;
+ register int fix, exp, signbit;
+
+ left = (in[0]<<24) | (in[1]<<16) | (in[2]<<8) | in[3];
+ right = (in[4]<<24) | (in[5]<<16) | (in[6]<<8) | in[7];
+ in += 8;
+
+ exp = ((left >> 20) & 0x7FF);
+ signbit = (left & 0x80000000) >> 24;
+ if( exp == 0 || exp == 0x7FF ) {
+ibm_undef: *out++ = 0; /* IBM zero. No NAN */
+ *out++ = 0;
+ *out++ = 0;
+ *out++ = 0;
+ *out++ = 0;
+ *out++ = 0;
+ *out++ = 0;
+ *out++ = 0;
+ continue;
+ }
+
+ left = (left & 0x000FFFFF) | 0x00100000;/* replace "hidden" bit */
+
+ exp += 129 - 1023 -1; /* fudge, to make /4 and %4 work */
+ fix = exp % 4; /* 2^4 == 16^1; get fractional exp */
+ exp /= 4; /* excess 32, base 16 */
+ exp += (64-32+1); /* excess 64, base 16, plus fudge */
+ if( (exp & ~0xFF) != 0 ) {
+ //WARNING("ntohd: IBM exponent overflow");
+ fprintf(stderr,"ntohd: IBM exponent overflow\n");
+ goto ibm_undef;
+ }
+
+ if( fix ) {
+ left = (left<<fix) | (right >> (32-fix));
+ right <<= fix;
+ }
+
+ if( signbit ) {
+ /* The IBM actually uses complimented mantissa
+ * and exponent.
+ */
+ left ^= 0xFFFFFFFF;
+ right ^= 0xFFFFFFFF;
+ if( right & 0x80000000 ) {
+ /* There may be a carry */
+ right += 1;
+ if( (right & 0x80000000) == 0 ) {
+ /* There WAS a carry */
+ left += 1;
+ }
+ } else {
+ /* There will be no carry to worry about */
+ right += 1;
+ }
+ left &= 0x00FFFFFF;
+ exp = (~exp) & 0x7F;
+ }
+
+
+ /* Not actually required, but for comparison purposes,
+ * normalize the number. Remove for production speed.
+ */
+ while( (left & 0x00F00000) == 0 && left != 0 ) {
+ if( signbit && exp <= 0x41 ) break;
+
+ left = (left << 4) | (right >> (32-4));
+ right <<= 4;
+ if(signbit) exp--;
+ else exp++;
+ }
+
+ *out++ = signbit | exp;
+ *out++ = left>>16;
+ *out++ = left>>8;
+ *out++ = left;
+ *out++ = right>>24;
+ *out++ = right>>16;
+ *out++ = right>>8;
+ *out++ = right;
+ }
+ return;
+}
Modified: trunk/SASxport/src/init.c
===================================================================
--- trunk/SASxport/src/init.c 2007-08-21 15:36:28 UTC (rev 1154)
+++ trunk/SASxport/src/init.c 2007-08-21 18:12:39 UTC (rev 1155)
@@ -1,6 +1,6 @@
/*******
*
- * init.c: Routines to register writeSAS.c routines with R
+ * init.c: Routines to register SASxport C routines with R
*
* Author: Gregory R. Warnes <gr...@ra...>
*
@@ -57,8 +57,6 @@
#define CALLDEF(name, n) {#name, (DL_FUNC) &name, n}
static const R_CallMethodDef CallEntries[] = {
-// CALLDEF(xport_info, 1),
-// CALLDEF(xport_read, 2),
CALLDEF(getRawBuffer, 0),
{NULL, NULL, 0}
};
Modified: trunk/SASxport/src/reverse.c
===================================================================
--- trunk/SASxport/src/reverse.c 2007-08-21 15:36:28 UTC (rev 1154)
+++ trunk/SASxport/src/reverse.c 2007-08-21 18:12:39 UTC (rev 1155)
@@ -3,8 +3,8 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#import <assert.h>
-#import <sys/types.h>
+#include <assert.h>
+#include <sys/types.h>
/* reverse: convert current byte order to big endian */
void reverse( unsigned char *intp, size_t size)
Modified: trunk/SASxport/src/test_fields.c
===================================================================
--- trunk/SASxport/src/test_fields.c 2007-08-21 15:36:28 UTC (rev 1154)
+++ trunk/SASxport/src/test_fields.c 2007-08-21 18:12:39 UTC (rev 1155)
@@ -181,7 +181,6 @@
}
-
void doTest()
{
/* small buffer */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
