Changeset 494

Timestamp:

10/29/07 17:30:32 (12 months ago)

Author:

krobillard

Message:

Converting a UCS2 string to binary now creates big-endian words on all
platforms.

Location:

trunk/thune

Files:

• make.c (modified) (2 diffs)
• project.r (modified) (1 diff)
• unix/os.h (modified) (2 diffs)
• win32/os.h (modified) (1 diff)

trunk/thune/make.c

@@ -172 +172 @@
         if( size )
         {
-            memCpy( bin->ptr.b, cpA, size );
+#ifndef __BIG_ENDIAN__
+            if( ur_is(cell, UT_STRING) && (ur_encoding(cell) == UR_ENC_UCS2) )
+                memSwab( cpA, bin->ptr.b, size );
+            else
+#endif
+                memCpy( bin->ptr.b, cpA, size );
+
             bin->used = size;
         }
@@ -1711 +1717 @@
                 goto init_bin;
             }
+#if 0
+            else if( ur_is(tos, UT_WORD) && (argc == 2) )
+            {
+                binN = ur_makeBinaryFrom( ut, ur_s_prev(tos) );
+                goto init_bin;
+            }
+#endif
             else if( ur_stringSlice(ut, tos, &spA, &spB) )
             {

trunk/thune/project.r

@@ -31 +31 @@
         cflags {-std=c99}
         ;cflags {-std=gnu99}
+        cflags {-D_GNU_SOURCE}  ; Needed to find swab() in unistd.h on Linux
         cflags {-pedantic}
         include_from %unix

trunk/thune/unix/os.h

@@ -12 +12 @@
 #include <string.h>
 #include <pthread.h>
+#include <unistd.h>
 
 
@@ -29 +30 @@
 #define memSet      memset
 #define memMove     memmove
+#define memSwab     swab
 
 #ifdef TRACK_MALLOC

trunk/thune/win32/os.h

@@ -39 +39 @@
 #define memSet      memset
 #define memMove     memmove
+#define memSwab     _swab
 
 #ifdef TRACK_MALLOC