9210 remove KMDB branch debugging support
9211 ::crregs could do with cr2/cr3 support
9209 ::ttrace should be able to filter by thread
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>

@@ -19,26 +19,25 @@
  * CDDL HEADER END
  */
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright 2018 Joyent, Inc.
  */
 
 #ifndef _KVM_H
 #define _KVM_H
 
-#pragma ident   "%Z%%M% %I%     %E% SMI"
-
 /*
  * The kmdb target
  */
 
 #include <mdb/mdb_modapi.h>
 #include <mdb/mdb_target.h>
 #include <kmdb/kmdb_dpi.h>
 #include <kmdb/kvm_isadep.h>
-#include <kmdb/kvm_cpu.h>
 
 #include <sys/kobj.h>
 
 #ifdef __cplusplus
 extern "C" {

@@ -84,12 +83,10 @@
         caddr_t         kmt_writemap;           /* Used to map PAs for writes */
         size_t          kmt_writemapsz;         /* Size of same */
         mdb_map_t       kmt_map;                /* Persistant map for callers */
         ulong_t         *kmt_trapmap;
         size_t          kmt_trapmax;
-        kmt_cpu_t       *kmt_cpu;               /* CPU-specific plugin */
-        int             kmt_cpu_retry;          /* Try CPU detect again? */
         int             kmt_symavail;           /* Symbol resolution allowed */
         uint_t          kmt_narmedbpts;         /* Number of armed brkpts */
 #if defined(__i386) || defined(__amd64)
         struct {
                 GElf_Sym        _kmt_cmnint;

@@ -141,11 +138,10 @@
 extern ssize_t kmt_writer(void *, size_t, uint64_t);
 extern ssize_t kmt_ioread(mdb_tgt_t *, void *, size_t, uintptr_t);
 extern ssize_t kmt_iowrite(mdb_tgt_t *, const void *, size_t, uintptr_t);
 
 extern int kmt_step_out(mdb_tgt_t *, uintptr_t *);
-extern int kmt_step_branch(mdb_tgt_t *);
 extern int kmt_next(mdb_tgt_t *, uintptr_t *);
 
 extern int kmt_stack(uintptr_t, uint_t, int, const mdb_arg_t *);
 extern int kmt_stackv(uintptr_t, uint_t, int, const mdb_arg_t *);
 extern int kmt_stackr(uintptr_t, uint_t, int, const mdb_arg_t *);