X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Funion.cl;h=c3349c6d15939c22d1239b3607a4540befcdd526;hb=79cd30e5bb24c5a8d2eea188e15109e544f8638b;hp=c63b946d28fb34379caceca89b09fd09918fbca9;hpb=29dc3a388a41590a7fda00cb6b606ffe03b3c3d6;p=uffi.git

diff --git a/tests/union.cl b/tests/union.cl
index c63b946..c3349c6 100644
--- a/tests/union.cl
+++ b/tests/union.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: union.cl,v 1.4 2002/04/02 21:29:45 kevin Exp $
+;;;; $Id: union.cl,v 1.7 2002/04/03 00:57:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -25,13 +25,19 @@
   (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) 
-	 (* 256 (char-code #\B))
-	 (* 65536 (char-code #\C))
-	 (* 16777216 255)))
+    (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)))
     (format *standard-output* "~&Should be #\A: ~S" 
 	    (uffi:ensure-char-character 
 	     (uffi:get-slot-value u 'tunion1 'char)))
@@ -42,5 +48,39 @@
     (uffi:free-foreign-object u))
   (values))
 
+(defun test-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 128))
+	  #+(or sparc sparc-v9)
+	  (+ (* 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)