Changeset 13188


Ignore:
Timestamp:
Nov 11, 2009, 1:17:34 AM (10 years ago)
Author:
gz
Message:

Merge r13175 (x8632 fix)

Location:
branches/working-0711/ccl/lisp-kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/lisp-kernel/image.c

    r13070 r13188  
    6565        int skip = ((int) start[1])+1;
    6666#else
    67         int skip = ((unsigned short)start[1])+1;
    6867        extern void update_self_references(LispObj *);
     68        extern natural imm_word_count(LispObj);
     69
     70        natural skip = (natural)imm_word_count(((LispObj)start)+fulltag_misc)+1;
    6971        update_self_references(start);
    7072#endif
     
    9193      ++start;
    9294    }
     95  }
     96  if (start > end) {
     97    Bug(NULL, "Overran area bounds in relocate_area_contents");
    9398  }
    9499}
  • branches/working-0711/ccl/lisp-kernel/x86-gc.c

    r13070 r13188  
    2828
    2929#ifdef X8632
    30 static inline natural
     30inline natural
    3131imm_word_count(LispObj fn)
    3232{
Note: See TracChangeset for help on using the changeset viewer.