d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Version that uses libobject.a

Browse source
This commit is contained in:
ceriel 1986-12-01 15:41:29 +00:00
parent b44e39cce8
commit e188fe0956
8 changed files with 181 additions and 262 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
mach/proto/as/comm0.h
View file

@ -15,7 +15,6 @@
* DEBUG: for debugging purposes only * DEBUG: for debugging purposes only
* TMPDIR: directory for temporary files * TMPDIR: directory for temporary files
* ASLD: combined assembler/linker * ASLD: combined assembler/linker
* AOUTSEEK: seek on a.out instead of multiple opens
*/ */
/* ========== constants (use #undef, #define in mach0.c) ========== */ /* ========== constants (use #undef, #define in mach0.c) ========== */
@ -64,10 +63,6 @@
/* ========== default option setting ========== */ /* ========== default option setting ========== */
#ifndef NOLD
#define ASLD /* default ON */
#endif
#ifndef ASLD #ifndef ASLD
#ifndef RELOCATION #ifndef RELOCATION
separate linker only possible if relocation info produced separate linker only possible if relocation info produced
@ -91,7 +86,7 @@ _include <signal.h>
#endif #endif
#ifdef ASLD #ifdef ASLD
#include "aar.h" #include "arch.h"
#endif #endif
#include "out.h" #include "out.h"
@ -155,6 +150,7 @@ _include <signal.h>
/* miscellaneous */ /* miscellaneous */
#define KEYDEFINE 0 #define KEYDEFINE 0
#define KEYSECT 12
#define DOTGAIN DOTSCT->s_gain #define DOTGAIN DOTSCT->s_gain
/* ========== type declarations ========== */ /* ========== type declarations ========== */
@ -179,6 +175,17 @@ struct item_t {
char *i_name; /* symbol name */ char *i_name; /* symbol name */
}; };
struct common_t {
struct common_t *
c_next;
struct item_t *c_it;
#ifndef ASLD
valu_t c_size;
#endif
};
typedef struct common_t common_t;
typedef struct item_t item_t; typedef struct item_t item_t;
struct sect_t { struct sect_t {
@ -213,24 +220,17 @@ typedef struct sect_t sect_t;
/* /*
* extra type bits out of S_ETC, internal use only * extra type bits out of S_ETC, internal use only
#ifndef DUK
* S_COM:
* - symbols declared by .comm
#endif DUK
* S_VAR: * S_VAR:
* - type not known at end of PASS_1 (S_VAR|S_UND) * - type not known at end of PASS_1 (S_VAR|S_UND)
* - value not known at end of PASS_2 (S_VAR|S_ABS) * - value not known at end of PASS_2 (S_VAR|S_ABS)
* S_DOT: * S_DOT:
* - dot expression * - dot expression
*/ */
#ifndef DUK
#define S_COM 0x0100
#endif DUK
#define S_VAR 0x0200 #define S_VAR 0x0200
#define S_DOT 0x0400 #define S_DOT 0x0400
/* should be tested by preprocessor /* should be tested by preprocessor
* due to error in preprocessor it cannot * due to error in preprocessor it cannot
* test performed at runtime now * test performed at compiletime by a switch now
* #if (S_ETC|S_COM|S_VAR|S_DOT) != S_ETC * #if (S_ETC|S_COM|S_VAR|S_DOT) != S_ETC
* incorrect type bits * incorrect type bits
* #endif * #endif
@ -243,10 +243,16 @@ typedef struct sect_t sect_t;
#define PARTCHAR 3 #define PARTCHAR 3
#define PARTS 4 #define PARTS 4
#ifdef AOUTSEEK #ifdef BYTES_REVERSED
#define AOUTPART(p) if(aoutpart!=p){aoutpart=p;fseek(aoutfile,aoutseek[p],0);} #ifdef WORDS_REVERSED
#define AOUTPUTC(c,p) {putc(c,aoutfile);aoutseek[p]++;if(ferror(aoutfile))werror();} #define MACHREL_BWR (RELBR|RELWR)
#else #else
#define AOUTPART(p) /* empty */ #define MACHREL_BWR (RELBR)
#define AOUTPUTC(c,p) {putc(c,aoutfile[p]);if(ferror(aoutfile[p]))werror();} #endif
#else
#ifdef WORDS_REVERSED
#define MACHREL_BWR (RELWR)
#else
#define MACHREL_BWR (0)
#endif
#endif #endif

11
mach/proto/as/comm1.h
View file

@ -20,6 +20,7 @@ extern short sflag INIT(SYM_DEF);
/* -s option (symbol table info) */ /* -s option (symbol table info) */
extern char *progname; /* for error messages */ extern char *progname; /* for error messages */
extern char *modulename; /* for error messages */ extern char *modulename; /* for error messages */
extern common_t *commons; /* header of commons list */
#ifdef ASLD #ifdef ASLD
extern short archmode; /* scanning archives */ extern short archmode; /* scanning archives */
@ -52,14 +53,6 @@ extern char temppath[50];
extern FILE *input; extern FILE *input;
extern FILE *tempfile; extern FILE *tempfile;
#ifdef AOUTSEEK
extern FILE *aoutfile;
extern int aoutpart INIT(-1);
extern long aoutseek[PARTS];
#else
extern FILE *aoutfile[PARTS];
#endif
extern char stringbuf[STRINGMAX]; extern char stringbuf[STRINGMAX];
/* contains last string value */ /* contains last string value */
@ -72,6 +65,8 @@ extern sect_t *DOTSCT; /* &sect[DOTTYP-S_MIN] or NULL */
extern addr_t DOTVAL; /* DOTSCT->s_size + DOTSCT->s_base */ extern addr_t DOTVAL; /* DOTSCT->s_size + DOTSCT->s_base */
extern short DOTTYP; /* S_MIN..S_MAX or S_UND */ extern short DOTTYP; /* S_MIN..S_MAX or S_UND */
extern ushort nname; /* Counts name table index in PASS_3 */
extern item_t *hashtab[H_TOTAL]; extern item_t *hashtab[H_TOTAL];
extern short hashindex; /* see item_search() */ extern short hashindex; /* see item_search() */

40
mach/proto/as/comm2.y
View file

@ -229,25 +229,7 @@ datalist
{ {
#ifdef RELOCATION #ifdef RELOCATION
if (rflag != 0 && PASS_RELO) if (rflag != 0 && PASS_RELO)
#ifdef DUK newrelo($1.typ, (int)$<y_word>0|MACHREL_BWR);
#ifdef BYTES_REVERSED
#ifdef WORDS_REVERSED
newrelo($1.typ,
(int)$<y_word>0 | RELBR | RELWR
);
#else WORDS_REVERSED
newrelo($1.typ, (int)$<y_word>0|RELBR);
#endif WORDS_REVERSED
#else BYTES_REVERSED
#ifdef WORDS_REVERSED
newrelo($1.typ, (int)$<y_word>0|RELWR);
#else WORDS_REVERSED
newrelo($1.typ, (int)$<y_word>0);
#endif WORDS_REVERSED
#endif BYTES_REVERSED
#else DUK
newrelo($1.typ, (int)$<y_word>0);
#endif DUK
#endif #endif
emitx($1.val, (int)$<y_word>0); emitx($1.val, (int)$<y_word>0);
} }
@ -255,25 +237,7 @@ datalist
{ {
#ifdef RELOCATION #ifdef RELOCATION
if (rflag != 0 && PASS_RELO) if (rflag != 0 && PASS_RELO)
#ifdef DUK newrelo($3.typ, (int)$<y_word>0|MACHREL_BWR);
#ifdef BYTES_REVERSED
#ifdef WORDS_REVERSED
newrelo($3.typ,
(int)$<y_word>0 | RELBR | RELWR
);
#else WORDS_REVERSED
newrelo($3.typ, (int)$<y_word>0|RELBR);
#endif WORDS_REVERSED
#else BYTES_REVERSED
#ifdef WORDS_REVERSED
newrelo($3.typ, (int)$<y_word>0|RELWR);
#else WORDS_REVERSED
newrelo($3.typ, (int)$<y_word>0);
#endif WORDS_REVERSED
#endif BYTES_REVERSED
#else DUK
newrelo($3.typ, (int)$<y_word>0);
#endif DUK
#endif #endif
emitx($3.val, (int)$<y_word>0); emitx($3.val, (int)$<y_word>0);
} }

10
mach/proto/as/comm3.c
View file

@ -9,16 +9,10 @@
#include "comm1.h" #include "comm1.h"
#undef extern
struct outhead outhead = { struct outhead outhead = {
O_MAGIC, O_STAMP, 0 O_MAGIC, O_STAMP, 0
#ifndef DUK
#ifdef BYTES_REVERSED
| HF_BREV
#endif
#ifdef WORDS_REVERSED
| HF_WREV
#endif
#endif DUK
}; };
#include "y.tab.h" #include "y.tab.h"

183
mach/proto/as/comm4.c
View file

@ -34,11 +34,14 @@ char **argv;
SIGHUP, SIGINT, SIGQUIT, SIGTERM, 0 SIGHUP, SIGINT, SIGQUIT, SIGTERM, 0
}; };
/* this test should be performed by the /* the next test should be performed by the
* preprocessor, but it cannot * preprocessor, but it cannot, so it is performed by the compiler.
*/ */
if ((S_ETC|S_COM|S_VAR|S_DOT) != S_ETC)
fatal("incorrect type bits"); switch(0) {
case 1: break;
case (S_ETC|S_COM|S_VAR|S_DOT) != S_ETC : break;
}
progname = *argv++; argc--; progname = *argv++; argc--;
for (p = sigs; i = *p++; ) for (p = sigs; i = *p++; )
@ -106,6 +109,7 @@ char **argv;
pass_23(PASS_2); pass_23(PASS_2);
#endif #endif
pass_23(PASS_3); pass_23(PASS_3);
wr_close();
stop(); stop();
} }
@ -114,11 +118,10 @@ char **argv;
pass_1(argc, argv) pass_1(argc, argv)
char **argv; char **argv;
{ {
register i;
register char *p; register char *p;
register item_t *ip; register item_t *ip;
#ifdef ASLD #ifdef ASLD
char armagic[SZMAGIC]; char armagic[2];
#else #else
register nfile = 0; register nfile = 0;
#endif #endif
@ -136,24 +139,25 @@ char **argv;
p = *argv++; p = *argv++;
if (p == 0) if (p == 0)
continue; continue;
#ifdef ASLD #ifndef ASLD
if (nfile != 0)
fatal("second source file %s", p);
nfile++;
#endif
if (p[0] == '-' && p[1] == '\0') { if (p[0] == '-' && p[1] == '\0') {
input = stdin; input = stdin;
parse("STDIN"); parse("STDIN");
continue; continue;
} }
#else
if (nfile != 0)
fatal("second source file %s", p);
nfile++;
#endif
if ((input = fopen(p, "r")) == NULL) if ((input = fopen(p, "r")) == NULL)
fatal("can't open %s", p); fatal("can't open %s", p);
#ifdef ASLD #ifdef ASLD
if ( if (
fread(armagic, SZMAGIC, 1, input) == 1 fread(armagic, 2, 1, input) == 1
&& &&
strncmp(armagic, ARMAGIC, SZMAGIC) == 0 ((armagic[0]&0377) |
((unsigned)(armagic[1]&0377)<<8)) == ARMAG
) { ) {
archive(); archive();
fclose(input); fclose(input);
@ -168,6 +172,8 @@ char **argv;
machfinish(PASS_1); machfinish(PASS_1);
#ifdef ASLD #ifdef ASLD
if (unresolved) { if (unresolved) {
register int i;
nerrors++; nerrors++;
fflush(stdout); fflush(stdout);
fprintf(stderr, "unresolved references:\n"); fprintf(stderr, "unresolved references:\n");
@ -189,40 +195,35 @@ char **argv;
} }
#ifdef ASLD #ifdef ASLD
archive() archive() {
{
register long offset; register long offset;
register i; struct ar_hdr header;
register long modsize; char getsize[AR_TOTAL];
char modhead[SZMHEAD];
archmode++; archmode++;
offset = SZMAGIC; offset = 2;
for (;;) { for (;;) {
if (unresolved == 0) if (unresolved == 0)
break; break;
fseek(input, offset, 0); fseek(input,offset,0);
if (fread(modhead, SZMHEAD, 1, input) != 1) if (fread(getsize,AR_TOTAL,1,input) != 1)
break; break;
if ( offset += AR_TOTAL;
strncmp(&modhead[OFF_BEG], STR_BEG, LEN_BEG) strncpy(header.ar_name,getsize,sizeof header.ar_name) ;
|| header.ar_size= (((((long) (getsize[AR_SIZE+1]&0377))<<8)+
strncmp(&modhead[OFF_END], STR_END, LEN_END) ((long) (getsize[AR_SIZE ]&0377))<<8)+
) ((long) (getsize[AR_SIZE+3]&0377))<<8)+
fatal("bad archive"); ((long) (getsize[AR_SIZE+2]&0377)) ;
offset += SZMHEAD; archsize = header.ar_size;
modsize = atol(&modhead[OFF_SIZ]);
archsize = modsize;
if (needed()) { if (needed()) {
fseek(input, offset, 0); fseek(input,offset,0);
archsize = modsize; archsize = header.ar_size;
for (i = 0; i < LEN_NAM; i++) header.ar_name[14] = '\0';
if (modhead[OFF_NAM+i] == ' ') parse(remember(header.ar_name));
break;
modhead[OFF_NAM+i] = '\0';
parse(remember(&modhead[OFF_NAM]));
} }
offset += modsize; offset += header.ar_size;
while (offset % 2)
offset++;
} }
archmode = 0; archmode = 0;
} }
@ -257,6 +258,12 @@ needed()
continue; continue;
} }
if (first) { if (first) {
if (ip == &keytab[KEYSECT]) {
while ((c = nextchar()) != '\n')
;
continue;
}
if (ip != &keytab[KEYDEFINE]) if (ip != &keytab[KEYDEFINE])
break; break;
first = 0; first = 0;
@ -417,24 +424,12 @@ setupoutput()
register sect_t *sp; register sect_t *sp;
register long off; register long off;
struct outsect outsect; struct outsect outsect;
register struct outsect *pos = &outsect;
#ifdef AOUTSEEK if (! wr_open(aoutpath)) {
#define AOUTseek(p,o) {aoutseek[p]=o;} fatal("can't create %s", aoutpath);
aoutfile = ffcreat(aoutpath); }
#else wr_ohead(&outhead);
#define AOUTseek(p,o) {fseek(aoutfile[p],o,0);}
aoutfile[PARTEMIT]=ffcreat(aoutpath);
#ifdef RELOCATION
aoutfile[PARTRELO]=ffcreat(aoutpath);
#endif
aoutfile[PARTNAME]=ffcreat(aoutpath);
aoutfile[PARTCHAR]=ffcreat(aoutpath);
#endif
/*
* header generation
*/
AOUTseek(PARTEMIT, 0);
putofmt((char *)&outhead, SF_HEAD, PARTEMIT);
/* /*
* section table generation * section table generation
*/ */
@ -442,52 +437,56 @@ setupoutput()
off += (long)outhead.oh_nsect * SZ_SECT; off += (long)outhead.oh_nsect * SZ_SECT;
for (sp = sect; sp < &sect[outhead.oh_nsect]; sp++) { for (sp = sect; sp < &sect[outhead.oh_nsect]; sp++) {
sp->s_foff = off; sp->s_foff = off;
outsect.os_base = SETBASE(sp); pos->os_base = SETBASE(sp);
outsect.os_size = sp->s_size + sp->s_comm; pos->os_size = sp->s_size + sp->s_comm;
outsect.os_foff = sp->s_foff; pos->os_foff = sp->s_foff;
outsect.os_flen = sp->s_size - sp->s_zero; pos->os_flen = sp->s_size - sp->s_zero;
outsect.os_lign = sp->s_lign; pos->os_lign = sp->s_lign;
off += outsect.os_flen; off += pos->os_flen;
putofmt((char *)&outsect, SF_SECT, PARTEMIT); wr_sect(pos, 1);
} }
#ifdef RELOCATION #ifdef RELOCATION
AOUTseek(PARTRELO, off);
off += (long)outhead.oh_nrelo * SZ_RELO; off += (long)outhead.oh_nrelo * SZ_RELO;
#endif #endif
if (sflag == 0) if (sflag == 0)
return; return;
AOUTseek(PARTNAME, off);
off += (long)outhead.oh_nname * SZ_NAME; off += (long)outhead.oh_nname * SZ_NAME;
AOUTseek(PARTCHAR, off);
outhead.oh_nchar = off; /* see newsymb() */ outhead.oh_nchar = off; /* see newsymb() */
#undef AOUTseek
} }
commfinish() commfinish()
{ {
register i; #ifndef ASLD
register int i;
#endif
register struct common_t *cp;
register item_t *ip; register item_t *ip;
register sect_t *sp; register sect_t *sp;
register valu_t addr; register valu_t addr;
switchsect(S_UND); switchsect(S_UND);
#ifdef ASLD
/* /*
* assign .comm labels and produce .comm symbol table entries * assign .comm labels and produce .comm symbol table entries
*/ */
for (i = 0; i<H_SIZE; i++) for (cp = commons; cp; cp = cp->c_next) {
for (ip = hashtab[H_GLOBAL+i]; ip; ip = ip->i_next) { ip = cp->c_it;
if ((ip->i_type & S_COM) == 0) #ifndef ASLD
continue; if (!( ip->i_type & S_EXT)) {
#endif
sp = &sect[(ip->i_type & S_TYP) - S_MIN]; sp = &sect[(ip->i_type & S_TYP) - S_MIN];
if (pass == PASS_1) { if (pass == PASS_1) {
addr = sp->s_size + sp->s_comm; addr = sp->s_size + sp->s_comm;
sp->s_comm += ip->i_valu; sp->s_comm += ip->i_valu;
ip->i_valu = addr; ip->i_valu = addr;
#ifndef ASLD
ip->i_type &= ~S_COM;
#endif
} }
#ifdef ASLD
#ifdef THREE_PASS #ifdef THREE_PASS
if (pass == PASS_2) if (pass == PASS_2) {
ip->i_valu -= sp->s_gain; ip->i_valu -= sp->s_gain;
}
#endif #endif
if ((sflag & SYM_EXT) && PASS_SYMB) if ((sflag & SYM_EXT) && PASS_SYMB)
newsymb( newsymb(
@ -496,8 +495,27 @@ commfinish()
(short)0, (short)0,
load(ip) load(ip)
); );
#else not ASLD
#ifdef THREE_PASS
if (pass == PASS_2) {
cp->c_size -= sp->s_gain;
}
#endif THREE_PASS
} }
#endif if (pass == PASS_1) cp->c_size = ip->i_valu;
if (PASS_SYMB) {
if (pass != PASS_3 && (ip->i_type & S_EXT)) {
ip->i_valu = outhead.oh_nname;
}
newsymb(
ip->i_name,
ip->i_type,
(short) 0,
cp->c_size
);
}
#endif not ASLD
}
if (PASS_SYMB == 0) if (PASS_SYMB == 0)
return; return;
#ifndef ASLD #ifndef ASLD
@ -514,15 +532,14 @@ commfinish()
* for possible relocation * for possible relocation
*/ */
ip->i_valu = outhead.oh_nname; ip->i_valu = outhead.oh_nname;
if (sflag & SYM_SCT) newsymb(
newsymb( ip->i_name,
ip->i_name, S_EXT|S_UND,
S_EXT|S_UND, (short)0,
(short)0, (valu_t)0
(valu_t)0 );
);
} }
#endif ASLD #endif not ASLD
/* /*
* produce symbol table entries for sections * produce symbol table entries for sections
*/ */

14
mach/proto/as/comm5.c
View file

@ -162,13 +162,7 @@ getval(c)
#endif #endif
case STRING: case STRING:
p = stringbuf; p = stringbuf;
#ifdef DUK *p++ = n = getc(tempfile); p[n] = '\0'; break;
*p++ = n = getc(tempfile);
p[n] = '\0';
break;
#else DUK
*p++ = n = getc(tempfile); break;
#endif DUK
case OP_EQ: case OP_EQ:
case OP_NE: case OP_NE:
case OP_LE: case OP_LE:
@ -360,18 +354,12 @@ instring(termc)
break; break;
if (c == '\\') if (c == '\\')
c = inescape(); c = inescape();
#ifdef DUK
if (p >= &stringbuf[STRINGMAX - 1]) if (p >= &stringbuf[STRINGMAX - 1])
#else DUK
if (p >= &stringbuf[STRINGMAX])
#endif DUK
fatal("string buffer overflow"); fatal("string buffer overflow");
*p++ = c; *p++ = c;
} }
stringbuf[0] = p - stringbuf - 1; stringbuf[0] = p - stringbuf - 1;
#ifdef DUK
*p = '\0'; *p = '\0';
#endif DUK
return(STRING); return(STRING);
} }

