summaryrefslogtreecommitdiff
path: root/src/cmd/6l/list.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd/6l/list.c')
-rw-r--r--src/cmd/6l/list.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/cmd/6l/list.c b/src/cmd/6l/list.c
index 5040e4327..4a7b0d04a 100644
--- a/src/cmd/6l/list.c
+++ b/src/cmd/6l/list.c
@@ -58,21 +58,21 @@ Pconv(Fmt *fp)
case ATEXT:
if(p->from.scale) {
fmtprint(fp, "(%d) %A %D,%d,%lD",
- p->line, p->as, &p->from, p->from.scale, &p->to);
+ p->lineno, p->as, &p->from, p->from.scale, &p->to);
break;
}
fmtprint(fp, "(%d) %A %D,%lD",
- p->line, p->as, &p->from, &p->to);
+ p->lineno, p->as, &p->from, &p->to);
break;
default:
fmtprint(fp, "(%d) %A %D,%D",
- p->line, p->as, &p->from, &p->to);
+ p->lineno, p->as, &p->from, &p->to);
break;
case ADATA:
case AINIT_:
case ADYNT_:
fmtprint(fp, "(%d) %A %D/%d,%D",
- p->line, p->as, &p->from, p->from.scale, &p->to);
+ p->lineno, p->as, &p->from, p->from.scale, &p->to);
break;
}
bigP = P;
@@ -85,17 +85,17 @@ Aconv(Fmt *fp)
int i;
i = va_arg(fp->args, int);
- return fmtstrcpy(fp, anames[i]);
+ return fmtstrcpy(fp, anames6[i]);
}
int
Dconv(Fmt *fp)
{
char str[STRINGSZ], s[STRINGSZ];
- Adr *a;
+ Addr *a;
int i;
- a = va_arg(fp->args, Adr*);
+ a = va_arg(fp->args, Addr*);
i = a->type;
if(fp->flags & FmtLong) {
@@ -182,11 +182,11 @@ Dconv(Fmt *fp)
break;
case D_FCONST:
- snprint(str, sizeof(str), "$(%.8ux,%.8ux)", a->ieee.h, a->ieee.l);
+ snprint(str, sizeof(str), "$(%.17g)", a->u.dval);
break;
case D_SCONST:
- snprint(str, sizeof(str), "$\"%S\"", a->scon);
+ snprint(str, sizeof(str), "$\"%S\"", a->u.sval);
break;
case D_ADDR:
@@ -431,8 +431,8 @@ diag(char *fmt, ...)
tn = "";
sep = "";
- if(cursym != S) {
- tn = cursym->name;
+ if(ctxt->cursym != S) {
+ tn = ctxt->cursym->name;
sep = ": ";
}
va_start(arg, fmt);