Changeset 13849

Timestamp:

Jun 16, 2010, 9:47:43 AM (11 years ago)

Author:

gb

Message:

Write barrier comparisons of value/location were all backwards.
_SPstack_cons_rest_arg: get list length (in temp0) right.

File:

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

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

@@ -802 +802 @@
         __(cmp arg_z,arg_y)
         __(_rplaca(arg_y,arg_z))
-        __(bxhs lr)
+        __(bxlo lr)
         __(ref_global(temp0,ref_base))
         __(sub imm0,arg_y,temp0)
@@ -828 +828 @@
         __(cmp arg_z,arg_y)
         __(_rplacd(arg_y,arg_z))
-        __(bxhs lr)
+        __(bxlo lr)
         __(ref_global(temp0,ref_base))
         __(sub imm0,arg_y,temp0)
@@ -857 +857 @@
         __(add imm0,arg_y,#misc_data_offset)
         __(str arg_z,[arg_x,imm0])
-        __(bxhs lr)
+        __(bxlo lr)               
         __(add imm0,imm0,arg_x)
         __(ref_global(temp0,ref_base))
@@ -879 +879 @@
 
         
-dnl /* This is a special case of storing into a gvector: if we need to memoize  */
-dnl /* the store, record the address of the hash-table vector in the refmap,  */
-dnl /* as well. */
+/* This is a special case of storing into a gvector: if we need to memoize  */
+/* the store, record the address of the hash-table vector in the refmap,  */
+/* as well. */
         .globl C(egc_set_hash_key)        
 _spentry(set_hash_key)
@@ -888 +888 @@
         __(add imm0,arg_y,#misc_data_offset)
         __(str arg_z,[arg_x,imm0])
-        __(bxhs lr)
+        __(bxlo lr)
         __(add imm0,imm0,arg_x)
         __(ref_global(temp0,ref_base))
@@ -961 +961 @@
         __(bne 1b)
         __(cmp arg_z,arg_x)
-        __(bhi 4f)
+        __(blo 4f)
 
         __(ref_global(imm0,ref_base))
@@ -1000 +1000 @@
         __(bne 0b)
         __(cmp arg_z,arg_x)
-        __(bhi 4f)
+        __(blo 4f)
         __(ref_global(temp0,ref_base))
         __(sub imm0,imm2,temp0)
@@ -1429 +1429 @@
 
 _spentry(stack_cons_rest_arg)
-        __(sub imm1,nargs,imm0)
-        __(cmp imm1,#0)
+        __(subs imm1,nargs,imm0)
         __(mov arg_z,#nil_value)
         __(ble 2f)  /* always temp-push something.  */
+        __(mov temp0,imm1)
         __(add imm1,imm1,imm1)
-        __(mov temp0,imm1)
         __(add imm1,imm1,#node_size)
         __(dnode_align(imm0,imm1,node_size))