diff --git a/lisp/backtrace.c b/lisp/backtrace.c index d9c49c759e1a19e52c41bd2d25e2498468644b75..7d3e24086d30e0f33a18bbb188ba1a5601510527 100644 --- a/lisp/backtrace.c +++ b/lisp/backtrace.c @@ -1,4 +1,4 @@ -/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/backtrace.c,v 1.1 1992/07/28 20:14:10 wlott Exp $ +/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/backtrace.c,v 1.2 1993/01/10 17:22:33 wlott Exp $ * * Simple backtrace facility. More or less from Rob's lisp version. */ @@ -171,10 +171,10 @@ backtrace(int nframes) function = info.code->entry_points; while (function != NIL) { - struct function_header *header; + struct function *header; lispobj name; - header = (struct function_header *) PTR(function); + header = (struct function *) PTR(function); name = header->name; if (LowtagOf(name) == type_OtherPointer) { diff --git a/lisp/gc.c b/lisp/gc.c index 88a0fecf90bfb014f5909baf185b77a2f4a03b5d..ebb05a507d18ed9b6e54c937c85f2815a5a6c00b 100644 --- a/lisp/gc.c +++ b/lisp/gc.c @@ -1,7 +1,7 @@ /* * Stop and Copy GC based on Cheney's algorithm. * - * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/gc.c,v 1.3 1992/12/05 22:36:17 wlott Exp $ + * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/gc.c,v 1.4 1993/01/10 17:20:12 wlott Exp $ * * Written by Christopher Hoover. */ @@ -648,16 +648,16 @@ trans_code(struct code *code) prev_pointer = &new_code->entry_points; while (fheaderl != NIL) { - struct function_header *fheaderp, *nfheaderp; + struct function *fheaderp, *nfheaderp; lispobj nfheaderl; - fheaderp = (struct function_header *) PTR(fheaderl); + fheaderp = (struct function *) PTR(fheaderl); gc_assert(TypeOf(fheaderp->header) == type_FunctionHeader); /* calcuate the new function pointer and the new */ /* function header */ nfheaderl = fheaderl + displacement; - nfheaderp = (struct function_header *) PTR(nfheaderl); + nfheaderp = (struct function *) PTR(nfheaderl); /* set forwarding pointer */ fheaderp->header = nfheaderl; @@ -680,7 +680,7 @@ scav_code_header(lispobj *where, lispobj object) struct code *code; int nheader_words, ncode_words, nwords; lispobj fheaderl; - struct function_header *fheaderp; + struct function *fheaderp; code = (struct code *) where; ncode_words = fixnum_value(code->code_size); @@ -703,7 +703,7 @@ scav_code_header(lispobj *where, lispobj object) /* code data block */ fheaderl = code->entry_points; while (fheaderl != NIL) { - fheaderp = (struct function_header *) PTR(fheaderl); + fheaderp = (struct function *) PTR(fheaderl); gc_assert(TypeOf(fheaderp->header) == type_FunctionHeader); #if defined(DEBUG_CODE_GC) @@ -760,11 +760,11 @@ scav_return_pc_header(lispobj *where, lispobj object) static lispobj trans_return_pc_header(lispobj object) { - struct function_header *return_pc; + struct function *return_pc; unsigned long offset; struct code *code, *ncode; - return_pc = (struct function_header *) PTR(object); + return_pc = (struct function *) PTR(object); offset = HeaderValue(return_pc->header) * 4; /* Transport the whole code object */ @@ -809,11 +809,11 @@ scav_function_header(lispobj *where, lispobj object) static lispobj trans_function_header(lispobj object) { - struct function_header *fheader; + struct function *fheader; unsigned long offset; struct code *code, *ncode; - fheader = (struct function_header *) PTR(object); + fheader = (struct function *) PTR(object); offset = HeaderValue(fheader->header) * 4; /* Transport the whole code object */ diff --git a/lisp/purify.c b/lisp/purify.c index ee229ee265dbaeefa359cdc2021f015b25211a74..ba2cafcf29eb7864b539932efb533c8c353b564d 100644 --- a/lisp/purify.c +++ b/lisp/purify.c @@ -1,6 +1,6 @@ /* Purify. */ -/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/purify.c,v 1.3 1992/12/05 22:36:32 wlott Exp $ */ +/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/purify.c,v 1.4 1993/01/10 17:22:37 wlott Exp $ */ #include <stdio.h> #include <sys/types.h> @@ -235,7 +235,7 @@ static lispobj ptrans_code(lispobj thing) /* Put in forwarding pointers for all the functions. */ for (func = code->entry_points; func != NIL; - func = ((struct function_header *)PTR(func))->next) { + func = ((struct function *)PTR(func))->next) { gc_assert(LowtagOf(func) == type_FunctionPointer); @@ -252,11 +252,11 @@ static lispobj ptrans_code(lispobj thing) pscav(&new->entry_points, 1, TRUE); for (func = new->entry_points; func != NIL; - func = ((struct function_header *)PTR(func))->next) { + func = ((struct function *)PTR(func))->next) { gc_assert(LowtagOf(func) == type_FunctionPointer); gc_assert(!dynamic_pointer_p(func)); - pscav(&((struct function_header *)PTR(func))->self, 2, TRUE); - pscav_later(&((struct function_header *)PTR(func))->name, 3); + pscav(&((struct function *)PTR(func))->self, 2, TRUE); + pscav_later(&((struct function *)PTR(func))->name, 3); } return result; @@ -266,7 +266,7 @@ static lispobj ptrans_func(lispobj thing, lispobj header) { int nwords; lispobj code, *new, *old, result; - struct function_header *function; + struct function *function; /* THING can either be a function header, a closure function header, */ /* a closure, or a funcallable-instance. If it's a closure or a */ @@ -281,7 +281,7 @@ static lispobj ptrans_func(lispobj thing, lispobj header) /* scavenged, because if it had been scavenged, forwarding pointers */ /* would have been left behind for all the entry points. */ - function = (struct function_header *)PTR(thing); + function = (struct function *)PTR(thing); code = (PTR(thing)-(HeaderValue(function->header)*sizeof(lispobj))) | type_OtherPointer;