Changeset 14424 for release/1.6


Ignore:
Timestamp:
Nov 11, 2010, 6:47:32 PM (9 years ago)
Author:
rme
Message:

Merge r14422 (gc bug fix) and r14423 (ppc backtrace fix)
from trunk.

Location:
release/1.6/source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/1.6/source

  • release/1.6/source/lib/backtrace-lds.lisp

    r14119 r14424  
    3535  "Returns the function using the frame, and pc offset within the function, if known"
    3636  (declare (ignore context))
    37   (cfp-lfun (require-type frame 'integer)))
     37  (cfp-lfun frame))
    3838
    3939(defun frame-supplied-arguments (frame context &key (unknown-marker (%unbound-marker)))
  • release/1.6/source/lisp-kernel/gc-common.c

    r14295 r14424  
    11381138        memo_dnode += remain;
    11391139        p += (remain+remain);
    1140         bits = *++bitsp;
     1140        if (memo_dnode < num_memo_dnodes) {
     1141          bits = *++bitsp;
     1142        }
    11411143        bitidx = 0;
    11421144      } else {
     
    13381340          *bitsp = outbits;
    13391341        }
    1340         bits = *++bitsp;
     1342        if (memo_dnode < num_memo_dnodes) {
     1343          bits = *++bitsp;
     1344        }
    13411345        inbits = outbits = bits;
    13421346        bitidx = 0;
Note: See TracChangeset for help on using the changeset viewer.