Ignore:
Timestamp:
Feb 22, 2004, 1:27:13 AM (16 years ago)
Author:
gb
Message:

PPC64 changes (some of them rather suspect ...). 32-bit kernel may be a
little funky ...

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ccl/lisp-kernel/pmcl-kernel.c

    r510 r557  
    547547  reserved->low += size;
    548548  reserved->active = reserved->low;
    549   reserved->ndwords -= (size>>3);
     549  reserved->ndnodes -= (size>>dnode_shift);
    550550  return low;
    551551}
     
    600600{
    601601  unsigned
    602     ndwords = area_dword(lisp_global(HEAP_END),lisp_global(HEAP_START)),
     602    ndnodes = area_dnode(lisp_global(HEAP_END),lisp_global(HEAP_START)),
    603603    npages = (lisp_global(HEAP_END)-lisp_global(HEAP_START)) >> 12,
    604     markbits_size = 12+((ndwords+7)>>3),
    605     reloctab_size = (sizeof(LispObj)*(((ndwords+31)>>5)+1)),
     604    markbits_size = 12+((ndnodes+7)>>dnode_shift),
     605    reloctab_size = (sizeof(LispObj)*(((ndnodes+31)>>5)+1)),
    606606    pagemap_size = align_to_power_of_2(npages*sizeof(pageentry),12);
    607607  BytePtr
     
    676676
    677677  a->high += delta;
    678   a->ndwords = area_dword(a->high, a->low);
     678  a->ndnodes = area_dnode(a->high, a->low);
    679679  a->hardlimit = a->high;
    680680  oldspace_protected_area->end = a->high;
     
    697697
    698698  a->high -= delta;
    699   a->ndwords = area_dword(a->high, a->low);
     699  a->ndnodes = area_dnode(a->high, a->low);
    700700  a->hardlimit = a->high;
    701701  oldspace_protected_area->end = a->high;
    702702  uncommit_pages(a->high, delta);
    703703  reserved->low -= delta;
    704   reserved->ndwords += (delta>>3);
     704  reserved->ndnodes += (delta>>dnode_shift);
    705705  lisp_global(HEAP_END) -= delta;
    706706  return true;
     
    11851185  lisp_global(LEXPR_RETURN) = (LispObj)&nvalret;
    11861186  lisp_global(LEXPR_RETURN1V) = (LispObj)&popj;
    1187   lisp_global(ALL_AREAS) = (LispObj) (all_areas);
     1187  lisp_global(ALL_AREAS) = ptr_to_lispobj(all_areas);
    11881188
    11891189
     
    11961196 
    11971197
    1198   lisp_global(IMAGE_NAME) = (LispObj) image_name;
    1199   lisp_global(ARGV) = (LispObj) argv;
    1200   lisp_global(KERNEL_IMPORTS) = (LispObj) import_ptrs_base;
     1198  lisp_global(IMAGE_NAME) = ptr_to_lispobj(image_name);
     1199  lisp_global(ARGV) = ptr_to_lispobj(argv);
     1200  lisp_global(KERNEL_IMPORTS) = (LispObj)import_ptrs_base;
    12011201
    12021202  lisp_global(METERING_INFO) = (LispObj) &lisp_metering;
     
    12041204  *(double *) &(lisp_global(DOUBLE_FLOAT_ONE)) = (double) 1.0;
    12051205
    1206   lisp_global(ARGV) = (LispObj) argv;
    12071206  lisp_global(HOST_PLATFORM) = (LispObj)
    12081207#ifdef LINUX
     
    12421241    tenured_area->younger = g2_area;
    12431242    tenured_area->refbits = a->markbits;
    1244     lisp_global(TENURED_AREA) = (LispObj)(tenured_area);
     1243    lisp_global(TENURED_AREA) = ptr_to_lispobj(tenured_area);
    12451244    g2_area->threshold = (4<<20); /* 4MB */
    12461245    g1_area->threshold = (2<<20); /* 2MB */
     
    12531252  thread_init_tcr(tcr, current_sp, current_sp-stack_base);
    12541253
    1255   lisp_global(EXCEPTION_LOCK) = (LispObj)new_recursive_lock();
     1254  lisp_global(EXCEPTION_LOCK) = ptr_to_lispobj(new_recursive_lock());
    12561255  enable_fp_exceptions();
    12571256  start_vbl();
     
    12621261#endif
    12631262  tcr->prev = tcr->next = tcr;
    1264   lisp_global(TCR_LOCK) = (LispObj)new_recursive_lock();
     1263  lisp_global(TCR_LOCK) = ptr_to_lispobj(new_recursive_lock());
    12651264  lisp_global(INTERRUPT_SIGNAL) = (LispObj) box_fixnum(SIGNAL_FOR_PROCESS_INTERRUPT);
    12661265  tcr->interrupt_level = (-1<<fixnumshift);
Note: See TracChangeset for help on using the changeset viewer.