===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/io.c,v
retrieving revision 1.17
retrieving revision 1.21
diff -u -p -r1.17 -r1.21
--- OpenXM_contrib2/asir2000/io/io.c	2015/08/12 10:37:24	1.17
+++ OpenXM_contrib2/asir2000/io/io.c	2015/08/19 05:29:23	1.21
@@ -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.16 2015/08/06 10:01:52 fujimoto Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/io.c,v 1.20 2015/08/17 05:42:20 noro Exp $ 
 */
 #include <stdio.h>
 #include "ca.h"
 #include "parse.h"
-#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) || 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) && !defined(__MINGW32__) && !defined(__MINGW64__)
+#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) || defined(__MINGW32__) || defined(__MINGW64__)
+#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) || defined(__MINGW32__) || defined(__MINGW64__)
+#if defined(VISUAL) || defined(__MINGW32__)
 	if ( _fileno(stream) < 0 )
 		return cwrite(ptr,size,nitems,(STREAM *)stream);
 	else
@@ -277,20 +279,32 @@ void write_intarray(FILE *f,unsigned int *p,int l)
 }
 
 #if SIZEOF_LONG == 8
-/* write l longword (1longword=8bytes) */
-/* low 32of p[0] | high32 of p[0] | ... */
+/* 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;
 
-	for ( i = 0; i < l; i++, p++) {
-		w = *p; hi = w>>32; lo = w&0xffffffff;
-		hi = htonl(hi); lo = htonl(lo);
-		gen_fwrite((char *)&lo,sizeof(unsigned int),1,f);
-		gen_fwrite((char *)&hi,sizeof(unsigned int),1,f);
+  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
 
@@ -391,14 +405,17 @@ void read_longarray(FILE *f,unsigned long *p,int l)
 	q = (unsigned int *)p;
 	if ( l%2 ) {
 	  gen_fread((char *)&hi,sizeof(unsigned int),1,f);
-	  hi = ntohl(hi);
+	  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);
-		hi = ntohl(hi); lo = ntohl(lo);
+	    if ( little_endian && (ox_file_io || ox_need_conv) ) {
+	      hi = ntohl(hi); lo = ntohl(lo);
+		}
 		*p = (((unsigned long)hi)<<32)|((unsigned long)lo);
 	}
 }