xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
aiju 2020-01-10 18:49:39 +00:00
commit 9ab87f6241
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/src/cmd/dtracy/act.c
View file

@ -192,7 +192,8 @@ prepprintf(Node **arg, int narg, DTActGr *g, int *recoff)
goto again;
case 'x': case 'X': case 'o': case 'b': case 'd':
if(n >= narg) sysfatal("printf() too few arguments");
if(arg[n]->typ->type != TYPINT) sysfatal("print() %%%c with non-integer", *fmt);
if(arg[n]->typ->type != TYPINT)
sysfatal("%d: print() %%%c with non-integer", arg[n]->line, *fmt);
arg[n] = tracegen(arg[n], g, recoff);
n++;
fmtrune(&f, 'l');
@ -201,7 +202,8 @@ prepprintf(Node **arg, int narg, DTActGr *g, int *recoff)
break;
case 's':
if(n >= narg) sysfatal("printf() too few arguments");
if(arg[n]->typ->type != TYPSTRING) sysfatal("print() %%s with non-string");
if(arg[n]->typ->type != TYPSTRING)
sysfatal("%d: print() %%s with non-string", arg[n]->line);
arg[n] = tracegen(arg[n], g, recoff);
n++;
fmtrune(&f, *fmt);

1
sys/src/cmd/dtracy/dat.h
View file

@ -75,6 +75,7 @@ struct Node {
Symbol *sym;
char *str;
s64int num;
int line;
/* used by elidecasts() */
char databits;

1
sys/src/cmd/dtracy/lex.c
View file

@ -239,6 +239,7 @@ node(int type, ...)
n = emalloc(sizeof(Node));
n->type = type;
n->line = lineno;
va_start(va, type);
switch(type){
case OBIN: