Changeset 14171 for trunk/source/level-1


Ignore:
Timestamp:
Aug 11, 2010, 11:54:26 AM (9 years ago)
Author:
gb
Message:

Darwin/ARM changes.

Location:
trunk/source/level-1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/level-1/l1-boot-2.lisp

    r14119 r14171  
    338338      #+(and arm-target linux-target)
    339339      (bin-load-provide "FFI-LINUXARM" "ffi-linuxarm")
     340      #+(and arm-target darwin-target)
     341      (bin-load-provide "FFI-DARWINARM" "ffi-darwinarm")
    340342
    341343
  • trunk/source/level-1/l1-streams.lisp

    r14119 r14171  
    31443144          (setf (ioblock-line-termination ioblock) line-termination)
    31453145
    3146           (setf (ioblock-element-shift ioblock) (max 0 (ceiling (log  (/ in-size-in-octets insize) 2))))
     3146          (setf (ioblock-element-shift ioblock)
     3147                (let* ((octets-per-element (/ in-size-in-octets insize)))
     3148                  (case octets-per-element
     3149                    (1 0)
     3150                    (2 1)
     3151                    (4 2)
     3152                    (8 3)
     3153                    (t (max 0 (ceiling (log octets-per-element 2)))))))
    31473154          )))
    31483155    (when (ioblock-inbuf ioblock)
     
    31703177            (when (eq sharing :lock)
    31713178              (setf (ioblock-outbuf-lock ioblock) (make-lock)))
    3172             (setf (ioblock-element-shift ioblock) (max 0 (ceiling (log (/ out-size-in-octets outsize) 2))))
     3179            (setf (ioblock-element-shift ioblock)
     3180                  (let* ((octets-per-element (/ out-size-in-octets outsize)))
     3181                    (case octets-per-element
     3182                      (1 0)
     3183                      (2 1)
     3184                      (4 2)
     3185                      (8 3)
     3186                      (t
     3187                       (max 0 (ceiling (log octets-per-element 2)))))))
    31733188            ))))
    31743189    (when (ioblock-outbuf ioblock)
Note: See TracChangeset for help on using the changeset viewer.