X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Futils.lisp;h=3625f66ba110abe20ae31bdb11ac3eb175dee8cc;hb=5745b5a5b2e3b967bf3876b4306f31b3c78495fa;hp=7b433a21b61c2dcdb62c140b2efe469ffce09a6c;hpb=906ecd4ef2d10aca23e1081f03c13fe2f932ed89;p=sbcl.git diff --git a/src/compiler/generic/utils.lisp b/src/compiler/generic/utils.lisp index 7b433a2..3625f66 100644 --- a/src/compiler/generic/utils.lisp +++ b/src/compiler/generic/utils.lisp @@ -59,7 +59,7 @@ ;;; Return the (byte) offset from NIL to the start of the fdefn object ;;; for the static function NAME. -(defun static-fun-offset (name) +(defun static-fdefn-offset (name) (let ((static-syms (length *static-symbols*)) (static-fun-index (position name *static-funs*))) (unless static-fun-index @@ -68,7 +68,14 @@ (pad-data-block (1- symbol-size)) (- list-pointer-lowtag) (* static-fun-index (pad-data-block fdefn-size)) - (* fdefn-raw-addr-slot n-word-bytes)))) + other-pointer-lowtag))) + +;;; Return the (byte) offset from NIL to the raw-addr slot of the +;;; fdefn object for the static function NAME. +(defun static-fun-offset (name) + (+ (static-fdefn-offset name) + (- other-pointer-lowtag) + (* fdefn-raw-addr-slot n-word-bytes))) ;;; Various error-code generating helpers (defvar *adjustable-vectors* nil)