summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Sickel <jas@corpus-callosum.com>2014-01-22 06:23:19 +0100
committerJeff Sickel <jas@corpus-callosum.com>2014-01-22 06:23:19 +0100
commit811b1f35bd1b0b4f00c349b3ced94bba1fe69030 (patch)
treea4bcc695ad9c94e52ae8da068db693a3341104ab
parent0a22820ae2027c2f491331e3ea94081eef6701a6 (diff)
downloadgo-811b1f35bd1b0b4f00c349b3ced94bba1fe69030.tar.gz
liblink: include missing pragmas for plan9 formatter
R=rsc, r, 0intro CC=golang-codereviews https://codereview.appspot.com/36060047 Committer: David du Colombier <0intro@gmail.com>
-rw-r--r--include/plan9/link.h12
-rw-r--r--src/liblink/list5.c10
2 files changed, 17 insertions, 5 deletions
diff --git a/include/plan9/link.h b/include/plan9/link.h
index f65971efc..b49926027 100644
--- a/include/plan9/link.h
+++ b/include/plan9/link.h
@@ -3,3 +3,15 @@
// license that can be found in the LICENSE file.
#include "../link.h"
+
+#pragma varargck type "@" Addr*
+#pragma varargck type "A" int
+#pragma varargck type "$" char*
+#pragma varargck type "D" Addr*
+#pragma varargck type "lD" Addr*
+#pragma varargck type "L" int
+#pragma varargck type "lS" LSym*
+#pragma varargck type "M" Addr*
+#pragma varargck type "P" Prog*
+#pragma varargck type "R" int
+#pragma varargck type "S" char*
diff --git a/src/liblink/list5.c b/src/liblink/list5.c
index ec954f646..69650e5ff 100644
--- a/src/liblink/list5.c
+++ b/src/liblink/list5.c
@@ -43,7 +43,7 @@ static int Aconv(Fmt *fp);
static int Dconv(Fmt *fp);
static int Mconv(Fmt *fp);
static int Pconv(Fmt *fp);
-static int Rconv(Fmt *fp);
+static int RAconv(Fmt *fp);
static int DSconv(Fmt *fp);
void
@@ -54,7 +54,7 @@ listinit5(void)
fmtinstall('$', DSconv);
fmtinstall('M', Mconv);
fmtinstall('D', Dconv);
- fmtinstall('R', Rconv);
+ fmtinstall('@', RAconv);
}
static char *extra [] = {
@@ -85,10 +85,10 @@ Pconv(Fmt *fp)
strcat(sc, ".U");
if(a == AMOVM) {
if(p->from.type == D_CONST)
- sprint(str, " %A%s %R,%D", a, sc, &p->from, &p->to);
+ sprint(str, " %A%s %@,%D", a, sc, &p->from, &p->to);
else
if(p->to.type == D_CONST)
- sprint(str, " %A%s %D,%R", a, sc, &p->from, &p->to);
+ sprint(str, " %A%s %D,%@", a, sc, &p->from, &p->to);
else
sprint(str, " %A%s %D,%D", a, sc, &p->from, &p->to);
} else
@@ -210,7 +210,7 @@ Dconv(Fmt *fp)
}
static int
-Rconv(Fmt *fp)
+RAconv(Fmt *fp)
{
char str[STRINGSZ];
Addr *a;