Changeset 14075

Timestamp:

Jul 28, 2010, 12:57:49 PM (9 years ago)

Author:

gb

Message:

Straighten out keyword_flags definitions.
Don't consider :allow-other-keys to be an "unknown keyword".

File:

• branches/arm/lisp-kernel/arm-spentry.s (modified) (3 diffs)

branches/arm/lisp-kernel/arm-spentry.s

@@ -2569 +2569 @@
 define(`key_value_count',`arg_z')
 
-define(`keyword_flag_allow_other_keys',`(1<<fixnumshift)')
-define(`keyword_flag_seen_allow_other_keys',`(2<<fixnumshift)')
-define(`keyword_flag_unknown_keyword_seen',`(3<<fixnumshift)')
-define(`keyword_flag_rest',`(4<<fixnumshift)')
+define(`keyword_flag_allow_other_keys',`(fixnumone<<0)')
+define(`keyword_flag_seen_allow_other_keys',`(fixnumone<<1)')
+define(`keyword_flag_rest',`(fixnumone<<2)')
+define(`keyword_flag_unknown_keyword_seen',`(fixnumone<<3)')
+define(`keyword_flag_current_aok',`(fixnumone<<4)')
 
 _spentry(keyword_bind)
@@ -2631 +2632 @@
         __(ref_nrs_symbol(imm1,kallowotherkeys,imm1))
         __(cmp temp1,imm1)
+        __(orreq keyword_flags,keyword_flags,#keyword_flag_current_aok)
         __(tsteq keyword_flags,#keyword_flag_seen_allow_other_keys)
         __(bne local_label(current_key_allow_other_keys_handled))
@@ -2656 +2658 @@
         __(bge local_label(defined_keyword_compare_loop))
         /* keyword wasn't defined.  Note that ... */
-        __(orr keyword_flags,keyword_flags,#keyword_flag_unknown_keyword_seen)
+        __(tst keyword_flags,#keyword_flag_current_aok)
+        __(bicne keyword_flags,#keyword_flag_current_aok)
+        __(orreq keyword_flags,keyword_flags,#keyword_flag_unknown_keyword_seen)
         __(b local_label(nextkeyvalpairnext))
 local_label(defined_keyword_found):