PSARC 2005/673 dis(1) options and libdisasm.so.1

5034117 disassembler needs work
6237338 dis picks symbols inconsistently
6241243 disassembler options need to be updated post-1990
6241251 'dis -[Dd]' needs some surgery
6241264 need to move disassembler into a library
6294758 cafe sgs demangler should be torched

--HG--
rename : usr/src/cmd/mdb/intel/mdb/bits.c => deleted_files/usr/src/cmd/mdb/intel/mdb/bits.c
rename : usr/src/cmd/mdb/intel/mdb/dis.h => deleted_files/usr/src/cmd/mdb/intel/mdb/dis.h
rename : usr/src/cmd/mdb/intel/mdb/inteldis.c => deleted_files/usr/src/cmd/mdb/intel/mdb/inteldis.c
rename : usr/src/cmd/sgs/sgsdemangler/common/cafe_dem.h => deleted_files/usr/src/cmd/sgs/sgsdemangler/common/cafe_dem.h
rename : usr/src/cmd/sgs/sgsdemangler/common/cafe_dem.y => deleted_files/usr/src/cmd/sgs/sgsdemangler/common/cafe_dem.y
rename : usr/src/cmd/sgs/sgsdemangler/common/dem.c => deleted_files/usr/src/cmd/sgs/sgsdemangler/common/dem.c
rename : usr/src/cmd/sgs/sgsdemangler/common/dem.h => deleted_files/usr/src/cmd/sgs/sgsdemangler/common/dem.h

5 files changed, 292 insertions, 0 deletions

diff --git a/usr/src/lib/libdisasm/common/libdisasm.c b/usr/src/lib/libdisasm/common/libdisasm.c
new file mode 100644
index 0000000000..197c2c34df
--- /dev/null
+++ b/usr/src/lib/libdisasm/common/libdisasm.c
@@ -0,0 +1,92 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <libdisasm.h>
+#include <stdlib.h>
+#ifdef DIS_STANDALONE
+#include <mdb/mdb_modapi.h>
+#endif
+
+static int _dis_errno;
+
+/*
+ * For the standalone library, we need to link against mdb's malloc/free.
+ * Otherwise, use the standard malloc/free.
+ */
+#ifdef DIS_STANDALONE
+void *
+dis_zalloc(size_t bytes)
+{
+	return (mdb_zalloc(bytes, UM_SLEEP));
+}
+
+void
+dis_free(void *ptr, size_t bytes)
+{
+	mdb_free(ptr, bytes);
+}
+#else
+void *
+dis_zalloc(size_t bytes)
+{
+	return (calloc(1, bytes));
+}
+
+/*ARGSUSED*/
+void
+dis_free(void *ptr, size_t bytes)
+{
+	free(ptr);
+}
+#endif
+
+int
+dis_seterrno(int error)
+{
+	_dis_errno = error;
+	return (-1);
+}
+
+int
+dis_errno(void)
+{
+	return (_dis_errno);
+}
+
+const char *
+dis_strerror(int error)
+{
+	switch (error) {
+	case E_DIS_NOMEM:
+		return ("out of memory");
+	case E_DIS_INVALFLAG:
+		return ("invalid flags for this architecture");
+	default:
+		return ("unknown error");
+	}
+}
diff --git a/usr/src/lib/libdisasm/common/libdisasm.h b/usr/src/lib/libdisasm/common/libdisasm.h
new file mode 100644
index 0000000000..f66150a4ec
--- /dev/null
+++ b/usr/src/lib/libdisasm/common/libdisasm.h
@@ -0,0 +1,78 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	_LIBDISASM_H
+#define	_LIBDISASM_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <sys/types.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+typedef struct dis_handle dis_handle_t;
+
+#define	DIS_DEFAULT		0x0
+
+/* SPARC disassembler flags */
+#define	DIS_SPARC_V8		0x01
+#define	DIS_SPARC_V9		0x02
+#define	DIS_SPARC_V9_SGI	0x04
+
+/* x86 diassembler flags (mutually exclusive) */
+#define	DIS_X86_SIZE16		0x08
+#define	DIS_X86_SIZE32		0x10
+#define	DIS_X86_SIZE64		0x20
+
+/* generic disassembler flags */
+#define	DIS_OCTAL		0x40
+
+typedef int (*dis_lookup_f)(void *, uint64_t, char *, size_t, uint64_t *,
+    size_t *);
+typedef int (*dis_read_f)(void *, uint64_t, void *, size_t);
+
+extern dis_handle_t *dis_handle_create(int, void *, dis_lookup_f, dis_read_f);
+extern void dis_handle_destroy(dis_handle_t *);
+
+extern int dis_disassemble(dis_handle_t *, uint64_t, char *, size_t);
+extern uint64_t dis_previnstr(dis_handle_t *, uint64_t, int n);
+extern void dis_set_data(dis_handle_t *, void *);
+extern int dis_max_instrlen(dis_handle_t *);
+
+/* libdisasm errors */
+#define	E_DIS_NOMEM		1	/* Out of memory */
+#define	E_DIS_INVALFLAG		2	/* Invalid flag for this architecture */
+
+extern int dis_errno(void);
+extern const char *dis_strerror(int);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _LIBDISASM_H */
diff --git a/usr/src/lib/libdisasm/common/libdisasm_impl.h b/usr/src/lib/libdisasm/common/libdisasm_impl.h
new file mode 100644
index 0000000000..c31c24fe6a
--- /dev/null
+++ b/usr/src/lib/libdisasm/common/libdisasm_impl.h
@@ -0,0 +1,45 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	_LIBDISASM_IMPL_H
+#define	_LIBDISASM_IMPL_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+extern int dis_seterrno(int);
+
+extern void *dis_zalloc(size_t);
+extern void dis_free(void *, size_t);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _LIBDISASM_IMPL_H */
diff --git a/usr/src/lib/libdisasm/common/linktest_stand.c b/usr/src/lib/libdisasm/common/linktest_stand.c
new file mode 100644
index 0000000000..fd6ff8e353
--- /dev/null
+++ b/usr/src/lib/libdisasm/common/linktest_stand.c
@@ -0,0 +1,42 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * This file is used to verify that the standalone's external dependencies
+ * haven't changed in a way that'll break things that use it.
+ */
+
+void mdb_free(void) {}
+void snprintf(void) {}
+void mdb_zalloc(void) {}
+void strcmp(void) {}
+void strlen(void) {}
+void strlcat(void) {}
+void strncpy(void) {}
+void strncmp(void) {}
+void memcpy(void) {}
diff --git a/usr/src/lib/libdisasm/common/llib-ldisasm b/usr/src/lib/libdisasm/common/llib-ldisasm
new file mode 100644
index 0000000000..4ca0ab20e6
--- /dev/null
+++ b/usr/src/lib/libdisasm/common/llib-ldisasm
@@ -0,0 +1,35 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*LINTLIBRARY*/
+/*PROTOLIB1*/
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+#include <libdisasm.h>