94
mach/proto/as/comm6.c
View file

@ -106,11 +106,11 @@ register item_t *ip;
sp = &sect[typ - S_MIN]; sp = &sect[typ - S_MIN];
sp->s_item = ip; sp->s_item = ip;
sp->s_lign = ALIGNSECT; sp->s_lign = ALIGNSECT;
#ifdef DUK #ifndef ASLD
ip->i_type = typ; ip->i_type = typ;
#else DUK #else
ip->i_type = typ | S_EXT; ip->i_type = typ | S_EXT;
#endif DUK #endif
ip->i_valu = 0; ip->i_valu = 0;
} else if (typ >= S_MIN) { } else if (typ >= S_MIN) {
sp = &sect[typ - S_MIN]; sp = &sect[typ - S_MIN];
@ -142,16 +142,14 @@ valu_t base;
} }
/* /*
* NOTE: A rather different solution is used for ASLD and NOLD: * NOTE: A rather different solution is used for ASLD and not ASLD:
* ASLD: * ASLD, or local commons:
* - maximum length of .comm is recorded in i_valu during PASS_1 * - maximum length of .comm is recorded in i_valu during PASS_1
* - address of .comm is recorded in i_valu in later passes: * - address of .comm is recorded in i_valu in later passes:
* assigned at end of PASS_1, corrected for s_gain at end of PASS_2 * assigned at end of PASS_1, corrected for s_gain at end of PASS_2
* - symbol table entries are produced in commfinish() * not ASLD:
* NOLD: * - maximum length of .comm is recorded in i_valu during PASS_1
* - i_valu cannot be used since it is needed for relocation info * - i_valu is used for relocation info during PASS_3
* - only one .comm with a particular symbol is allowed per module
* - symbol table entries are produced in newcomm()
*/ */
newcomm(ip, val) newcomm(ip, val)
register item_t *ip; register item_t *ip;
@ -165,31 +163,15 @@ valu_t val;
/* printf("declare %s: %o\n", ip->i_name, DOTTYP); */ /* printf("declare %s: %o\n", ip->i_name, DOTTYP); */
if ((ip->i_type & ~S_EXT) == S_UND) { if ((ip->i_type & ~S_EXT) == S_UND) {
--unresolved; --unresolved;
ip->i_type = S_COM|S_EXT|DOTTYP; ip->i_type = S_COM|DOTTYP|(ip->i_type&S_EXT);
#ifdef ASLD
ip->i_valu = val; ip->i_valu = val;
} else if (ip->i_type == (S_COM|S_EXT|DOTTYP)) { new_common(ip);
} else if (ip->i_type == (S_COM|DOTTYP|(ip->i_type&S_EXT))) {
if (ip->i_valu < val) if (ip->i_valu < val)
ip->i_valu = val; ip->i_valu = val;
#endif
} else } else
serror("multiple declared"); serror("multiple declared");
} }
#ifndef ASLD
if (PASS_SYMB == 0)
return;
if (pass != PASS_3)
/*
* save symbol table index
* for possible relocation
*/
ip->i_valu = outhead.oh_nname;
#ifdef DUK
newsymb(ip->i_name, S_COM|S_EXT|DOTTYP, (short)0, val);
#else DUK
newsymb(ip->i_name, S_EXT|DOTTYP, (short)0, val);
#endif DUK
#endif
} }
switchsect(newtyp) switchsect(newtyp)
@ -207,12 +189,7 @@ short newtyp;
assert(newtyp >= S_MIN); assert(newtyp >= S_MIN);
sp = &sect[newtyp - S_MIN]; sp = &sect[newtyp - S_MIN];
if (pass == PASS_3) { if (pass == PASS_3) {
#ifdef AOUTSEEK wr_outsect(newtyp - S_MIN);
aoutpart = -1;
aoutseek[PARTEMIT] = sp->s_foff + sp->s_size - sp->s_zero;
#else
fseek(aoutfile[PARTEMIT], sp->s_foff + sp->s_size - sp->s_zero, 0);
#endif
} }
DOTVAL = sp->s_size + sp->s_base; DOTVAL = sp->s_size + sp->s_base;
DOTSCT = sp; DOTSCT = sp;
@ -254,9 +231,8 @@ valu_t bytes;
DOTGAIN += (bytes - 1) - gap; DOTGAIN += (bytes - 1) - gap;
#endif #endif
} }
/* I don't play the os_zero game here, but plainly write out zero's */ DOTVAL += gap;
/* Led abuses trailing zero parts */ sp->s_zero += gap;
while (gap--) emit1(0) ;
} }
#ifdef RELOCATION #ifdef RELOCATION
@ -264,9 +240,7 @@ newrelo(s, n)
short s; short s;
{ {
struct outrelo outrelo; struct outrelo outrelo;
#ifdef DUK
int iscomm; int iscomm;
#endif DUK
if (rflag == 0) if (rflag == 0)
return; return;
@ -284,9 +258,7 @@ short s;
* b=a * b=a
* a: .data2 0 * a: .data2 0
*/ */
#ifdef DUK
iscomm = s & S_COM; iscomm = s & S_COM;
#endif DUK
s &= ~S_COM; s &= ~S_COM;
if ((n & RELPC) == 0 && s == S_ABS) if ((n & RELPC) == 0 && s == S_ABS)
return; return;
@ -300,11 +272,7 @@ short s;
outrelo.or_type = (char)n; outrelo.or_type = (char)n;
outrelo.or_sect = (char)DOTTYP; outrelo.or_sect = (char)DOTTYP;
#ifndef ASLD #ifndef ASLD
#ifdef DUK
if (s == S_UND || iscomm) { if (s == S_UND || iscomm) {
#else DUK
if (s == S_UND) {
#endif DUK
assert(relonami != 0); assert(relonami != 0);
outrelo.or_nami = relonami-1; outrelo.or_nami = relonami-1;
relonami = 0; relonami = 0;
@ -326,7 +294,7 @@ short s;
; ;
} }
outrelo.or_addr = (long)DOTVAL; outrelo.or_addr = (long)DOTVAL;
putofmt((char *)&outrelo, SF_RELO, PARTRELO); wr_relo(&outrelo, 1);
} }
#endif #endif
@ -347,17 +315,37 @@ valu_t valu;
outhead.oh_nname++; outhead.oh_nname++;
return; return;
} }
nname++;
if (name) { if (name) {
AOUTPART(PARTCHAR); int len = strlen(name) + 1;
wr_string(name, len);
outname.on_foff = outhead.oh_nchar; outname.on_foff = outhead.oh_nchar;
do { outhead.oh_nchar += len;
AOUTPUTC(*name, PARTCHAR);
outhead.oh_nchar++;
} while (*name++);
} else } else
outname.on_foff = 0; outname.on_foff = 0;
outname.on_type = type; outname.on_type = type;
outname.on_desc = desc; outname.on_desc = desc;
outname.on_valu = valu & ~((0xFFFFFFFF)<<(8*sizeof(valu_t))); outname.on_valu = valu & ~((0xFFFFFFFF)<<(8*sizeof(valu_t)));
putofmt((char *)&outname, SF_NAME, PARTNAME); wr_name(&outname, 1);
}
new_common(ip)
item_t *ip;
{
register struct common_t *cp;
static nleft = 0;
static struct common_t *next;
if (--nleft < 0) {
next = (struct common_t *) sbrk(MEMINCR);
if ((int) next == -1) {
fatal("out of memory");
}
nleft += (MEMINCR / sizeof (struct common_t));
}
cp = next++;
cp->c_next = commons;
cp->c_it = ip;
commons = cp;
} }

