Index: /branches/arm/compiler/ARM/arm-arch.lisp
===================================================================
--- /branches/arm/compiler/ARM/arm-arch.lisp	(revision 13749)
+++ /branches/arm/compiler/ARM/arm-arch.lisp	(revision 13750)
@@ -303,159 +303,129 @@
                    `(define-arm-subprim ',name)))
       (setq *arm-subprims*
-        (vector
-         (defarmsubprim .SPjmpsym)
-         (defarmsubprim .SPjmpnfn)
-         (defarmsubprim .SPfuncall)
-         (defarmsubprim .SPmkcatch1v)
-         (defarmsubprim .SPmkunwind)
-         (defarmsubprim .SPmkcatchmv)
-         (defarmsubprim .SPthrow)
-         (defarmsubprim .SPnthrowvalues)
-         (defarmsubprim .SPnthrow1value)
-         (defarmsubprim .SPbind)
-         (defarmsubprim .SPbind-self)
-         (defarmsubprim .SPbind-nil)
-         (defarmsubprim .SPbind-self-boundp-check)
-         (defarmsubprim .SPrplaca)
-         (defarmsubprim .SPrplacd)
-         (defarmsubprim .SPconslist)
-         (defarmsubprim .SPconslist-star)
-         (defarmsubprim .SPstkconslist)
-         (defarmsubprim .SPstkconslist-star)
-         (defarmsubprim .SPmkstackv)
-         (defarmsubprim .SPsubtag-misc-ref)
-         (defarmsubprim .SPsetqsym)
-         (defarmsubprim .SPprogvsave)
-         (defarmsubprim .SPstack-misc-alloc)
-         (defarmsubprim .SPgvector)
-         (defarmsubprim .SPnvalret)
-         (defarmsubprim .SPmvpass)
-         (defarmsubprim .SPfitvals)
-         (defarmsubprim .SPnthvalue)
-         (defarmsubprim .SPvalues)
-         (defarmsubprim .SPdefault-optional-args)
-         (defarmsubprim .SPopt-supplied-p)
-         (defarmsubprim .SPheap-rest-arg)
-         (defarmsubprim .SPreq-heap-rest-arg)
-         (defarmsubprim .SPheap-cons-rest-arg)
-         (defarmsubprim .SPsimple-keywords)
-         (defarmsubprim .SPkeyword-args)
-         (defarmsubprim .SPkeyword-bind)
-         (defarmsubprim .SPpoweropen-ffcall)
-         (defarmsubprim .SParef2)
-         (defarmsubprim .SPksignalerr)
-         (defarmsubprim .SPstack-rest-arg)
-         (defarmsubprim .SPreq-stack-rest-arg)
-         (defarmsubprim .SPstack-cons-rest-arg)
-         (defarmsubprim .SPpoweropen-callbackX)
-         (defarmsubprim .SPcall-closure)
-         (defarmsubprim .SPgetXlong)
-         (defarmsubprim .SPspreadargz)
-         (defarmsubprim .SPtfuncallgen)
-         (defarmsubprim .SPtfuncallslide)
-         (defarmsubprim .SPtfuncallvsp)
-         (defarmsubprim .SPtcallsymgen)
-         (defarmsubprim .SPtcallsymslide)
-         (defarmsubprim .SPtcallsymvsp)
-         (defarmsubprim .SPtcallnfngen)
-         (defarmsubprim .SPtcallnfnslide)
-         (defarmsubprim .SPtcallnfnvsp)
-         (defarmsubprim .SPmisc-ref)
-         (defarmsubprim .SPmisc-set)
-         (defarmsubprim .SPstkconsyz)
-         (defarmsubprim .SPstkvcell0)
-         (defarmsubprim .SPstkvcellvsp)
-         (defarmsubprim .SPmakestackblock)
-         (defarmsubprim .SPmakestackblock0)
-         (defarmsubprim .SPmakestacklist)
-         (defarmsubprim .SPstkgvector)
-         (defarmsubprim .SPmisc-alloc)
-         (defarmsubprim .SPpoweropen-ffcallX)
-         (defarmsubprim .SPgvset)
-         (defarmsubprim .SPmacro-bind)
-         (defarmsubprim .SPdestructuring-bind)
-         (defarmsubprim .SPdestructuring-bind-inner)
-         (defarmsubprim .SPrecover-values)
-         (defarmsubprim .SPvpopargregs)
-         (defarmsubprim .SPinteger-sign)
-         (defarmsubprim .SPsubtag-misc-set)
-         (defarmsubprim .SPspread-lexpr-z)
-         (defarmsubprim .SPstore-node-conditional)
-         (defarmsubprim .SPreset)
-         (defarmsubprim .SPmvslide)
-         (defarmsubprim .SPsave-values)
-         (defarmsubprim .SPadd-values)
-         (defarmsubprim .SPpoweropen-callback)
-         (defarmsubprim .SPmisc-alloc-init)
-         (defarmsubprim .SPstack-misc-alloc-init)
-         (defarmsubprim .SPset-hash-key)
-         (defarmsubprim .SPaset2)
-         (defarmsubprim .SPcallbuiltin)
-         (defarmsubprim .SPcallbuiltin0)
-         (defarmsubprim .SPcallbuiltin1)
-         (defarmsubprim .SPcallbuiltin2)
-         (defarmsubprim .SPcallbuiltin3)
-         (defarmsubprim .SPpopj)
-         (defarmsubprim .SPrestorefullcontext)
-         (defarmsubprim .SPsavecontextvsp)
-         (defarmsubprim .SPsavecontext0)
-         (defarmsubprim .SPrestorecontext)
-         (defarmsubprim .SPlexpr-entry)
-         (defarmsubprim .SPpoweropen-syscall)
-         (defarmsubprim .SPbuiltin-plus)
-         (defarmsubprim .SPbuiltin-minus)
-         (defarmsubprim .SPbuiltin-times)
-         (defarmsubprim .SPbuiltin-div)
-         (defarmsubprim .SPbuiltin-eq)
-         (defarmsubprim .SPbuiltin-ne)
-         (defarmsubprim .SPbuiltin-gt)
-         (defarmsubprim .SPbuiltin-ge)
-         (defarmsubprim .SPbuiltin-lt)
-         (defarmsubprim .SPbuiltin-le)
-         (defarmsubprim .SPbuiltin-eql)
-         (defarmsubprim .SPbuiltin-length)
-         (defarmsubprim .SPbuiltin-seqtype)
-         (defarmsubprim .SPbuiltin-assq)
-         (defarmsubprim .SPbuiltin-memq)
-         (defarmsubprim .SPbuiltin-logbitp)
-         (defarmsubprim .SPbuiltin-logior)
-         (defarmsubprim .SPbuiltin-logand)
-         (defarmsubprim .SPbuiltin-ash)
-         (defarmsubprim .SPbuiltin-negate)
-         (defarmsubprim .SPbuiltin-logxor)
-         (defarmsubprim .SPbuiltin-aref1)
-         (defarmsubprim .SPbuiltin-aset1)
-         (defarmsubprim .SPbreakpoint)
-         (defarmsubprim .SPeabi-ff-call)
-         (defarmsubprim .SPeabi-callback)
-         (defarmsubprim .SPeabi-syscall)
-         (defarmsubprim .SPgetu64)
-         (defarmsubprim .SPgets64)
-         (defarmsubprim .SPmakeu64)
-         (defarmsubprim .SPmakes64)
-         (defarmsubprim .SPspecref)
-         (defarmsubprim .SPspecset)
-         (defarmsubprim .SPspecrefcheck)
-         (defarmsubprim .SPrestoreintlevel)
-         (defarmsubprim .SPmakes32)
-         (defarmsubprim .SPmakeu32)
-         (defarmsubprim .SPgets32)
-         (defarmsubprim .SPgetu32)
-         (defarmsubprim .SPfix-overflow)
-         (defarmsubprim .SPmvpasssym)
-         (defarmsubprim .SParef3)
-         (defarmsubprim .SPaset3)
-         (defarmsubprim .SPpoweropen-ffcall-return-registers)
-         (defarmsubprim .SPnmkunwind)
-         (defarmsubprim .SPset-hash-key-conditional)
-         (defarmsubprim .SPunbind-interrupt-level)
-         (defarmsubprim .SPunbind)
-         (defarmsubprim .SPunbind-n)
-         (defarmsubprim .SPunbind-to)
-         (defarmsubprim .SPbind-interrupt-level-m1)
-         (defarmsubprim .SPbind-interrupt-level)
-         (defarmsubprim .SPbind-interrupt-level-0)
-         (defarmsubprim .SPprogvrestore)
-         )))))
+            (vector
+             (defarmsubprim .SPfix-nfn-entrypoint)
+             (defarmsubprim .SPbuiltin-plus)
+             (defarmsubprim .SPbuiltin-minus)
+             (defarmsubprim .SPbuiltin-times)
+             (defarmsubprim .SPbuiltin-div)
+             (defarmsubprim .SPbuiltin-eq)
+             (defarmsubprim .SPbuiltin-ne)
+             (defarmsubprim .SPbuiltin-gt)
+             (defarmsubprim .SPbuiltin-ge)
+             (defarmsubprim .SPbuiltin-lt)
+             (defarmsubprim .SPbuiltin-le)
+             (defarmsubprim .SPbuiltin-eql)
+             (defarmsubprim .SPbuiltin-length)
+             (defarmsubprim .SPbuiltin-seqtype)
+             (defarmsubprim .SPbuiltin-assq)
+             (defarmsubprim .SPbuiltin-memq)
+             (defarmsubprim .SPbuiltin-logbitp)
+             (defarmsubprim .SPbuiltin-logior)
+             (defarmsubprim .SPbuiltin-logand)
+             (defarmsubprim .SPbuiltin-ash)
+             (defarmsubprim .SPbuiltin-negate)
+             (defarmsubprim .SPbuiltin-logxor)
+             (defarmsubprim .SPbuiltin-aref1)
+             (defarmsubprim .SPbuiltin-aset1)
+             (defarmsubprim .SPfuncall)
+             (defarmsubprim .SPmkcatch1v)
+             (defarmsubprim .SPmkcatchmv)
+             (defarmsubprim .SPmkunwind)
+             (defarmsubprim .SPbind)
+             (defarmsubprim .SPconslist)
+             (defarmsubprim .SPconslist-star)
+             (defarmsubprim .SPmakes32)
+             (defarmsubprim .SPmakeu32)
+             (defarmsubprim .SPfix-overflow)
+             (defarmsubprim .SPmakeu64)
+             (defarmsubprim .SPmakes64)
+             (defarmsubprim .SPmvpass)
+             (defarmsubprim .SPvalues)
+             (defarmsubprim .SPnvalret)
+             (defarmsubprim .SPthrow)
+             (defarmsubprim .SPnthrowvalues)
+             (defarmsubprim .SPnthrow1value)
+             (defarmsubprim .SPbind-self)
+             (defarmsubprim .SPbind-nil)
+             (defarmsubprim .SPbind-self-boundp-check)
+             (defarmsubprim .SPrplaca)
+             (defarmsubprim .SPrplacd)
+             (defarmsubprim .SPgvset)
+             (defarmsubprim .SPset-hash-key)
+             (defarmsubprim .SPstore-node-conditional)
+             (defarmsubprim .SPset-hash-key-conditional)
+             (defarmsubprim .SPstkconslist)
+             (defarmsubprim .SPstkconslist-star)
+             (defarmsubprim .SPmkstackv)
+             (defarmsubprim .SPsetqsym)
+             (defarmsubprim .SPprogvsave)
+             (defarmsubprim .SPstack-misc-alloc)
+             (defarmsubprim .SPgvector)
+             (defarmsubprim .SPfitvals)
+             (defarmsubprim .SPnthvalue)
+             (defarmsubprim .SPdefault-optional-args)
+             (defarmsubprim .SPopt-supplied-p)
+             (defarmsubprim .SPheap-rest-arg)
+             (defarmsubprim .SPreq-heap-rest-arg)
+             (defarmsubprim .SPheap-cons-rest-arg)
+             (defarmsubprim .SPsimple-keywords)
+             (defarmsubprim .SPkeyword-args)
+             (defarmsubprim .SPkeyword-bind)
+             (defarmsubprim .SPksignalerr)
+             (defarmsubprim .SPstack-rest-arg)
+             (defarmsubprim .SPreq-stack-rest-arg)
+             (defarmsubprim .SPstack-cons-rest-arg)
+             (defarmsubprim .SPcall-closure)        
+             (defarmsubprim .SPspreadargz)
+             (defarmsubprim .SPtfuncallgen)
+             (defarmsubprim .SPtfuncallslide)
+             (defarmsubprim .SPtfuncallvsp)
+             (defarmsubprim .SPtcallsymgen)
+             (defarmsubprim .SPtcallsymslide)
+             (defarmsubprim .SPtcallnfngen)
+             (defarmsubprim .SPtcallnfnslide)
+             (defarmsubprim .SPmisc-ref)
+             (defarmsubprim .SPsubtag-misc-ref)
+             (defarmsubprim .SPmakestackblock)
+             (defarmsubprim .SPmakestackblock0)
+             (defarmsubprim .SPmakestacklist)
+             (defarmsubprim .SPstkgvector)
+             (defarmsubprim .SPmisc-alloc)
+             (defarmsubprim .SPmacro-bind)
+             (defarmsubprim .SPdestructuring-bind)
+             (defarmsubprim .SPdestructuring-bind-inner)
+             (defarmsubprim .SPrecover-values)
+             (defarmsubprim .SPinteger-sign)
+             (defarmsubprim .SPsubtag-misc-set)
+             (defarmsubprim .SPmisc-set)
+             (defarmsubprim .SPspread-lexprz)
+             (defarmsubprim .SPreset)
+             (defarmsubprim .SPmvslide)
+             (defarmsubprim .SPsave-values)
+             (defarmsubprim .SPadd-values)
+             (defarmsubprim .SPmisc-alloc-init)
+             (defarmsubprim .SPstack-misc-alloc-init)
+             (defarmsubprim .SPlexpr-entry)
+             (defarmsubprim .SPgetu64)
+             (defarmsubprim .SPgets64)
+             (defarmsubprim .SPspecref)
+             (defarmsubprim .SPspecrefcheck)
+             (defarmsubprim .SPspecset)
+             (defarmsubprim .SPgets32)
+             (defarmsubprim .SPgetu32)
+             (defarmsubprim .SPmvpasssym)
+             (defarmsubprim .SPunbind)
+             (defarmsubprim .SPunbind-n)
+             (defarmsubprim .SPunbind-to)
+             (defarmsubprim .SPprogvrestore)
+             (defarmsubprim .SPbind-interrupt-level-0)
+             (defarmsubprim .SPbind-interrupt-level-m1)
+             (defarmsubprim .SPbind-interrupt-level)
+             (defarmsubprim .SPunbind-interrupt-level)
+             (defarmsubprim .SParef2)
+             (defarmsubprim .SParef3)
+             (defarmsubprim .SPaset2)
+             (defarmsubprim .SPaset3)
+             )))))