Changeset 16266


Ignore:
Timestamp:
Sep 29, 2014, 5:18:15 PM (7 years ago)
Author:
rme
Message:

Merge a few trunk changes here.

Location:
branches/1.10-appstore/source
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/1.10-appstore/source

  • branches/1.10-appstore/source/cocoa-ide/apropos-window.lisp

    r16249 r16266  
    174174                                                       (index :<NSI>nteger))
    175175  (with-slots (packages) combo-box
    176     (let* ((pkg-name  (and packages
    177                            (package-name (svref packages index)))))
     176    (let* ((pkg-name (and packages
     177                          (package-name (svref packages index)))))
    178178      (if pkg-name
    179179        (#/autorelease (%make-nsstring pkg-name))
  • branches/1.10-appstore/source/cocoa-ide/cocoa-editor.lisp

    r16188 r16266  
    25612561         (buffer (hi:hemlock-view-buffer hv))
    25622562         (tv (#/object notification)))
     2563   (unless (> (buffer-edit-level buffer) 0) ;; if editing, hemlock position is the master position.
    25632564    (with-view-selection-info (tv buffer)
    25642565      (let* ((range (#/selectedRange tv))
     
    25742575                (let ((mark (hi:copy-mark point :right-inserting)))
    25752576                  (hi:move-to-absolute-position mark v1)
    2576                   (hemlock::%buffer-push-buffer-mark buffer mark t))))))))))
     2577                  (hemlock::%buffer-push-buffer-mark buffer mark t)))))))))))
    25772578
    25782579(objc:defmethod #/windowTitleForDocumentDisplayName: ((self hemlock-editor-window-controller) docname)
  • branches/1.10-appstore/source/compiler/X86/x86-asm.lisp

    r16085 r16266  
    17691769   (def-x86-opcode movq ((:anymem :insert-memory) (:regmmx :insert-mmx-reg))
    17701770     #x0f6f #o0 0)
    1771    (def-x86-opcode movq ((:regxmm :insert-xmm-reg) (:regxmm :insert-xmm-rm))
     1771   (def-x86-opcode movq ((:regxmm :insert-xmm-rm) (:regxmm :insert-xmm-reg))
    17721772     #x0f7e #o300 0 #xf3)
    17731773   (def-x86-opcode movq ((:anymem :insert-memory) (:regxmm :insert-xmm-reg))
  • branches/1.10-appstore/source/compiler/X86/x862.lisp

    r16235 r16266  
    38233823                    (:double-float (! nfp-load-double-float areg offset nfp))
    38243824                    (:complex-single-float (! nfp-load-complex-single-float areg offset nfp))
    3825                     (:complex-double-float (! nfp-load-complex--float areg offset nfp)))
     3825                    (:complex-double-float (! nfp-load-complex-double-float areg offset nfp)))
    38263826                  (target-arch-case
    38273827                   (:x8664
  • branches/1.10-appstore/source/compiler/vinsn.lisp

    r16085 r16266  
    492492                            :mode (gpr-mode-name-value class)))
    493493        ((:double-float :single-float :complex-double-float :complex-single-float)
    494          (make-unwired-lreg (select-fp-temp class)
    495                             :class hard-reg-class-fpr
    496                             :mode (fpr-mode-name-value class)))
     494         (let* ((lreg (make-unwired-lreg (select-fp-temp class)
     495                                         :class hard-reg-class-fpr
     496                                         :mode (fpr-mode-name-value class))))
     497           (use-fp-reg lreg)
     498           lreg))
    497499        (:lisp
    498500         (make-unwired-lreg
  • branches/1.10-appstore/source/compiler/vreg.lisp

    r16085 r16266  
    296296                 (note-vinsn-refs-gpr vinsn vreg-value))
    297297               (use-imm-temp vreg-value))
    298               ((:single-float :double-float)
     298              ((:single-float :double-float :complex-single-float :complex-double-float)
    299299               (use-fp-reg vreg)
    300300               (if result-p
Note: See TracChangeset for help on using the changeset viewer.