[DTrace-devel] [PATCH 5/7] Add listing mode numbers to disassembly headers

[eugene.loh at oracle.com]

From: Eugene Loh <eugene.loh at oracle.com>

These simple numbers help remind readers of the ordering of phases
and improve the correspondence between printed headers and the
numerical values specified with -xdisasm.

Signed-off-by: Eugene Loh <eugene.loh at oracle.com>
---
 libdtrace/dt_dis.c | 10 +++++-----
 libdtrace/dt_dis.h |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libdtrace/dt_dis.c b/libdtrace/dt_dis.c
index 9edff058..1be8bb51 100644
--- a/libdtrace/dt_dis.c
+++ b/libdtrace/dt_dis.c
@@ -674,15 +674,15 @@ dt_dis_difo(const dtrace_difo_t *dp, FILE *fp, const dt_ident_t *idp,
 	char		type[DT_TYPE_NAMELEN];
 
 	if (pdp != NULL && idp != NULL)
-		fprintf(fp, "\nDisassembly of %s %s:%s:%s:%s, <%s>:\n", ltype,
+		fprintf(fp, "\nDisassembly %s %s:%s:%s:%s, <%s>:\n", ltype,
 			pdp->prv, pdp->mod, pdp->fun, pdp->prb, idp->di_name);
 	else if (pdp != NULL)
-		fprintf(fp, "\nDisassembly of %s %s:%s:%s:%s:\n", ltype,
+		fprintf(fp, "\nDisassembly %s %s:%s:%s:%s:\n", ltype,
 			pdp->prv, pdp->mod, pdp->fun, pdp->prb);
 	else if (idp != NULL)
-		fprintf(fp, "\nDisassembly of %s <%s>:\n", ltype, idp->di_name);
+		fprintf(fp, "\nDisassembly %s <%s>:\n", ltype, idp->di_name);
 	else
-		fprintf(fp, "\nDisassembly of %s:\n", ltype);
+		fprintf(fp, "\nDisassembly %s:\n", ltype);
 
 	fprintf(fp, "%-4s %-5s  %-20s    %s\n",
 	    "INS", "OFF", "OPCODE", "INSTRUCTION");
@@ -828,7 +828,7 @@ dt_dis_stmts(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, dtrace_stmtdesc_t *sdp,
 	}
 
 	dt_dis_difo(dt_dlib_get_func_difo(dtp, sdp->dtsd_clause), d->fp,
-		    sdp->dtsd_clause, pdp, "clause");
+		    sdp->dtsd_clause, pdp, "(#1) clause");
 
 	return 0;
 }
diff --git a/libdtrace/dt_dis.h b/libdtrace/dt_dis.h
index 4fabd68c..1d3ba7ac 100644
--- a/libdtrace/dt_dis.h
+++ b/libdtrace/dt_dis.h
@@ -41,21 +41,21 @@ extern "C" {
 	do { \
 		if (((cflags) & DTRACE_C_DIFV) && \
 		    ((dtp)->dt_disasm & DT_DISASM_OPT_PROG)) \
-			dt_dis_difo((dp), (fp), (idp), (pdp), "program"); \
+			dt_dis_difo((dp), (fp), (idp), (pdp), "(#2) program"); \
 	} while(0)
 #define DT_DISASM_PROG_LINKED(dtp, cflags, dp, fp, idp, pdp) \
 	do { \
 		if (((cflags) & DTRACE_C_DIFV) && \
 		    ((dtp)->dt_disasm & DT_DISASM_OPT_PROG_LINKED)) \
 			dt_dis_difo((dp), (fp), (idp), (pdp), \
-				    "linked program"); \
+				    "(#3) linked program"); \
 	} while(0)
 #define DT_DISASM_PROG_FINAL(dtp, cflags, dp, fp, idp, pdp) \
 	do { \
 		if (((cflags) & DTRACE_C_DIFV) && \
 		    ((dtp)->dt_disasm & DT_DISASM_OPT_PROG_FINAL)) \
 			dt_dis_difo((dp), (fp), (idp), (pdp), \
-				    "final program"); \
+				    "(#4) final program"); \
 	} while(0)
 
 extern void dt_dis_insn(uint_t i, const struct bpf_insn *instr, FILE *fp);
-- 
2.18.4