This is unixfasl.c in view mode; [Download] [Up]
Changes file for /usr/local/src/kcl/c/unixfasl.c
Created on Mon Mar 25 16:03:05 1991
Usage \n@s[Original text\n@s|Replacement Text\n@s]
See the file rascal.ics.utexas.edu:/usr2/ftp/merge.c
for a program to merge change files. Anything not between
"\n@s[" and "\n@s]" is a simply a comment.
This file was constructed using emacs and merge.el
Enhancements Copyright (c) W. Schelter All rights reserved.
by (Bill Schelter) wfs@carl.ma.utexas.edu
****Change:(orig (8 8 a))
@s[*/
#include "include.h"
@s|*/
#include "include.h"
#ifdef UNIXFASL
#include UNIXFASL
#else
@s]
****Change:(orig (10 10 c))
@s[
#ifdef BSD
@s|
#ifdef HAVE_AOUT
#undef BSD
#undef ATT
#define BSD
@s]
****Change:(orig (13 13 a))
@s[#include <a.out.h>
#endif
@s|#include <a.out.h>
#endif
#ifdef COFF_ENCAPSULATE
#undef BSD
#undef ATT
#define BSD
#include "a.out.encap.h"
#endif
@s]
****Change:(orig (30 30 a))
@s[#define a_drsize rdsize
#endif
@s|#define a_drsize rdsize
#endif
#ifdef BSD
#define textsize header.a_text
#define datasize header.a_data
#define bsssize header.a_bss
#ifdef COFF_ENCAPSULATE
#define textstart sizeof(header) +sizeof(struct coffheader)
#else
#define textstart sizeof(header)
#endif
#define newbsssize newheader.a_bss
#endif
@s]
****Change:(orig (31 31 a))
@s[
@s|
#ifndef HEADER_SEEK(x)
#define HEADER_SEEK
#endif
@s]
****Change:(orig (34 34 a))
@s[#define MAXPATHLEN 1024
@s|#define MAXPATHLEN 1024
#ifndef SFASL
@s]
****Change:(orig (42 47 c))
@s[#define textsize header.a_text
#define datasize header.a_data
#define bsssize header.a_bss
#define textstart sizeof(header)
@s,#define newbsssize newheader.a_bss
#endif
@s|#endif
@s]
****Change:(orig (80 80 a))
@s[ fp = faslfile->sm.sm_fp;
@s| fp = faslfile->sm.sm_fp;
/* seek to beginning of the header */
@s]
****Change:(orig (81 81 a))
@s[
@s|
HEADER_SEEK(fp);
@s]
****Change:(orig (105 108 c))
@s[ memory = alloc_object(t_cfun);
memory->cf.cf_name = memory->cf.cf_data = OBJNULL;
memory->cf.cf_start = NULL;
memory->cf.cf_size = textsize + datasize + bsssize;
@s| memory = alloc_object(t_cfdata);
memory->cfd.cfd_self = NULL;
memory->cfd.cfd_start = NULL;
memory->cfd.cfd_size = textsize + datasize + bsssize;
@s]
****Change:(orig (110 110 c))
@s[ memory->cf.cf_start = alloc_contblock(memory->cf.cf_size);
@s| memory->cfd.cfd_start = ALLOC_ALIGNED(alloc_contblock,
memory->cfd.cfd_size,sizeof(double));
@s]
****Change:(orig (111 111 a))
@s[
@s|
#ifdef SEEK_TO_END_OFILE
SEEK_TO_END_OFILE(fp);
#else
@s]
****Change:(orig (138 138 c))
@s[ header.a_syms+header.a_trsize+header.a_drsize,
1);
#endif
@s| header.a_syms+header.a_trsize+header.a_drsize,
1);
#endif
#endif
@s]
****Change:(orig (148 149 c))
@s[ sprintf(command,
"ld -d -N -x -A %s -T %x %s -o %s",
@s| LD_COMMAND(command,
@s]
****Change:(orig (151 151 c))
@s[ kcl_self,
memory->cf.cf_start,
@s| kcl_self,
memory->cfd.cfd_start,
@s]
****Change:(orig (152 152 a))
@s[ filename,
@s| filename,
" ",
@s]
****Change:(orig (153 153 a))
@s[ tempfilename);
@s| tempfilename);
if(symbol_value(Vload_verbose)!=Cnil)
printf("start address -T %x ",memory->cfd.cfd_start);
@s]
****Change:(orig (162 162 c))
@s[ kcl_self,
memory->cf.cf_start,
@s| kcl_self,
memory->cfd.cfd_start,
@s]
****Change:(orig (173 173 c))
@s[ kcl_self,
memory->cf.cf_start,
@s| kcl_self,
memory->cfd.cfd_start,
@s]
****Change:(orig (186 186 a))
@s[ fp = tempfile->sm.sm_fp;
@s| fp = tempfile->sm.sm_fp;
HEADER_SEEK(fp);
@s]
****Change:(orig (190 190 c))
@s[ insert_contblock(memory->cf.cf_start, memory->cf.cf_size);
@s| insert_contblock(memory->cfd.cfd_start, memory->cfd.cfd_size);
@s]
****Change:(orig (192 194 c))
@s[ memory->cf.cf_start = NULL;
memory->cf.cf_size = textsize + datasize + bsssize;
memory->cf.cf_start = alloc_contblock(memory->cf.cf_size);
@s| memory->cfd.cfd_start = NULL;
memory->cfd.cfd_size = textsize + datasize + bsssize;
memory->cfd.cfd_start = ALLOC_ALIGNED(alloc_contblock,memory->cfd.cfd_size,
sizeof( double));
@s]
****Change:(orig (204 204 c))
@s[ fread(memory->cf.cf_start, textsize + datasize, 1, fp);
@s| fread(memory->cfd.cfd_start, textsize + datasize, 1, fp);
@s]
****Change:(orig (208 213 d))
@s[#ifdef IBMRT
#endif
@s|
@s]
****Change:(orig (216 222 c))
@s[#ifdef IBMRT
#else
(*(int (*)())(memory->cf.cf_start))
@s, (memory->cf.cf_start, memory->cf.cf_size, data);
@s| call_init(0,memory,data);
@s]
****Change:(orig (226 226 c))
@s[ return(memory->cf.cf_size);
@s| return(memory->cfd.cfd_size);
@s]
****Change:(orig (227 227 a))
@s[}
@s|}
#endif /* ifndef SFASL */
@s]
****Change:(orig (230 230 a))
@s[
#ifdef BSD
@s|
#ifdef BSD
#define FASLINK
#ifndef PRIVATE_FASLINK
@s]
****Change:(orig (236 240 d))
@s[#define textsize header.a_text
#define datasize header.a_data
#define bsssize header.a_bss
#define textstart sizeof(header)
@s,
@s|
@s]
****Change:(orig (251 251 d))
@s[ object *old_vs_top = vs_top;
#ifdef IBMRT
@s| object *old_vs_top = vs_top;
@s]
****Change:(orig (253 254 d))
@s[
#endif
@s|
@s]
****Change:(orig (259 261 c))
@s[
sprintf(command,
"ld -d -N -x -A %s -T %x %s %s -o %s",
@s| LD_COMMAND(command,
@s]
****Change:(orig (274 277 c))
@s[ memory = alloc_object(t_cfun);
memory->cf.cf_name = memory->cf.cf_data = OBJNULL;
memory->cf.cf_start = NULL;
memory->cf.cf_size = textsize + datasize + bsssize;
@s| memory = alloc_object(t_cfdata);
memory->cfd.cfd_self=0;
memory->cfd.cfd_start = NULL;
memory->cfd.cfd_size = textsize + datasize + bsssize;
@s]
****Change:(orig (279 279 c))
@s[ memory->cf.cf_start = alloc_contblock(memory->cf.cf_size);
@s| memory->cfd.cfd_start = ALLOC_ALIGNED(alloc_contblock,
memory->cfd.cfd_size,
sizeof(double));
@s]
****Change:(orig (283 283 a))
@s[ faslfile = open_stream(faslfile, smm_input, Cnil, Kerror);
vs_push(faslfile);
@s| faslfile = open_stream(faslfile, smm_input, Cnil, Kerror);
vs_push(faslfile);
#ifdef SEEK_TO_END_OFILE
SEEK_TO_END_OFILE(faslfile->sm.sm_fp);
#else
@s]
****Change:(orig (292 292 c))
@s[ fseek(fp, i - sizeof(i), 1);
@s| fseek(fp, i - sizeof(i), 1);
#endif
@s]
****Change:(orig (296 304 c))
@s[
sprintf(command,
"ld -d -N -x -A %s -T %x %s %s -o %s",
kcl_self,
@s, ldargstr,
tempfilename);
@s| LD_COMMAND(command,
kcl_self,
memory->cfd.cfd_start,
filename,
ldargstr,
tempfilename);
if(symbol_value(Vload_verbose)!=Cnil)
printf("start address -T %x ",memory->cfd.cfd_start);
@s]
****Change:(orig (317 317 c))
@s[ fread(memory->cf.cf_start, textsize + datasize, 1, fp);
@s| fread(memory->cfd.cfd_start, textsize + datasize, 1, fp);
@s]
****Change:(orig (321 326 d))
@s[#ifdef IBMRT
#endif
@s|
@s]
****Change:(orig (329 329 c))
@s[ unlink(tempfilename);
#ifdef IBMRT
@s| unlink(tempfilename);
call_init(0,memory,data);
@s]
****Change:(orig (331 335 d))
@s[#else
(*(int (*)())(memory->cf.cf_start))
(memory->cf.cf_start, memory->cf.cf_size, data);
#endif
@s,
@s|
@s]
****Change:(orig (339 339 c))
@s[ return(memory->cf.cf_size);
@s| return(memory->cfd.cfd_size);
@s]
****Change:(orig (341 341 a))
@s[}
@s|}
#endif
@s]
****Change:(orig (363 363 a))
@s[ vs_push(make_fixnum(i));
}
#endif
@s| vs_push(make_fixnum(i));
}
#endif
#endif /* UNIXFASL */
@s]
****Change:(orig (366 366 c))
@s[init_unixfasl()
{
#ifdef BSD
@s|init_unixfasl()
{
#ifdef FASLINK
@s]
These are the contents of the former NiCE NeXT User Group NeXTSTEP/OpenStep software archive, currently hosted by Netfuture.ch.