code review 9223046: cmd/5l, cmd/6l, cmd/8l, cmd/gc, runtime: generate and u...

src/cmd/6l/obj.c

Index: src/cmd/6l/obj.c
===================================================================
--- a/src/cmd/6l/obj.c
+++ b/src/cmd/6l/obj.c
@@ -616,6 +616,38 @@
 		pc++;
 		goto loop;
 
+	case ANPTRS:
+		if(skip)
+			goto casdef;
+		if(cursym->nptrs != -1) {
+			diag("ldobj1: multiple pointer maps defined for %s", cursym->name);
+			errorexit();
+		}
+		if(p->to.offset > cursym->args/PtrSize) {
+			diag("ldobj1: pointer map definition for %s exceeds its argument size", cursym->name);
+			errorexit();
+		}
+		cursym->nptrs = p->to.offset;
+		if(cursym->nptrs != 0)
+			cursym->ptrs = mal((rnd(cursym->nptrs, 32) / 32) * sizeof(*cursym->ptrs));
+		pc++;
+		goto loop;
+
+	case APTRS:
+		if(skip)
+			goto casdef;
+		if(cursym->nptrs == -1 || cursym->ptrs == NULL) {
+			diag("ldobj1: pointer map data provided for %s without a definition", cursym->name);
+			errorexit();
+		}
+		if(p->from.offset*32 >= rnd(cursym->nptrs, 32)) {
+			diag("ldobj1: excessive pointer map data provided for %s", cursym->name);
+			errorexit();
+		}
+		cursym->ptrs[p->from.offset] = p->to.offset;
+		pc++;
+		goto loop;
+
 	case ATEXT:
 		s = p->from.sym;
 		if(s->text != nil) {
@@ -660,6 +692,7 @@
 		s->type = STEXT;
 		s->value = pc;
 		s->args = p->to.offset >> 32;
+		s->nptrs = -1;
 		lastp = p;
 		p->pc = pc++;
 		goto loop;