From: Alastair Bridgewater <lisphacker@users.sourceforge.net>
Date: Tue, 9 Nov 2010 19:43:56 +0000 (+0000)
Subject: 1.0.44.9: hppa: Implement ANCESTOR-FRAME VOPs.
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=f5186ef0bbde9c91a83d27db84eb710db504e7af;p=sbcl.git

1.0.44.9: hppa: Implement ANCESTOR-FRAME VOPs.

  * This is the HPPA version of the "implicit" VALUE-CELL access
for DYNAMIC-EXTENT closures.

  * This commit is untested, but should work, as it is based on
the PPC changes, which were tested.
---

diff --git a/src/compiler/hppa/call.lisp b/src/compiler/hppa/call.lisp
index 02d93ae..58aab33 100644
--- a/src/compiler/hppa/call.lisp
+++ b/src/compiler/hppa/call.lisp
@@ -127,6 +127,24 @@
         (inst addi (- (bytes-needed-for-non-descriptor-stack-frame))
               nfp val)))))
 
+;;; 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 (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 (tn-offset variable-home-tn))))
+
 (define-vop (xep-allocate-frame)
   (:info start-lab copy-more-arg-follows)
   (:ignore copy-more-arg-follows)
diff --git a/src/compiler/hppa/cell.lisp b/src/compiler/hppa/cell.lisp
index bd52535..d6ba897 100644
--- a/src/compiler/hppa/cell.lisp
+++ b/src/compiler/hppa/cell.lisp
@@ -222,6 +222,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 cfp-tn object (+ closure-info-offset offset) fun-pointer-lowtag)))
 
 ;;;; Value Cell hackery.
 
diff --git a/version.lisp-expr b/version.lisp-expr
index f384092..9d7171c 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.8"
+"1.0.44.9"