From 997959cc458b00ff7faae526511533d24bdc0fde Mon Sep 17 00:00:00 2001 From: Alastair Bridgewater Date: Tue, 9 Nov 2010 19:44:53 +0000 Subject: [PATCH] 1.0.44.13: x86: Implement ANCESTOR-FRAME VOPs. * This is the x86 version of the "implicit" VALUE-CELL access for DYNAMIC-EXTENT closures. --- src/compiler/x86/call.lisp | 20 ++++++++++++++++++++ src/compiler/x86/cell.lisp | 6 ++++++ version.lisp-expr | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/compiler/x86/call.lisp b/src/compiler/x86/call.lisp index bc1e06e..cd90c1f 100644 --- a/src/compiler/x86/call.lisp +++ b/src/compiler/x86/call.lisp @@ -119,6 +119,26 @@ (:generator 1 nil)) +;;; Accessing a slot from an earlier stack frame is definite hackery. +(define-vop (ancestor-frame-ref) + (:args (frame-pointer :scs (descriptor-reg)) + (variable-home-tn :load-if nil)) + (:results (value :scs (descriptor-reg any-reg))) + (:policy :fast-safe) + (:generator 4 + (aver (sc-is variable-home-tn control-stack)) + (loadw value frame-pointer + (frame-word-offset (tn-offset variable-home-tn))))) +(define-vop (ancestor-frame-set) + (:args (frame-pointer :scs (descriptor-reg)) + (value :scs (descriptor-reg any-reg))) + (:results (variable-home-tn :load-if nil)) + (:policy :fast-safe) + (:generator 4 + (aver (sc-is variable-home-tn control-stack)) + (storew value frame-pointer + (frame-word-offset (tn-offset variable-home-tn))))) + (define-vop (xep-allocate-frame) (:info start-lab copy-more-arg-follows) (:vop-var vop) diff --git a/src/compiler/x86/cell.lisp b/src/compiler/x86/cell.lisp index 8ba4680..bb82a39 100644 --- a/src/compiler/x86/cell.lisp +++ b/src/compiler/x86/cell.lisp @@ -418,6 +418,12 @@ (define-vop (closure-init slot-set) (:variant closure-info-offset fun-pointer-lowtag)) + +(define-vop (closure-init-from-fp) + (:args (object :scs (descriptor-reg))) + (:info offset) + (:generator 4 + (storew ebp-tn object (+ closure-info-offset offset) fun-pointer-lowtag))) ;;;; value cell hackery diff --git a/version.lisp-expr b/version.lisp-expr index f111f4a..1496905 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".) -"1.0.44.12" +"1.0.44.13" -- 1.7.10.4