summaryrefslogtreecommitdiff
path: root/usr/src/common/dis
diff options
context:
space:
mode:
authordmick <none@none>2007-03-23 19:23:04 -0700
committerdmick <none@none>2007-03-23 19:23:04 -0700
commite007031558dddc1a7f3593d9457d99bde738653e (patch)
tree352e144c7e4fcb1b53468827dcfd950977cc0027 /usr/src/common/dis
parentaf48bdb315becc10c7a7725af8416f9112363057 (diff)
downloadillumos-gate-e007031558dddc1a7f3593d9457d99bde738653e.tar.gz
6448268 dis: 6427698 introduced a bunch of meaningless spew when disassembling .o files
Diffstat (limited to 'usr/src/common/dis')
-rw-r--r--usr/src/common/dis/i386/dis_tables.c6
-rw-r--r--usr/src/common/dis/i386/dis_tables.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/common/dis/i386/dis_tables.c b/usr/src/common/dis/i386/dis_tables.c
index c4384f2681..673921c080 100644
--- a/usr/src/common/dis/i386/dis_tables.c
+++ b/usr/src/common/dis/i386/dis_tables.c
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -3263,8 +3263,8 @@ dtrace_disx86_str(dis86_t *dis, uint_t mode, uint64_t pc, char *buf,
lookup = dis->d86_sym_lookup;
if (tgt != 0) {
- /* Print symbol, if found, for tgt */
- if (lookup(dis->d86_data, tgt, NULL, 0) == 0) {
+ if ((dis->d86_flags & DIS_F_NOIMMSYM) == 0 &&
+ lookup(dis->d86_data, tgt, NULL, 0) == 0) {
(void) strlcat(buf, "\t<", buflen);
curlen = strlen(buf);
lookup(dis->d86_data, tgt, buf + curlen,
diff --git a/usr/src/common/dis/i386/dis_tables.h b/usr/src/common/dis/i386/dis_tables.h
index 70aceec139..05b404f88c 100644
--- a/usr/src/common/dis/i386/dis_tables.h
+++ b/usr/src/common/dis/i386/dis_tables.h
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -96,6 +96,7 @@ typedef struct dis86 {
extern int dtrace_disx86(dis86_t *x, uint_t cpu_mode);
#define DIS_F_OCTAL 0x1 /* Print all numbers in octal */
+#define DIS_F_NOIMMSYM 0x2 /* Don't print symbols for immediates (.o) */
#ifdef DIS_TEXT
extern void dtrace_disx86_str(dis86_t *x, uint_t cpu_mode, uint64_t pc,