47
mach/proto/as/comm7.c
View file

@ -19,11 +19,7 @@ register item_t *ip;
return(ip->i_valu); return(ip->i_valu);
return(ip->i_valu + sect[typ].s_base); return(ip->i_valu + sect[typ].s_base);
#else #else
#ifdef DUK
if ((ip->i_type & S_TYP) == S_UND || (ip->i_type & S_COM)) { if ((ip->i_type & S_TYP) == S_UND || (ip->i_type & S_COM)) {
#else DUK
if ((ip->i_type & S_TYP) == S_UND) {
#endif DUK
if (pass == PASS_3) { if (pass == PASS_3) {
if (relonami != 0) if (relonami != 0)
serror("relocation error"); serror("relocation error");
@ -200,6 +196,7 @@ small(fitsmall, gain)
assert(fitsmall || (*p & bit) == 0); assert(fitsmall || (*p & bit) == 0);
return(*p & bit); return(*p & bit);
} }
/*NOTREACHED*/
} }
#endif #endif
@ -229,12 +226,12 @@ char arg;
DOTSCT->s_zero = 0; DOTSCT->s_zero = 0;
break; break;
case PASS_3: case PASS_3:
AOUTPART(PARTEMIT); wr_outsect(DOTTYP-S_MIN);
while (DOTSCT->s_zero) { while (DOTSCT->s_zero) {
AOUTPUTC(0, PARTEMIT); wr_putc(0);
DOTSCT->s_zero--; DOTSCT->s_zero--;
} }
AOUTPUTC(arg, PARTEMIT); wr_putc(arg);
break; break;
} }
DOTVAL++; DOTVAL++;
@ -262,7 +259,7 @@ long arg;
emitx(val, n) emitx(val, n)
valu_t val; valu_t val;
register n; int n;
{ {
switch (n) { switch (n) {
case 1: case 1:
@ -312,7 +309,7 @@ char *s;
FILE * FILE *
fftemp(path, tail) fftemp(path, tail)
char *path; char *path, *tail;
{ {
register char *dir; register char *dir;
@ -326,36 +323,6 @@ char *path;
return(ffcreat(mktemp(path))); return(ffcreat(mktemp(path)));
} }
putofmt(p, s, part)
register char *p;
register char *s;
{
register i;
register long l;
AOUTPART(part);
while (i = *s++) {
switch (i -= '0') {
/* case 0: p++; break; */
case 1:
l = (long) *((char *)p); p += sizeof(char );
break;
case 2:
l = (long) *((short *)p); p += sizeof(short);
break;
case 4:
l = (long) *((long *)p); p += sizeof(long );
break;
default:
assert(0);
}
while (--i >= 0) {
AOUTPUTC((int)l, part);
l >>= 8;
}
}
}
/* ---------- Error handling ---------- */ /* ---------- Error handling ---------- */
yyerror(){} /* we will do our own error printing */ yyerror(){} /* we will do our own error printing */
@ -365,7 +332,7 @@ nosect()
fatal("no sections"); fatal("no sections");
} }
werror() wr_fatal()
{ {
fatal("write error"); fatal("write error");
} }