[ruby-dev:22489] unpack("N") broken on Alpha

青木です。

以下のように、Alpha での unpack("N") の結果が変です。

  aamine@asv800 % ruby -ve 'p "\000\000\000\001".unpack("N")[0]'
  ruby 1.9.0 (2004-01-01) [alpha-netbsd]
  4294967296

[ruby-dev:22353] での確認が足りませんでした。すみません。

パッチを添付します。以下の環境で動作確認しました。

  * NetBSD/Alpha (64bit/little endian)
  * Solaris/SPARCv9 (64bit/big endian)
  * Linux/i686 (32bit/little endian)

なお、テストだけは先行してコミットしてあります。
-------------------------------------------------------------------
青木峰郎

Index: pack.c
===================================================================
RCS file: /src/ruby/pack.c,v
retrieving revision 1.63
diff -u -p -r1.63 pack.c
--- pack.c	26 Dec 2003 15:34:31 -0000	1.63
+++ pack.c	4 Jan 2004 19:43:56 -0000
@@ -22,12 +22,14 @@
 #endif
 
 #ifdef NATINT_PACK
+# define OFF16B(p) ((char*)(p) + (natint?0:(sizeof(short) - SIZE16)))
+# define OFF32B(p) ((char*)(p) + (natint?0:(sizeof(long) - SIZE32)))
 # define NATINT_I32(x) (natint?NUM2LONG(x):(NUM2I32(x)))
 # define NATINT_U32(x) (natint?NUM2ULONG(x):(NUM2U32(x)))
 # define NATINT_LEN(type,len) (natint?sizeof(type):(len))
 # ifdef WORDS_BIGENDIAN
-#   define OFF16(p) ((char*)(p) + (natint?0:(sizeof(short) - SIZE16)))
-#   define OFF32(p) ((char*)(p) + (natint?0:(sizeof(long) - SIZE32)))
+#   define OFF16(p) OFF16B(p)
+#   define OFF32(p) OFF32B(p)
 # endif
 # define NATINT_HTOVS(x) (natint?htovs(x):htov16(x))
 # define NATINT_HTOVL(x) (natint?htovl(x):htov32(x))
@@ -47,6 +49,10 @@
 # define OFF16(p) (char*)(p)
 # define OFF32(p) (char*)(p)
 #endif
+#ifndef OFF16B
+# define OFF16B(p) (char*)(p)
+# define OFF32B(p) (char*)(p)
+#endif
 
 #define define_swapx(x, xtype)		\
 static xtype				\
@@ -1648,7 +1654,7 @@ pack_unpack(str, fmt)
 	    PACK_LENGTH_ADJUST(unsigned short,2);
 	    while (len-- > 0) {
 		unsigned short tmp = 0;
-		memcpy(OFF16(&tmp), s, NATINT_LEN(unsigned short,2));
+		memcpy(OFF16B(&tmp), s, NATINT_LEN(unsigned short,2));
 		s += NATINT_LEN(unsigned short,2);
 		rb_ary_push(ary, UINT2NUM(ntohs(tmp)));
 	    }
@@ -1659,7 +1665,7 @@ pack_unpack(str, fmt)
 	    PACK_LENGTH_ADJUST(unsigned long,4);
 	    while (len-- > 0) {
 		unsigned long tmp = 0;
-		memcpy(OFF32(&tmp), s, NATINT_LEN(unsigned long,4));
+		memcpy(OFF32B(&tmp), s, NATINT_LEN(unsigned long,4));
 		s += NATINT_LEN(unsigned long,4);
 		rb_ary_push(ary, ULONG2NUM(ntohl(tmp)));
 	    }