[Openmcl-cvs-notifications] r16186 - in /release/1.10/source: ./ compiler/ARM/arm2.lisp compiler/PPC/ppc2.lisp compiler/X86/x862.lisp

rme at clozure.com rme at clozure.com
Wed Sep 3 14:53:47 UTC 2014


Author: rme
Date: Wed Sep  3 14:53:46 2014
New Revision: 16186

Log:
Merge from trunk.

Modified:
    release/1.10/source/   (props changed)
    release/1.10/source/compiler/ARM/arm2.lisp
    release/1.10/source/compiler/PPC/ppc2.lisp
    release/1.10/source/compiler/X86/x862.lisp

Propchange: release/1.10/source/
---------------------------------------------------------------------------=
---
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Sep  3 14:53:46 2014
@@ -4,4 +4,4 @@
 /branches/rme-logops:13875-13886
 /branches/working-0711/ccl:7970-13192,13197-13198,13202,13208,13214,13235-=
13236,13239,13263,13277-13278,13290,13293-13294,13302-13306,13331-13332,133=
39,13361-13364,13379,13383,13386,13388,13409,13435-13436,13438,13440-13442,=
13460-13461,13465,13467,13476,13487,13490,13492-13493,13502-13528,13545-135=
47,13549,13557-13558
 /release/1.5/source:13667
-/trunk/source:16167,16171,16173,16176-16177,16181-16182
+/trunk/source:16167,16171,16173,16176-16177,16181-16182,16185

Modified: release/1.10/source/compiler/ARM/arm2.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.10/source/compiler/ARM/arm2.lisp	(original)
+++ release/1.10/source/compiler/ARM/arm2.lisp	Wed Sep  3 14:53:46 2014
@@ -2679,7 +2679,7 @@
                                  nil)))
                   (return nil))))
             (if (eq op (%nx1-operator local-block))
-              (setq body (car (acode-operands body)))
+              (setq body (cadr (acode-operands body)))
               (if (and (eq op (%nx1-operator if))
                        (eq (arm2-lexical-reference-p (car (acode-operands =
body))) rest))
                 (setq body (car (cdr (acode-operands body))))

Modified: release/1.10/source/compiler/PPC/ppc2.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.10/source/compiler/PPC/ppc2.lisp	(original)
+++ release/1.10/source/compiler/PPC/ppc2.lisp	Wed Sep  3 14:53:46 2014
@@ -2240,7 +2240,7 @@
                                  nil)))
                   (return nil))))
             (if (eq op (%nx1-operator local-block))
-              (setq body (car (acode-operands body)))
+              (setq body (cadr (acode-operands body)))
               (if (and (eq op (%nx1-operator if))
                        (eq (ppc2-lexical-reference-p (car (acode-operands =
body))) rest))
                 (setq body (car (cdr (acode-operands body))))

Modified: release/1.10/source/compiler/X86/x862.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.10/source/compiler/X86/x862.lisp	(original)
+++ release/1.10/source/compiler/X86/x862.lisp	Wed Sep  3 14:53:46 2014
@@ -3160,7 +3160,7 @@
                                  nil)))
                   (return nil))))
             (if (eq op (%nx1-operator local-block))
-              (setq body (cadr body))
+              (setq body (cadr (acode-operands body)))
               (if (and (eq op (%nx1-operator if))
                        (eq (nx2-lexical-reference-p (car (acode-operands b=
ody))) rest))
                 (setq body (car (cdr (acode-operands body))))



More information about the Openmcl-cvs-notifications mailing list