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

Clang-format before editing.

Browse source
This commit is contained in:
David Given 2018-09-10 22:37:04 +02:00
parent 6275896a11
commit 976fa0efca
1 changed files with 179 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,8 +14,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <object.h> #include <object.h>
valu_t valu_t load(const item_t* ip)
load(const item_t *ip)
{ {
#ifdef ASLD #ifdef ASLD
int typ; int typ;
@ -25,8 +24,10 @@ load(const 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
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))
if (pass == PASS_3) { {
if (pass == PASS_3)
{
if (relonami != 0) if (relonami != 0)
serror("relocation error (relonami=%d, type=%08x)", relonami, ip->i_type); serror("relocation error (relonami=%d, type=%08x)", relonami, ip->i_type);
relonami = ip->i_valu + 1; relonami = ip->i_valu + 1;
@ -37,8 +38,7 @@ load(const item_t *ip)
#endif #endif
} }
int int store(item_t* ip, valu_t val)
store(item_t *ip, valu_t val)
{ {
#ifdef ASLD #ifdef ASLD
int typ; int typ;
@ -55,8 +55,7 @@ store(item_t *ip, valu_t val)
return (1); return (1);
} }
char * char* remember(char* s)
remember(char *s)
{ {
char* p; char* p;
int n; int n;
@ -68,7 +67,8 @@ remember(char *s)
do do
n++; n++;
while (*p++); while (*p++);
if ((nleft -= n) < 0) { if ((nleft -= n) < 0)
{
next = malloc(MEMINCR); next = malloc(MEMINCR);
if (next == 0) if (next == 0)
fatal("out of memory"); fatal("out of memory");
@ -83,10 +83,10 @@ remember(char *s)
return (s); return (s);
} }
int int combine(int typ1, int typ2, int op)
combine(int typ1, int typ2, int op) {
switch (op)
{ {
switch (op) {
case '+': case '+':
if (typ1 == S_ABS) if (typ1 == S_ABS)
return (typ2); return (typ2);
@ -102,11 +102,8 @@ combine(int typ1, int typ2, int op)
case '>': case '>':
if (typ1 == S_ABS && typ2 == S_ABS) if (typ1 == S_ABS && typ2 == S_ABS)
return (S_ABS); return (S_ABS);
if ( if (((typ1 & ~S_DOT) == (typ2 & ~S_DOT) && typ1 != S_UND) || (typ1 == S_ABS)
((typ1 & ~S_DOT) == (typ2 & ~S_DOT) && typ1 != S_UND) || (typ2 == S_ABS))
|| (typ1 == S_ABS)
|| (typ2 == S_ABS)
)
return (S_ABS | S_VAR); return (S_ABS | S_VAR);
break; break;
default: default:
@ -120,44 +117,49 @@ combine(int typ1, int typ2, int op)
} }
#ifdef LISTING #ifdef LISTING
int int printx(int ndig, valu_t val)
printx(int ndig, valu_t val)
{ {
static char buf[8]; static char buf[8];
char* p; char* p;
int c, n; int c, n;
p = buf; n = ndig; p = buf;
do { n = ndig;
do
{
*p++ = (int)val & 017; *p++ = (int)val & 017;
val >>= 4; val >>= 4;
} while (--n); } while (--n);
do { do
{
c = "0123456789ABCDEF"[*--p]; c = "0123456789ABCDEF"[*--p];
putchar(c); putchar(c);
} while (p > buf); } while (p > buf);
return (ndig); return (ndig);
} }
void void listline(int textline)
listline(int textline)
{ {
int c; int c;
if ((listflag & 4) && (c = getc(listfile)) != '\n' && textline) { if ((listflag & 4) && (c = getc(listfile)) != '\n' && textline)
{
if (listcolm >= 24) if (listcolm >= 24)
printf(" \\\n\t\t\t"); printf(" \\\n\t\t\t");
else else
do { do
{
putchar('\t'); putchar('\t');
listcolm += 8; listcolm += 8;
} while (listcolm < 24); } while (listcolm < 24);
do { do
{
assert(c != EOF); assert(c != EOF);
putchar(c); putchar(c);
} while ((c = getc(listfile)) != '\n'); } while ((c = getc(listfile)) != '\n');
} }
if (listflag & 7) { if (listflag & 7)
{
putchar('\n'); putchar('\n');
fflush(stdout); fflush(stdout);
} }
@ -173,8 +175,7 @@ listline(int textline)
#define PBITTABSZ 128 #define PBITTABSZ 128
static char* pbittab[PBITTABSZ]; static char* pbittab[PBITTABSZ];
int int small(int fitsmall, int gain)
small(int fitsmall, int gain)
{ {
int bit; int bit;
char* p; char* p;
@ -183,22 +184,28 @@ small(int fitsmall, int gain)
nosect(); nosect();
if (bflag) if (bflag)
return (0); return (0);
if (nbits == BITCHUNK) { if (nbits == BITCHUNK)
{
bitindex++; bitindex++;
nbits = 0; nbits = 0;
if (bitindex == PBITTABSZ) { if (bitindex == PBITTABSZ)
{
static int w_given; static int w_given;
if (pass == PASS_1 && ! w_given) { if (pass == PASS_1 && !w_given)
{
w_given = 1; w_given = 1;
warning("bit table overflow"); warning("bit table overflow");
} }
return (0); return (0);
} }
if (pbittab[bitindex] == 0 && pass == PASS_1) { if (pbittab[bitindex] == 0 && pass == PASS_1)
if ((pbittab[bitindex] = calloc(MEMINCR, 1)) == 0) { {
if ((pbittab[bitindex] = calloc(MEMINCR, 1)) == 0)
{
static int w2_given; static int w2_given;
if (!w2_given) { if (!w2_given)
{
w2_given = 1; w2_given = 1;
warning("out of space for bit table"); warning("out of space for bit table");
} }
@ -210,11 +217,13 @@ small(int fitsmall, int gain)
bit = 1 << (nbits & 7); bit = 1 << (nbits & 7);
p = pbittab[bitindex] + (nbits >> 3); p = pbittab[bitindex] + (nbits >> 3);
nbits++; nbits++;
switch (pass) { switch (pass)
{
case PASS_1: case PASS_1:
return (0); return (0);
case PASS_2: case PASS_2:
if (fitsmall) { if (fitsmall)
{
DOTGAIN += gain; DOTGAIN += gain;
*p |= bit; *p |= bit;
} }
@ -229,13 +238,14 @@ small(int fitsmall, int gain)
/* ---------- output ---------- */ /* ---------- output ---------- */
void void emit1(int arg)
emit1(int arg)
{ {
static int olddottyp = -1; static int olddottyp = -1;
#ifdef LISTING #ifdef LISTING
if (listeoln) { if (listeoln)
if (listflag & 1) { {
if (listflag & 1)
{
listcolm += printx(VALWIDTH, (valu_t)DOTVAL); listcolm += printx(VALWIDTH, (valu_t)DOTVAL);
listcolm++; listcolm++;
putchar(' '); putchar(' ');
@ -245,7 +255,8 @@ emit1(int arg)
if (listflag & 2) if (listflag & 2)
listcolm += printx(2, (valu_t)arg); listcolm += printx(2, (valu_t)arg);
#endif #endif
switch (pass) { switch (pass)
{
case PASS_1: case PASS_1:
if (DOTSCT == NULL) if (DOTSCT == NULL)
nosect(); nosect();
@ -254,11 +265,13 @@ emit1(int arg)
DOTSCT->s_zero = 0; DOTSCT->s_zero = 0;
break; break;
case PASS_3: case PASS_3:
if (DOTTYP != olddottyp) { if (DOTTYP != olddottyp)
{
wr_outsect(DOTTYP - S_MIN); wr_outsect(DOTTYP - S_MIN);
olddottyp = DOTTYP; olddottyp = DOTTYP;
} }
while (DOTSCT->s_zero) { while (DOTSCT->s_zero)
{
wr_putc(0); wr_putc(0);
DOTSCT->s_zero--; DOTSCT->s_zero--;
} }
@ -268,44 +281,51 @@ emit1(int arg)
DOTVAL++; DOTVAL++;
} }
void void emit2(int arg)
emit2(int arg)
{ {
#ifdef BYTES_REVERSED #ifdef BYTES_REVERSED
emit1((arg>>8)); emit1(arg); emit1((arg >> 8));
emit1(arg);
#else #else
emit1(arg); emit1((arg>>8)); emit1(arg);
emit1((arg >> 8));
#endif #endif
} }
void void emit4(long arg)
emit4(long arg)
{ {
#ifdef WORDS_REVERSED #ifdef WORDS_REVERSED
emit2((int)(arg>>16)); emit2((int)(arg)); emit2((int)(arg >> 16));
emit2((int)(arg));
#else #else
emit2((int)(arg)); emit2((int)(arg>>16)); emit2((int)(arg));
emit2((int)(arg >> 16));
#endif #endif
} }
void void emitx(valu_t val, int n)
emitx(valu_t val, int n) {
switch (n)
{ {
switch (n) {
case RELO1: case RELO1:
emit1((int)val); break; emit1((int)val);
break;
case RELO2: case RELO2:
#ifdef BYTES_REVERSED #ifdef BYTES_REVERSED
emit1(((int)val>>8)); emit1((int)val); emit1(((int)val >> 8));
emit1((int)val);
#else #else
emit1((int)val); emit1(((int)val>>8)); emit1((int)val);
emit1(((int)val >> 8));
#endif #endif
break; break;
case RELO4: case RELO4:
#ifdef WORDS_REVERSED #ifdef WORDS_REVERSED
emit2((int)(val>>16)); emit2((int)(val)); emit2((int)(val >> 16));
emit2((int)(val));
#else #else
emit2((int)(val)); emit2((int)(val>>16)); emit2((int)(val));
emit2((int)(val >> 16));
#endif #endif
break; break;
default: default:
@ -313,8 +333,7 @@ emitx(valu_t val, int n)
} }
} }
void void emitstr(int zero)
emitstr(int zero)
{ {
int i; int i;
char* p; char* p;
@ -329,15 +348,13 @@ emitstr(int zero)
/* ---------- Error checked file I/O ---------- */ /* ---------- Error checked file I/O ---------- */
void void ffreopen(char* s, FILE* f)
ffreopen(char *s, FILE *f)
{ {
if (freopen(s, "r", f) == NULL) if (freopen(s, "r", f) == NULL)
fatal("can't reopen %s", s); fatal("can't reopen %s", s);
} }
FILE * FILE* ffcreat(char* s)
ffcreat(char *s)
{ {
FILE* f; FILE* f;
@ -351,8 +368,7 @@ ffcreat(char *s)
#endif #endif
char* tmp_dir = TMPDIR; char* tmp_dir = TMPDIR;
FILE * FILE* fftemp(char* path, char* tail)
fftemp(char *path, char *tail)
{ {
char* dir; char* dir;
@ -366,18 +382,16 @@ fftemp(char *path, char *tail)
/* ---------- Error handling ---------- */ /* ---------- Error handling ---------- */
/* ARGSUSED */ /* ARGSUSED */
void void yyerror(const char* message)
yyerror(const char *message) {
{} /* we will do our own error printing */ } /* we will do our own error printing */
void void nosect(void)
nosect(void)
{ {
fatal("no sections"); fatal("no sections");
} }
void void wr_fatal(void)
wr_fatal(void)
{ {
fatal("write error"); fatal("write error");
} }
@ -432,8 +446,7 @@ void warning(const char* s, ...)
va_end(ap); va_end(ap);
} }
void void nofit(void)
nofit(void)
{ {
if (pass == PASS_3) if (pass == PASS_3)
warning("too big"); warning("too big");