Changeset 234

Timestamp:

Jan 7, 2004, 3:37:57 PM (21 years ago)

Author:

Gary Byers

Message:

Fix (at least the function case) of :ALLOW-OTHER-KEYS NIL.

File:

• trunk/ccl/lisp-kernel/spentry.s (modified) (3 diffs)

trunk/ccl/lisp-kernel/spentry.s

@@ -967 +967 @@
         __(mr imm4,valptr)
 5:
+        __(cmpwi cr0,keyword_flags,16<<fixnumshift) /* seen :a-o-k yet ? */
         __(lwzu arg_z,-4(valptr))
         __(lwzu arg_y,-4(valptr))
         __(cmpri(cr1,arg_y,nil_value))
         __(li arg_x,nrs.kallowotherkeys)
-        __(cmpr(cr0,arg_x,arg_z))
+        /* cr6_eq <- (eq current-keyword :allow-other-keys) */
+        __(cmpr(cr6,arg_x,arg_z))
         __(cmpr(cr7,valptr,limit))
+        __(bne cr6,6f)
+        __(bge cr0,6f) /* Already seen :allow-other-keys */
+        __(ori keyword_flags,keyword_flags,16<<fixnumshift)
         __(beq cr1,6f)
-        __(bne cr0,6f)
         __(ori keyword_flags,keyword_flags,fixnum_one)
 6:
@@ -999 +1003 @@
 8:
         __(bne cr1,7b)
-        /* Unknown keyword. */
+        /* Unknown keyword. If it was :allow-other-keys, cr6_eq will still
+           be set. */
+        __(beq cr6,9f)
         __(ori keyword_flags,keyword_flags,2<<fixnumshift)
 9:
@@ -3372 +3378 @@
         __(_car(arg_x,arg_z))
         __(_cdr(arg_z,arg_z))
-        __(cmpri(cr2,arg_x,nil_value))
         __(cmpri(cr1,arg_z,nil_value))
-        __(beq cr2,2f)
-        __(trap_unless_lisptag_equal(arg_x,tag_list,imm0))
+        __(trap_unless_fulltag_equal(arg_x,fulltag_cons,imm0))
         __(_car(temp0,arg_x))
         __(cmpr(temp0,arg_y))