Changeset 68

Timestamp:

03/02/06 23:56:07 (3 years ago)

Author:

krobillard

Message:

Replaced OR_BIG_ENDIAN with BIG_ENDIAN.
Added _validateEnv().

Location:

trunk/orca

Files:

• ovalue.c (modified) (3 diffs)
• ovalue.h (modified) (2 diffs)

trunk/orca/ovalue.c

@@ -278 +278 @@
 
 
-/**
-  Initialize scripting environment.
-  Call orFreeEnv() when finished with the interpreter.
-
-  If dataStackSize is less than 512 it will be set to 512.
-  If callStackSize is less than 64 it will be set to 64.
-*/
-void orInitEnv( OEnv* env, int dataStackSize, int callStackSize )
-{
+#ifdef DEBUG
+static void _validateEnv()
+{
+    int i;
+    OValue val;
+
 #if 0
     printf( "sizeof(OValue)      %d\n", sizeof(OValue) );
@@ -297 +294 @@
 
     assert( sizeof(OValue) == 16 );
+
+    // Make sure endianess is correct.
+    i = 1;
+#if defined(__BIG_ENDIAN__)
+    assert(0 == *(char*)&i && "Undefine __BIG_ENDIAN__");
+#else
+    assert(1 == *(char*)&i && "Define __BIG_ENDIAN__");
+#endif
+
+    // Make sure double is aligned on 8 byte boundary.
+    assert( ((char*) &val) + 8 == ((char*) &orDecimal(&val)) );
+}
+#endif
+
+
+/**
+  Initialize scripting environment.
+  Call orFreeEnv() when finished with the interpreter.
+
+  If dataStackSize is less than 512 it will be set to 512.
+  If callStackSize is less than 64 it will be set to 64.
+*/
+void orInitEnv( OEnv* env, int dataStackSize, int callStackSize )
+{
+#ifdef DEBUG
+    _validateEnv();
+#endif
 
     orEnv = env;
@@ -394 +418 @@
     wval = orIntern( &ctx, "native", 6, 0 );
     *wval = *res;
-
-    // Makes sure double is aligned on 8 byte boundary.
-    assert( ((char*) res) + 8 == ((char*) &orDecimal(res)) );
 
     orNative( orNativeNative, "native" );

trunk/orca/ovalue.h

@@ -36 +36 @@
 #define OR_VERSION_STR  "0.0.24"
 #define OR_VERSION      0x000024
-
-
-#if defined(__APPLE__) && defined(__BIG_ENDIAN__)
-#define OR_BIG_ENDIAN   1
-#endif
 
 
@@ -548 +543 @@
 #define orClrBit(array,n)   (array[(n)>>3] &= ~(1<<((n)&7)))
 
-#ifdef OR_BIG_ENDIAN
+#ifdef __BIG_ENDIAN__
 #define orSetTF(val,t)      *((uint32_t*) &(val)->type) = t << 24
 #else