summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2017-11-28 00:55:30 +0000
committeremaste <emaste@FreeBSD.org>2017-11-28 00:55:30 +0000
commitcbf712b3a69d887467391715ae1079a47dbf6f39 (patch)
tree267b678d593b632c634030e03a53ac1c0c490671
parentbd386e6ea5942eb65e2b2cf040fc665d66420790 (diff)
downloadFreeBSD-src-cbf712b3a69d887467391715ae1079a47dbf6f39.zip
FreeBSD-src-cbf712b3a69d887467391715ae1079a47dbf6f39.tar.gz
MFC r325042: libdtrace: replace "DOODAD" with more descriptive string
Previously some unimplemented libdtrace routines printed the function, file and line number, followed by "DOODAD." That is not particularly informative, so replace it with a message reporting the actual issue. Sponsored by: The FreeBSD Foundation
-rw-r--r--cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c24
-rw-r--r--cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c3
2 files changed, 18 insertions, 9 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
index f13e107..c8c543d 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
@@ -229,10 +229,12 @@ prepare_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf32_t *dep)
for (j = 0; j < nrel; j++) {
#if defined(__aarch64__)
/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): aarch64 not implemented\n",
+ __FUNCTION__, __FILE__, __LINE__);
#elif defined(__arm__)
/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): arm not implemented\n",
+ __FUNCTION__, __FILE__, __LINE__);
#elif defined(__i386) || defined(__amd64)
rel->r_offset = s->dofs_offset +
dofr[j].dofr_offset;
@@ -240,7 +242,8 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
R_386_32);
#elif defined(__mips__)
/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): MIPS not implemented\n",
+ __FUNCTION__, __FILE__, __LINE__);
#elif defined(__powerpc__)
/*
* Add 4 bytes to hit the low half of this 64-bit
@@ -252,7 +255,8 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
R_PPC_REL32);
#elif defined(__riscv__)
/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): RISC-V not implemented\n",
+ __FUNCTION__, __FILE__, __LINE__);
#elif defined(__sparc)
/*
* Add 4 bytes to hit the low half of this 64-bit
@@ -838,7 +842,8 @@ static int
dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
uint32_t *off)
{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): aarch64 not implemented\n", __FUNCTION__, __FILE__,
+ __LINE__);
return (0);
}
#elif defined(__arm__)
@@ -847,7 +852,8 @@ static int
dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
uint32_t *off)
{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): arm not implemented\n", __FUNCTION__, __FILE__,
+ __LINE__);
return (0);
}
#elif defined(__mips__)
@@ -856,7 +862,8 @@ static int
dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
uint32_t *off)
{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): MIPS not implemented\n", __FUNCTION__, __FILE__,
+ __LINE__);
return (0);
}
#elif defined(__powerpc__)
@@ -946,7 +953,8 @@ static int
dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
uint32_t *off)
{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): RISC-V implementation required\n", __FUNCTION__,
+ __FILE__, __LINE__);
return (0);
}
#elif defined(__sparc)
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
index 79c1871..9215b43 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
@@ -426,7 +426,8 @@ dt_proc_attach(dt_proc_t *dpr, int exec)
static void
dt_proc_waitrun(dt_proc_t *dpr)
{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): not implemented\n", __FUNCTION__, __FILE__,
+ __LINE__);
#ifdef DOODAD
struct ps_prochandle *P = dpr->dpr_proc;
const lwpstatus_t *psp = &Pstatus(P)->pr_lwp;
OpenPOWER on IntegriCloud