X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=examples%2Funion.cl;h=7a1e72ca095cc735ad8e5311fdb8ef5abfebfad5;hb=9d071d3a1c2b8bbd91261908a424ea74472a3bb5;hp=d0d32812ab4661592af50cd81ea940a4ce6d3361;hpb=f73eb94e15649aba5fcfbe3a900aa72f31f46a96;p=uffi.git

diff --git a/examples/union.cl b/examples/union.cl
index d0d3281..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.3 2002/03/23 16:32:39 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
 ;;;;
@@ -25,13 +25,21 @@
   (sf :float)
   (df :double))
 
-(defun test-union-1 ()
+(defun run-union-1 ()
   (let ((u (uffi:allocate-foreign-object 'tunion1)))
-    (setf (uffi:get-slot-value u 'tunion1 'uint) 
-      (+ (char-code #\A) 
+    (setf (uffi:get-slot-value u 'tunion1 'uint)
+      ;; little endian
+      #-(or sparc sparc-v9 powerpc ppc)
+      (+ (* 1 (char-code #\A))
 	 (* 256 (char-code #\B))
 	 (* 65536 (char-code #\C))
-	 (* 16777216 255)))
+	 (* 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)))
@@ -42,5 +50,40 @@
     (uffi:free-foreign-object u))
   (values))
 
-#+uffi-test
+#+test-uffi
+(defun test-union-1 ()
+  (let ((u (uffi:allocate-foreign-object 'tunion1)))
+    (setf (uffi:get-slot-value u 'tunion1 'uint)
+	  #-(or sparc sparc-v9 powerpc ppc)
+	  (+ (* 1 (char-code #\A))
+	     (* 256 (char-code #\B))
+	     (* 65536 (char-code #\C))
+	     (* 16777216 128))
+	  #+(or sparc sparc-v9 powerpc ppc)
+	  (+ (* 16777216 (char-code #\A))
+	     (* 65536 (char-code #\B))
+	     (* 256 (char-code #\C))
+	     (* 1 128))) ;set signed bit
+    (util.test:test (uffi:ensure-char-character 
+		(uffi:get-slot-value u 'tunion1 'char))
+	       #\A
+	       :test #'eql
+	       :fail-info "Error with union character")
+    #-(or sparc sparc-v9)
+    (util.test:test (> 0 (uffi:get-slot-value u 'tunion1 'int))
+	       t
+	       :fail-info
+	       "Error with negative int in union")
+    (util.test:test (plusp (uffi:get-slot-value u 'tunion1 'uint))
+	       t
+	       :fail-info
+	       "Error with unsigned int in union")
+    (uffi:free-foreign-object u))
+  (values))
+
+#+examples-uffi
+(run-union-1)
+
+
+#+test-uffi
 (test-union-1)