From: Thiemo Seufer Date: Wed, 7 Sep 2005 22:23:39 +0000 (+0000) Subject: Rename compute-code-from-fn to compute-code-from-lip, except for sparc. X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=d83c8a160b4215cfc5379dd4fb70c9589a428ae0;p=sbcl.git Rename compute-code-from-fn to compute-code-from-lip, except for sparc. --- diff --git a/src/compiler/alpha/call.lisp b/src/compiler/alpha/call.lisp index 8a45345..d4db1bc 100644 --- a/src/compiler/alpha/call.lisp +++ b/src/compiler/alpha/call.lisp @@ -142,7 +142,7 @@ ;; Compute CODE from the address of this entry point. (let ((entry-point (gen-label))) (emit-label entry-point) - (inst compute-code-from-fn code-tn lip-tn entry-point temp) + (inst compute-code-from-lip code-tn lip-tn entry-point temp) ;; ### We should also save it on the stack so that the garbage ;; collector won't forget about us if we call anyone else. ) diff --git a/src/compiler/alpha/insts.lisp b/src/compiler/alpha/insts.lisp index 549bf7d..dd69a8a 100644 --- a/src/compiler/alpha/insts.lisp +++ b/src/compiler/alpha/insts.lisp @@ -627,8 +627,8 @@ (inst ldah dst extra dst) (inst ldah dst high dst))))))) -;; code = fn - header - label-offset + other-pointer-tag -(define-instruction compute-code-from-fn (segment dst src label temp) +;; code = lip - header - label-offset + other-pointer-tag +(define-instruction compute-code-from-lip (segment dst src label temp) (:declare (type tn dst src temp) (type label label)) (:vop-var vop) (:emitter @@ -650,6 +650,7 @@ (component-header-length))))))) ;; lra = code + other-pointer-tag + header + label-offset - other-pointer-tag +;; = code + header + label-offset (define-instruction compute-lra-from-code (segment dst src label temp) (:declare (type tn dst src temp) (type label label)) (:vop-var vop) diff --git a/src/compiler/hppa/call.lisp b/src/compiler/hppa/call.lisp index dac0f2d..94d6997 100644 --- a/src/compiler/hppa/call.lisp +++ b/src/compiler/hppa/call.lisp @@ -144,7 +144,7 @@ ;; Fix CODE, cause the function object was passed in. (let ((entry-point (gen-label))) (emit-label entry-point) - (inst compute-code-from-fn lip-tn entry-point temp code-tn)) + (inst compute-code-from-lip lip-tn entry-point temp code-tn)) ;; Build our stack frames. (inst addi (* n-word-bytes (sb-allocated-size 'control-stack)) cfp-tn csp-tn) diff --git a/src/compiler/hppa/insts.lisp b/src/compiler/hppa/insts.lisp index 602916b..ac68119 100644 --- a/src/compiler/hppa/insts.lisp +++ b/src/compiler/hppa/insts.lisp @@ -1440,8 +1440,8 @@ (inst ldo (ldb (byte 11 0) delta) temp temp) (inst add src temp dst)))))) -;; code = fn - header - label-offset + other-pointer-tag -(define-instruction compute-code-from-fn (segment src label temp dst) +;; code = lip - header - label-offset + other-pointer-tag +(define-instruction compute-code-from-lip (segment src label temp dst) (:declare (type tn src dst temp) (type label label)) (:vop-var vop) @@ -1453,6 +1453,7 @@ (component-header-length)))))) ;; code = lra - other-pointer-tag - header - label-offset + other-pointer-tag +;; = lra - (header + label-offset) (define-instruction compute-code-from-lra (segment src label temp dst) (:declare (type tn src dst temp) (type label label)) @@ -1464,6 +1465,7 @@ (component-header-length))))))) ;; lra = code + other-pointer-tag + header + label-offset - other-pointer-tag +;; = code + header + label-offset (define-instruction compute-lra-from-code (segment src label temp dst) (:declare (type tn src dst temp) (type label label)) diff --git a/src/compiler/mips/call.lisp b/src/compiler/mips/call.lisp index d3a2472..5b7d43d 100644 --- a/src/compiler/mips/call.lisp +++ b/src/compiler/mips/call.lisp @@ -147,7 +147,7 @@ ;; Compute CODE from the address of this entry point. (let ((entry-point (gen-label))) (emit-label entry-point) - (inst compute-code-from-fn code-tn lip-tn entry-point temp) + (inst compute-code-from-lip code-tn lip-tn entry-point temp) ;; ### We should also save it on the stack so that the garbage collector ;; won't forget about us if we call anyone else. ) diff --git a/src/compiler/mips/insts.lisp b/src/compiler/mips/insts.lisp index 594e834..2bb81c5 100644 --- a/src/compiler/mips/insts.lisp +++ b/src/compiler/mips/insts.lisp @@ -1178,8 +1178,8 @@ (inst or temp (ldb (byte 16 0) delta)) (inst addu dst src temp)))))) -;; code = fn - header - label-offset + other-pointer-tag -(define-instruction compute-code-from-fn (segment dst src label temp) +;; code = lip - header - label-offset + other-pointer-lowtag +(define-instruction compute-code-from-lip (segment dst src label temp) (:declare (type tn dst src temp) (type label label)) (:attributes variable-length) (:dependencies (reads src) (writes dst) (writes temp)) @@ -1207,6 +1207,7 @@ (component-header-length))))))) ;; lra = code + other-pointer-tag + header + label-offset - other-pointer-tag +;; = code + header + label-offset (define-instruction compute-lra-from-code (segment dst src label temp) (:declare (type tn dst src temp) (type label label)) (:attributes variable-length) diff --git a/src/compiler/ppc/call.lisp b/src/compiler/ppc/call.lisp index 94f1c4a..cdbadcc 100644 --- a/src/compiler/ppc/call.lisp +++ b/src/compiler/ppc/call.lisp @@ -138,7 +138,7 @@ (inst word 0)) (let* ((entry-point (gen-label))) (emit-label entry-point) - (inst compute-code-from-fn code-tn lip-tn entry-point temp)) + (inst compute-code-from-lip code-tn lip-tn entry-point temp)) ;; FIXME alpha port has a ### note here saying we should "save it ;; on the stack" so that GC sees it. No idea what "it" is -dan 20020110 ;; Build our stack frames. diff --git a/src/compiler/ppc/insts.lisp b/src/compiler/ppc/insts.lisp index b14927a..e65dfe9 100644 --- a/src/compiler/ppc/insts.lisp +++ b/src/compiler/ppc/insts.lisp @@ -2083,10 +2083,8 @@ (inst ori temp temp (ldb (byte 16 0) delta)) (inst add dst src temp)))))) -;; this function is misnamed. should be compute-code-from-lip, -;; if the use in xep-allocate-frame is typical -;; (someone says code = fn - header - label-offset + other-pointer-tag) -(define-instruction compute-code-from-fn (segment dst src label temp) +;; code = lip - header - label-offset + other-pointer-tag +(define-instruction compute-code-from-lip (segment dst src label temp) (:declare (type tn dst src temp) (type label label)) (:attributes variable-length) (:dependencies (reads src) (writes dst) (writes temp)) @@ -2101,6 +2099,7 @@ (component-header-length)))))) ;; code = lra - other-pointer-tag - header - label-offset + other-pointer-tag +;; = lra - (header + label-offset) (define-instruction compute-code-from-lra (segment dst src label temp) (:declare (type tn dst src temp) (type label label)) (:attributes variable-length) @@ -2114,6 +2113,7 @@ (component-header-length))))))) ;; lra = code + other-pointer-tag + header + label-offset - other-pointer-tag +;; = code + header + label-offset (define-instruction compute-lra-from-code (segment dst src label temp) (:declare (type tn dst src temp) (type label label)) (:attributes variable-length) diff --git a/src/compiler/sparc/insts.lisp b/src/compiler/sparc/insts.lisp index 27d40f7..02f2d0f 100644 --- a/src/compiler/sparc/insts.lisp +++ b/src/compiler/sparc/insts.lisp @@ -1878,6 +1878,7 @@ about function addresses and register values.") (component-header-length)))))) ;; code = lra - other-pointer-tag - header - label-offset + other-pointer-tag +;; = lra - (header + label-offset) (define-instruction compute-code-from-lra (segment dst src label temp) (:declare (type tn dst src temp) (type label label)) (:attributes variable-length) @@ -1891,6 +1892,7 @@ about function addresses and register values.") (component-header-length))))))) ;; lra = code + other-pointer-tag + header + label-offset - other-pointer-tag +;; = code + header + label-offset (define-instruction compute-lra-from-code (segment dst src label temp) (:declare (type tn dst src temp) (type label label)) (:attributes variable-length) diff --git a/version.lisp-expr b/version.lisp-expr index a107477..d7a894a 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.4.34" +"0.9.4.35"