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

64-bit-ify (adhoc varargs are evil).

Browse source
This commit is contained in:
David Given 2015-03-23 00:07:59 +01:00
parent 3d5e72e20b
commit c5018d7088
3 changed files with 43 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,3 +265,4 @@ typedef struct sect_t sect_t;
#endif
extern FILE *fopen(); /* some systems don't have this in stdio.h */

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

@ -116,6 +116,10 @@ extern valu_t load();
extern FILE *ffcreat();
extern FILE *fftemp();
extern void fatal(const char* s, ...);
extern void serror(const char* s, ...);
extern void warning(const char* s, ...);
/* ========== Machine dependent C declarations ========== */
#include "mach1.c"

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

@ -11,6 +11,7 @@
#include "comm0.h"
#include "comm1.h"
#include "y.tab.h"
#include <stdarg.h>
valu_t
load(ip)
@ -27,7 +28,7 @@ register item_t *ip;
if ((ip->i_type & S_TYP) == S_UND || (ip->i_type & S_COM)) {
if (pass == PASS_3) {
if (relonami != 0)
serror("relocation error");
serror("relocation error (relonami=%d, type=%08x)", relonami, ip->i_type);
relonami = ip->i_valu+1;
}
return(0);
@ -380,13 +381,28 @@ wr_fatal()
fatal("write error");
}
/* VARARGS1 */
fatal(s, a1, a2, a3, a4)
char *s;
void diag(const char* tail, const char* s, va_list ap)
{
fflush(stdout);
if (modulename)
fprintf(stderr, "\"%s\", line %ld: ", modulename, lineno);
else
fprintf(stderr, "%s: ", progname);
vfprintf(stderr, s, ap);
fprintf(stderr, "%s", tail);
}
/* VARARGS1 */
void fatal(const char* s, ...)
{
va_list ap;
va_start(ap, s);
nerrors++;
diag(" (fatal)\n", s, a1, a2, a3, a4);
diag(" (fatal)\n", s, ap);
stop();
va_end(ap);
}
#if DEBUG == 2
@ -400,37 +416,34 @@ char *file;
#if DEBUG == 1
assert1()
{
diag(" (fatal)\n", "assertion failed");
fatal("assertion failed");
abort();
}
#endif
/* VARARGS1 */
serror(s, a1, a2, a3, a4)
char *s;
void serror(const char* s, ...)
{
va_list ap;
va_start(ap, s);
nerrors++;
diag("\n", s, a1, a2, a3, a4);
diag("\n", s, ap);
stop();
va_end(ap);
}
/* VARARGS1 */
warning(s, a1, a2, a3, a4)
char *s;
void warning(const char* s, ...)
{
diag(" (warning)\n", s, a1, a2, a3, a4);
}
va_list ap;
va_start(ap, s);
/* VARARGS1 */
diag(tail, s, a1, a2, a3, a4)
char *tail, *s;
{
fflush(stdout);
if (modulename)
fprintf(stderr, "\"%s\", line %ld: ", modulename, lineno);
else
fprintf(stderr, "%s: ", progname);
fprintf(stderr, s, a1, a2, a3, a4);
fprintf(stderr, tail);
nerrors++;
diag(" (warning)\n", s, ap);
stop();
va_end(ap);
}
nofit()