[DTrace-devel] [PATCH 2/7] Set the disasm default symbolically

[Kris Van Hees]

On Thu, Jun 24, 2021 at 09:42:42PM -0400, eugene.loh at oracle.com wrote:
> From: Eugene Loh <eugene.loh at oracle.com>
> 
> Signed-off-by: Eugene Loh <eugene.loh at oracle.com>

Signed-off-by: Eugene Loh <eugene.loh at oracle.com>
Reviewed-by: Eugene Loh <eugene.loh at oracle.com>

I added my own signed off because I modified the patch to define a new symbol
(DT_DISAM_OPT_DEFAULT) that is set to DT_DISASM_OPT_CLAUSE, and is used to
populate the dt_disasm value.

... I will add this to 'dev'

> ---
>  libdtrace/dt_dis.h  | 2 +-
>  libdtrace/dt_open.c | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/libdtrace/dt_dis.h b/libdtrace/dt_dis.h
> index deedc85f..62b42016 100644
> --- a/libdtrace/dt_dis.h
> +++ b/libdtrace/dt_dis.h
> @@ -18,7 +18,7 @@ extern "C" {
>   * The following disassembler listings can be requested.  The values can be
>   * combined to select multiple listings.
>   */
> -#define DT_DISASM_OPT_CLAUSE		1	/* default */
> +#define DT_DISASM_OPT_CLAUSE		1
>  #define DT_DISASM_OPT_PROG		2
>  #define DT_DISASM_OPT_PROG_LINKED	4
>  #define DT_DISASM_OPT_PROG_FINAL	8
> diff --git a/libdtrace/dt_open.c b/libdtrace/dt_open.c
> index 5908920d..7d8127e9 100644
> --- a/libdtrace/dt_open.c
> +++ b/libdtrace/dt_open.c
> @@ -36,6 +36,7 @@
>  #include <dt_string.h>
>  #include <dt_provider.h>
>  #include <dt_probe.h>
> +#include <dt_dis.h>
>  #include <dt_peb.h>
>  
>  const dt_version_t _dtrace_versions[] = {
> @@ -728,7 +729,7 @@ dt_vopen(int version, int flags, int *errp,
>  	dtp->dt_linktype = DT_LTYP_ELF;
>  	dtp->dt_xlatemode = DT_XL_STATIC;
>  	dtp->dt_stdcmode = DT_STDC_XA;
> -	dtp->dt_disasm = 1;
> +	dtp->dt_disasm = DT_DISASM_OPT_CLAUSE;
>  	dtp->dt_version = version;
>  	dtp->dt_cdefs_fd = -1;
>  	dtp->dt_ddefs_fd = -1;
> -- 
> 2.18.4
> 
> 
> _______________________________________________
> DTrace-devel mailing list
> DTrace-devel at oss.oracle.com
> https://oss.oracle.com/mailman/listinfo/dtrace-devel