===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/io.c,v
retrieving revision 1.14
retrieving revision 1.22
diff -u -p -r1.14 -r1.22
--- OpenXM_contrib2/asir2000/io/io.c	2009/03/16 16:43:03	1.14
+++ OpenXM_contrib2/asir2000/io/io.c	2017/08/31 09:11:04	1.22
@@ -44,18 +44,19 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/io.c,v 1.13 2009/03/13 04:45:16 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/io.c,v 1.21 2015/08/19 05:29:23 noro Exp $ 
 */
 #include <stdio.h>
 #include "ca.h"
 #include "parse.h"
-#if defined(VISUAL) || defined(MPI)
+#if defined(VISUAL) || defined(__MINGW32__) || defined(MPI)
 #include "wsio.h"
 #endif
 
 extern int little_endian,lib_ox_need_conv;
 extern int ox_do_copy, ox_do_count, ox_count_length, ox_file_io, ox_need_conv;
 extern char *ox_copy_bptr;
+extern int ox_get_pari_result;
 
 /* XXX */
 void write_cmo(pointer,Obj);
@@ -63,6 +64,7 @@ void write_cmo(pointer,Obj);
 void reset_io()
 {
 	ox_file_io = 0;
+	if ( ox_get_pari_result ) reset_ox_pari();
 }
 
 void endian_init()
@@ -102,7 +104,7 @@ void ox_copy_init(char *s)
 	ox_copy_bptr = s;
 }
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 /*
  * library mode functions
  * byte order is controlled by lib_ox_need_conv.
@@ -137,7 +139,7 @@ int gen_fread (char *ptr,int size,int nitems,FILE *str
 		/* dummy return */
 		return 0;
 	} else {
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 		if ( _fileno(stream) < 0 )
 			n = cread(ptr,size,nitems,(STREAM *)stream);
 		else
@@ -171,7 +173,7 @@ int gen_fwrite (char *ptr,int size,int nitems,FILE *st
 		/* dummy return  */
 		return 0;
 	} else
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	if ( _fileno(stream) < 0 )
 		return cwrite(ptr,size,nitems,(STREAM *)stream);
 	else
@@ -210,6 +212,19 @@ void write_int(FILE *f,unsigned int *p)
 		gen_fwrite((char *)p,sizeof(unsigned int),1,f);
 }
 
+void write_int64(FILE *f,UL *p)
+{
+  unsigned int t;
+
+	if ( little_endian && (ox_file_io || ox_need_conv) ) {
+		t = htonl(((unsigned int *)p)[1]);
+		gen_fwrite((char *)&t,sizeof(unsigned int),1,f);
+		t = htonl(((unsigned int *)p)[0]);
+		gen_fwrite((char *)&t,sizeof(unsigned int),1,f);
+	} else
+		gen_fwrite((char *)p,sizeof(UL),1,f);
+}
+
 #if defined(DES_ENC)
 int des_encryption;
 static unsigned char asir_deskey[8] = {0xc7,0xe0,0xfc,0xb5,0xc3,0xad,0x8e,0x3a};
@@ -264,24 +279,65 @@ void write_intarray(FILE *f,unsigned int *p,int l)
 }
 
 #if SIZEOF_LONG == 8
+/* write l word (1word=4bytes) */
+/* l even : low 32of p[0] | high32 of p[0] | ... */
+/* l odd :  high32 of p[0] | ... */
 void write_longarray(FILE *f,unsigned long *p,int l)
 {
-	int i;
-	unsigned long w;
-	unsigned int hi,lo;
+  int i;
+  unsigned long w;
+  unsigned int hi,lo;
 
+  if ( l%2 ) {
+    w = p[0]; hi = w>>32;
 	if ( little_endian && (ox_file_io || ox_need_conv) )
-		for ( i = 0; i < l; i++, p++) {
-			w = *p; hi = w>>32; lo = w&0xffffffff;
-			hi = htonl(hi); lo = htonl(lo);
-			gen_fwrite(&hi,sizeof(unsigned int),1,f);
-			gen_fwrite(&lo,sizeof(unsigned int),1,f);
-		}
-	else
-		gen_fwrite(p,sizeof(unsigned long),l,f);
+      hi = htonl(hi);
+    gen_fwrite((char *)&hi,sizeof(unsigned int),1,f);
+    i = 1;
+  } else
+    i = 0;
+  l = (l+1)/2;
+  for ( ; i < l; i++ ) {
+    w = p[i]; hi = w>>32; lo = w&0xffffffff;
+	if ( little_endian && (ox_file_io || ox_need_conv) ) {
+      hi = htonl(hi); lo = htonl(lo);
+	}
+    gen_fwrite((char *)&lo,sizeof(unsigned int),1,f);
+    gen_fwrite((char *)&hi,sizeof(unsigned int),1,f);
+  }
 }
 #endif
 
