Changeset 13505


Ignore:
Timestamp:
Mar 9, 2010, 7:35:57 PM (10 years ago)
Author:
gz
Message:

From trunk, misc tweaks and small fixes: r13366 r13371 r13470 r13437 r13405 r13444 r13417 r13398 r13384

Location:
branches/working-0711/ccl
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl

  • branches/working-0711/ccl/compiler/nx1.lisp

    r13487 r13505  
    22132213(defnx1 nx1-symvector ((%symptr->symvector) (%symvector->symptr)) (arg)
    22142214  (make-acode (%nx1-default-operator) (nx1-form arg)))
    2215        
     2215
     2216
    22162217(defnx1 nx1-ash (ash) (&whole call &environment env num amt)
    22172218  (let* ((unsigned-natural-type (target-word-size-case
     
    22312232                         (nx1-form num))
    22322233             (if (nx-form-typep num unsigned-natural-type env)
    2233                (make-acode (%nx1-operator natural-shift-right)
    2234                            (nx1-form num)
    2235                            (make-acode (%nx1-operator fixnum)
    2236                                        (min (1- max) (- amt))))
     2234               (if (< (- amt) max)
     2235                 (make-acode (%nx1-operator natural-shift-right)
     2236                             (nx1-form num)
     2237                             (make-acode (%nx1-operator fixnum)
     2238                                         (- amt)))
     2239                 (nx1-form `(progn (require-type ,num 'integer) 0) env))
    22372240               (nx1-treat-as-call call))))
    22382241          ((and (fixnump amt)
  • branches/working-0711/ccl/level-0/X86/x86-misc.lisp

    r13070 r13505  
    136136    (cmpq (% dest) (% rsrc))
    137137    (jne @front)
    138     (cmpq (% src-byte-offset) (% dest-byte-offset))
     138    (cmpq (% rsrc-byte-offset) (% dest-byte-offset))
    139139    (jg @back)
    140140    @front
  • branches/working-0711/ccl/level-1/l1-boot-2.lisp

    r13442 r13505  
    256256      (progn
    257257        (bin-load-provide "X86-DISASSEMBLE" "x86-disassemble")
    258         (bin-load-provide "X86-LAPMACROS" "x86-lapmacros"))
     258        (bin-load-provide "X86-LAPMACROS" "x86-lapmacros")
     259        (bin-load "x86-watch"))
    259260
    260261
  • branches/working-0711/ccl/level-1/l1-reader.lisp

    r13146 r13505  
    18171817                ("Nko_Exclamation_Mark" . #\u+07f9)
    18181818                ("Nko_Lajanyalan" . #\u+07fa)
     1819                ("Figure_Space" . #\u+2007)
     1820                ("Zero_Width_Space" . #\u+200b)
    18191821                ("Line_Separator" . #\u+2028)
    18201822                ("Paragraph_Separator" . #\u+2029)
  • branches/working-0711/ccl/level-1/l1-streams.lisp

    r13146 r13505  
    245245      (error "~s is not an ivector subtype." element-type))
    246246    (let* ((size-in-octets (ccl::subtag-bytes subtag element-count)))
    247       (multiple-value-bind (pointer vector)
     247      (multiple-value-bind (vector pointer)
    248248          (ccl::%make-heap-ivector subtag size-in-octets element-count)
    249         (values pointer vector size-in-octets)))))
     249        (values vector pointer size-in-octets)))))
    250250
    251251
     
    24742474      (if (eq b :eof)
    24752475        (return (- i start)))
    2476       (setf (uvref vector i) b)
     2476      (setf (aref vector i) b)
    24772477      (incf i)
    24782478      (decf need)
     
    57995799
    58005800(defun gen-file-name (path)
    5801   (let* ((date (file-write-date path))
    5802          (tem-path (merge-pathnames (make-pathname :name (%integer-to-string date) :type "tem" :defaults nil) path)))
     5801  (let* ((base (random (ash target::target-most-positive-fixnum -1)))
     5802         (tem-path (merge-pathnames (make-pathname :name (%integer-to-string base) :type "tem" :defaults nil) path)))
    58035803    (loop
    58045804      (when (%create-file tem-path :if-exists nil) (return tem-path))     
    5805       (setf (%pathname-name tem-path) (%integer-to-string (setq date (1+ date)))))))
     5805      (setf (%pathname-name tem-path) (%integer-to-string (setq base (1+ base)))))))
    58065806
    58075807(defun probe-file-x (path)
  • branches/working-0711/ccl/lib/ccl-export-syms.lisp

    r13179 r13505  
    3434     defloadvar
    3535     defstatic
     36     defstaticvar
    3637     *break-on-warnings*
    3738                                        ; misc
  • branches/working-0711/ccl/lib/compile-ccl.lisp

    r13442 r13505  
    521521(defvar *ccl-save-source-locations* :no-text)
    522522
    523 (defun rebuild-ccl (&key update full clean kernel force (reload t) exit reload-arguments verbose optional-features (save-source-locations *ccl-save-source-locations*))
     523(defun rebuild-ccl (&key update full clean kernel force (reload t) exit
     524                    reload-arguments verbose optional-features
     525                    (save-source-locations *ccl-save-source-locations*)
     526                    allow-constant-redefinition)
    524527  (let* ((*build-time-optional-features* (intersection *known-optional-features* optional-features))
    525528         (*features* (append *build-time-optional-features* *features*))
    526          (*save-source-locations* save-source-locations))
     529         (*save-source-locations* save-source-locations)
     530         (*cerror-on-constant-redefinition* (not allow-constant-redefinition)))
    527531    (when *build-time-optional-features*
    528532      (setq full t))
Note: See TracChangeset for help on using the changeset viewer.