[Openmcl-cvs-notifications] r14383 - in /release/1.6/source: ./ compiler/PPC/ppc-disassemble.lisp

[rme at clozure.com]

Author: rme
Date: Mon Nov  1 10:33:05 2010
New Revision: 14383

Log:
Merge trunk changes through r14382.

Modified:
    release/1.6/source/   (props changed)
    release/1.6/source/compiler/PPC/ppc-disassemble.lisp

Propchange: release/1.6/source/
---------------------------------------------------------------------------=
---
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  1 10:33:05 2010
@@ -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:14361-14380
+/trunk/source:14361-14382

Modified: release/1.6/source/compiler/PPC/ppc-disassemble.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.6/source/compiler/PPC/ppc-disassemble.lisp (original)
+++ release/1.6/source/compiler/PPC/ppc-disassemble.lisp Mon Nov  1 10:33:0=
5 2010
@@ -244,8 +244,8 @@
 (defun insert-ppc-label (l instructions)
   (let* ((labaddr (lap-label-address l)))
    (do-dll-nodes (insn instructions (append-dll-node l instructions))
-     (when (>=3D (lap-instruction-address insn) labaddr)
-       (return (insert-dll-node-after l (lap-instruction-pred insn)))))))
+     (when (>=3D (instruction-element-address insn) labaddr)
+       (return (insert-dll-node-after l (instruction-element-pred insn))))=
)))
 =

 (defun ppc-disassemble-cr (val operand-spec)
   (declare (type (mod 32) val))