+#if defined(_WIN64)
+/* write l word (1word=4bytes) */
+/* l even : low 32of p[0] | high32 of p[0] | ... */
+/* l odd :  high32 of p[0] | ... */
+void write_longarray(FILE *f,unsigned long long *p,int l)
+{
+  int i;
+  unsigned long long w;
+  unsigned int hi,lo;
+
+  if ( l%2 ) {
+    w = p[0]; hi = w>>32;
+	if ( little_endian && (ox_file_io || ox_need_conv) )
+      hi = htonl(hi);
+    gen_fwrite((char *)&hi,sizeof(unsigned int),1,f);
+    i = 1;
+  } else
+    i = 0;
+  l = (l+1)/2;
+  for ( ; i < l; i++ ) {
+    w = p[i]; hi = w>>32; lo = w&0xffffffff;
+	if ( little_endian && (ox_file_io || ox_need_conv) ) {
+      hi = htonl(hi); lo = htonl(lo);
+	}
+    gen_fwrite((char *)&lo,sizeof(unsigned int),1,f);
+    gen_fwrite((char *)&hi,sizeof(unsigned int),1,f);
+  }
+}
+#endif
+
 void write_double(FILE *f,double *p)
 {
 	unsigned int t;
@@ -319,6 +375,19 @@ void read_int(FILE *f,unsigned int *p)
 		*p = ntohl(*p);
 }
 
+void read_int64(FILE *f,UL *p)
+{
+	unsigned int t;
+
+	if ( little_endian && (ox_file_io || ox_need_conv) ) {
+		gen_fread((char *)&t,sizeof(unsigned int),1,f);
+		((unsigned int *)p)[1] = ntohl(t);
+		gen_fread((char *)&t,sizeof(unsigned int),1,f);
+		((unsigned int *)p)[0] = ntohl(t);
+	} else
+		gen_fread((char *)p,sizeof(UL),1,f);
+}
+
 void read_intarray(FILE *f,unsigned int *p,int l)
 {
 	int i;
@@ -354,24 +423,60 @@ void read_intarray(FILE *f,unsigned int *p,int l)
 }
 
 #if SIZEOF_LONG == 8
+/* read l word (1word=4bytes) */
+/* pad 0 at low 32 of p[0] if l is odd */
+/* low 32 of p[0] | high32 of p[0] | ... */
 void read_longarray(FILE *f,unsigned long *p,int l)
 {
 	int i;
 	unsigned int hi,lo;
+    unsigned int *q;
 
-	if ( little_endian && (ox_file_io || ox_need_conv) ) {
-		for ( i = l; i > 1; i -= 2, p++ ) {
-			gen_fread(&hi,sizeof(unsigned int),1,f);
-			gen_fread(&lo,sizeof(unsigned int),1,f);
-			hi = ntohl(hi); lo = ntohl(lo);
-			*p = (((unsigned long)hi)<<32)|((unsigned long)lo);
+	q = (unsigned int *)p;
+	if ( l%2 ) {
+	  gen_fread((char *)&hi,sizeof(unsigned int),1,f);
+	  if ( little_endian && (ox_file_io || ox_need_conv) ) 
+	    hi = ntohl(hi);
+	  *p = (((unsigned long)hi)<<32);
+	  p++; l--;
+	}
+	for ( i = 0; i < l; i += 2, p++ ) {
+		gen_fread((char *)&lo,sizeof(unsigned int),1,f);
+		gen_fread((char *)&hi,sizeof(unsigned int),1,f);
+	    if ( little_endian && (ox_file_io || ox_need_conv) ) {
+	      hi = ntohl(hi); lo = ntohl(lo);
 		}
-		if ( i == 1 ) {
-			gen_fread(&hi,sizeof(unsigned int),1,f);
-			hi = ntohl(hi); *p = (((unsigned long)hi)<<32);
+		*p = (((unsigned long)hi)<<32)|((unsigned long)lo);
+	}
+}
+#endif
+
+#if defined(_WIN64)
+/* read l word (1word=4bytes) */
+/* pad 0 at low 32 of p[0] if l is odd */
+/* low 32 of p[0] | high32 of p[0] | ... */
+void read_longarray(FILE *f,unsigned long long *p,int l)
+{
+	int i;
+	unsigned int hi,lo;
+    unsigned int *q;
+
+	q = (unsigned int *)p;
+	if ( l%2 ) {
+	  gen_fread((char *)&hi,sizeof(unsigned int),1,f);
+	  if ( little_endian && (ox_file_io || ox_need_conv) ) 
+	    hi = ntohl(hi);
+	  *p = (((unsigned long long)hi)<<32);
+	  p++; l--;
+	}
+	for ( i = 0; i < l; i += 2, p++ ) {
+		gen_fread((char *)&lo,sizeof(unsigned int),1,f);
+		gen_fread((char *)&hi,sizeof(unsigned int),1,f);
+	    if ( little_endian && (ox_file_io || ox_need_conv) ) {
+	      hi = ntohl(hi); lo = ntohl(lo);
 		}
-	} else
-		gen_fread(p,sizeof(unsigned int),l,f);
+		*p = (((unsigned long long)hi)<<32)|((unsigned long long)lo);
+	}
 }
 #endif