X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=examples%2Funion.cl;h=7a1e72ca095cc735ad8e5311fdb8ef5abfebfad5;hb=7523905053e1fd44e5cbef67332a3fb00d35e848;hp=a18dfecb56aba015bf77f3a8bbfa7190f37b09fa;hpb=755b88dd8dd3bcacc9e9d073dbd8ad0f729070fc;p=uffi.git

diff --git a/examples/union.cl b/examples/union.cl
index a18dfec..7a1e72c 100644
--- a/examples/union.cl
+++ b/examples/union.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: union.cl,v 1.6 2002/04/03 00:50:46 kevin Exp $
+;;;; $Id: union.cl,v 1.9 2002/09/20 06:03:36 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -28,16 +28,18 @@
 (defun run-union-1 ()
   (let ((u (uffi:allocate-foreign-object 'tunion1)))
     (setf (uffi:get-slot-value u 'tunion1 'uint)
-	  #-sparc
-	  (+ (* 1 (char-code #\A))
-	     (* 256 (char-code #\B))
-	     (* 65536 (char-code #\C))
-	     (* 16777216 255))
-	  #+(or sparc sparc-v9)
-	  (+ (* 16777216 (char-code #\A))
-	     (* 65536 (char-code #\B))
-	     (* 256 (char-code #\C))
-	     (* 1 255)))
+      ;; little endian
+      #-(or sparc sparc-v9 powerpc ppc)
+      (+ (* 1 (char-code #\A))
+	 (* 256 (char-code #\B))
+	 (* 65536 (char-code #\C))
+	 (* 16777216 128))
+      ;; big endian
+      #+(or sparc sparc-v9 powerpc ppc)
+      (+ (* 16777216 (char-code #\A))
+	 (* 65536 (char-code #\B))
+	 (* 256 (char-code #\C))
+	 (* 1 128)))
     (format *standard-output* "~&Should be #\A: ~S" 
 	    (uffi:ensure-char-character 
 	     (uffi:get-slot-value u 'tunion1 'char)))
@@ -48,15 +50,16 @@
     (uffi:free-foreign-object u))
   (values))
 
+#+test-uffi
 (defun test-union-1 ()
   (let ((u (uffi:allocate-foreign-object 'tunion1)))
     (setf (uffi:get-slot-value u 'tunion1 'uint)
-	  #-sparc
+	  #-(or sparc sparc-v9 powerpc ppc)
 	  (+ (* 1 (char-code #\A))
 	     (* 256 (char-code #\B))
 	     (* 65536 (char-code #\C))
 	     (* 16777216 128))
-	  #+(or sparc sparc-v9)
+	  #+(or sparc sparc-v9 powerpc ppc)
 	  (+ (* 16777216 (char-code #\A))
 	     (* 65536 (char-code #\B))
 	     (* 256 (char-code #\C))
@@ -66,8 +69,6 @@
 	       #\A
 	       :test #'eql
 	       :fail-info "Error with union character")
-    (print (uffi:get-slot-value u 'tunion1 'uint))
-    (print (uffi:get-slot-value u 'tunion1 'int))
     #-(or sparc sparc-v9)
     (util.test:test (> 0 (uffi:get-slot-value u 'tunion1 'int))
 	       t