Remove command line options --db-attach and --db-command which were

deprecated in 3.10.0

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15445

diff --git a/NEWS b/NEWS
index a92852fa8e96426b4a295c89f2f87f48ccc13f91..974de961332c8e30a8a65cbc833560533727d301 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,9 @@ Release 3.11.0 is under development, not yet released.
 
 * ==================== OTHER CHANGES ====================
 
+* The command line options --db-attach and --db-command have been removed.
+  They were deprecated in 3.10.0
+
 * When a process dies due to a signal, Valgrind now shows the signal
   and the stacktrace at default verbosity (i.e. verbosity 1).
 

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 934d99e0d5705f9d178fa794b93c0e9263dac8f1..e22f117e5a54a3c67d2f686d767e2d4ebc865d04 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -174,7 +174,6 @@ noinst_HEADERS = \
        pub_core_cpuid.h        \
        pub_core_deduppoolalloc.h \
        pub_core_debuginfo.h    \
-       pub_core_debugger.h     \
        pub_core_debuglog.h     \
        pub_core_demangle.h     \
        pub_core_dispatch.h     \
@@ -287,7 +286,6 @@ COREGRIND_SOURCES_COMMON = \
        m_clientstate.c \
        m_cpuid.S \
        m_deduppoolalloc.c \
-       m_debugger.c \
        m_debuglog.c \
        m_errormgr.c \
        m_execontext.c \

diff --git a/coregrind/m_debugger.c b/coregrind/m_debugger.c
deleted file mode 100644 (file)
index 7bc809a..0000000
--- a/coregrind/m_debugger.c
+++ /dev/null
@@ -1,565 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Attaching a debugger.                           m_debugger.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
-   This file is part of Valgrind, a dynamic binary instrumentation
-   framework.
-
-   Copyright (C) 2000-2013 Julian Seward 
-      jseward@acm.org
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307, USA.
-
-   The GNU General Public License is contained in the file COPYING.
-*/
-
-#include "pub_core_basics.h"
-#include "pub_core_vki.h"
-#include "pub_core_threadstate.h"
-#include "pub_core_xarray.h"
-#include "pub_core_clientstate.h"
-#include "pub_core_debugger.h"
-#include "pub_core_gdbserver.h"
-#include "pub_core_libcbase.h"
-#include "pub_core_libcprint.h"
-#include "pub_core_libcproc.h"
-#include "pub_core_libcsignal.h"
-#include "pub_core_libcassert.h"
-#include "pub_core_options.h"
-
-
-#define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
-#define WSTOPSIG(status) (((status) & 0xff00) >> 8)
-
-static Int ptrace_setregs(Int pid, const VexGuestArchState* vex)
-{
-#if defined(VGP_x86_linux)
-   struct vki_user_regs_struct regs;
-   VG_(memset)(&regs, 0, sizeof(regs));
-   regs.cs     = vex->guest_CS;
-   regs.ss     = vex->guest_SS;
-   regs.ds     = vex->guest_DS;
-   regs.es     = vex->guest_ES;
-   regs.fs     = vex->guest_FS;
-   regs.gs     = vex->guest_GS;
-   regs.eax    = vex->guest_EAX;
-   regs.ebx    = vex->guest_EBX;
-   regs.ecx    = vex->guest_ECX;
-   regs.edx    = vex->guest_EDX;
-   regs.esi    = vex->guest_ESI;
-   regs.edi    = vex->guest_EDI;
-   regs.ebp    = vex->guest_EBP;
-   regs.esp    = vex->guest_ESP;
-   regs.eflags = LibVEX_GuestX86_get_eflags(vex);
-   regs.eip    = vex->guest_EIP;
-   return VG_(ptrace)(VKI_PTRACE_SETREGS, pid, NULL, &regs);
-
-#elif defined(VGP_amd64_linux)
-   struct vki_user_regs_struct regs;
-   VG_(memset)(&regs, 0, sizeof(regs));
-   regs.rax    = vex->guest_RAX;
-   regs.rbx    = vex->guest_RBX;
-   regs.rcx    = vex->guest_RCX;
-   regs.rdx    = vex->guest_RDX;
-   regs.rsi    = vex->guest_RSI;
-   regs.rdi    = vex->guest_RDI;
-   regs.rbp    = vex->guest_RBP;
-   regs.rsp    = vex->guest_RSP;
-   regs.r8     = vex->guest_R8;
-   regs.r9     = vex->guest_R9;
-   regs.r10    = vex->guest_R10;
-   regs.r11    = vex->guest_R11;
-   regs.r12    = vex->guest_R12;
-   regs.r13    = vex->guest_R13;
-   regs.r14    = vex->guest_R14;
-   regs.r15    = vex->guest_R15;
-   regs.eflags = LibVEX_GuestAMD64_get_rflags(vex);
-   regs.rip    = vex->guest_RIP;
-   /* Set %{c,d,e,f,s,g}s and %{fs,gs}_base (whatever those are) to
-      values which don't fail the kernel's sanity checks.  I have no
-      idea what these should really be set to.  Anyway, mostly it
-      seems that zero is an allowable value, except for %cs and %ss
-      which have to have their lowest 2 bits be 11.  See putreg() in
-      linux-2.6.23/arch/x86_64/kernel/ptrace.c for the apparently
-      relevant sanity checks.  This fixes #145622. */
-   regs.cs      = 3;
-   regs.ds      = 0;
-   regs.es      = 0;
-   regs.fs      = 0;
-   regs.ss      = 3;
-   regs.gs      = 0;
-   regs.fs_base = 0;
-   regs.gs_base = 0;
-   return VG_(ptrace)(VKI_PTRACE_SETREGS, pid, NULL, &regs);
-
-#elif defined(VGP_ppc32_linux)
-   Int rc = 0;
-   /* apparently the casting to void* is the Right Thing To Do */
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R0  * 4), (void*)vex->guest_GPR0);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R1  * 4), (void*)vex->guest_GPR1);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R2  * 4), (void*)vex->guest_GPR2);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R3  * 4), (void*)vex->guest_GPR3);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R4  * 4), (void*)vex->guest_GPR4);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R5  * 4), (void*)vex->guest_GPR5);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R6  * 4), (void*)vex->guest_GPR6);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R7  * 4), (void*)vex->guest_GPR7);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R8  * 4), (void*)vex->guest_GPR8);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R9  * 4), (void*)vex->guest_GPR9);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R10 * 4), (void*)vex->guest_GPR10);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R11 * 4), (void*)vex->guest_GPR11);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R12 * 4), (void*)vex->guest_GPR12);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R13 * 4), (void*)vex->guest_GPR13);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R14 * 4), (void*)vex->guest_GPR14);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R15 * 4), (void*)vex->guest_GPR15);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R16 * 4), (void*)vex->guest_GPR16);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R17 * 4), (void*)vex->guest_GPR17);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R18 * 4), (void*)vex->guest_GPR18);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R19 * 4), (void*)vex->guest_GPR19);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R20 * 4), (void*)vex->guest_GPR20);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R21 * 4), (void*)vex->guest_GPR21);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R22 * 4), (void*)vex->guest_GPR22);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R23 * 4), (void*)vex->guest_GPR23);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R24 * 4), (void*)vex->guest_GPR24);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R25 * 4), (void*)vex->guest_GPR25);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R26 * 4), (void*)vex->guest_GPR26);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R27 * 4), (void*)vex->guest_GPR27);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R28 * 4), (void*)vex->guest_GPR28);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R29 * 4), (void*)vex->guest_GPR29);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R30 * 4), (void*)vex->guest_GPR30);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R31 * 4), (void*)vex->guest_GPR31);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_NIP * 4), (void*)vex->guest_CIA);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_CCR * 4),
-                     (void*)LibVEX_GuestPPC32_get_CR(vex));
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_LNK * 4), (void*)vex->guest_LR);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_CTR * 4), (void*)vex->guest_CTR);
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_XER * 4),
-                     (void*)LibVEX_GuestPPC32_get_XER(vex));
-   return rc;
-
-#elif defined(VGP_ppc64be_linux) || defined(VGP_ppc64le_linux)
-   Int rc = 0; 
-   /* FRJ: copied nearly verbatim from the ppc32 case. I compared the 
-      vki-ppc64-linux.h with its ppc32 counterpart and saw no 
-      appreciable differences, other than the registers being 8 bytes 
-      instead of 4. No idea why we don't set all of the entries 
-      declared in vki_pt_regs, but ppc32 doesn't so there must be a 
-      reason. 
- 
-      Finally, note that CR and XER are 32 bits even for ppc64 (see 
-      libvex_guest_ppc64.h), but the vki_pt_regs struct still gives 
-      them 64 bits. 
-   */ 
-   /* apparently the casting to void* is the Right Thing To Do */ 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R0  * 8), (void*)vex->guest_GPR0); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R1  * 8), (void*)vex->guest_GPR1); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R2  * 8), (void*)vex->guest_GPR2); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R3  * 8), (void*)vex->guest_GPR3); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R4  * 8), (void*)vex->guest_GPR4); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R5  * 8), (void*)vex->guest_GPR5); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R6  * 8), (void*)vex->guest_GPR6); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R7  * 8), (void*)vex->guest_GPR7); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R8  * 8), (void*)vex->guest_GPR8); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R9  * 8), (void*)vex->guest_GPR9); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R10 * 8), (void*)vex->guest_GPR10); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R11 * 8), (void*)vex->guest_GPR11); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R12 * 8), (void*)vex->guest_GPR12); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R13 * 8), (void*)vex->guest_GPR13); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R14 * 8), (void*)vex->guest_GPR14); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R15 * 8), (void*)vex->guest_GPR15); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R16 * 8), (void*)vex->guest_GPR16); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R17 * 8), (void*)vex->guest_GPR17); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R18 * 8), (void*)vex->guest_GPR18); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R19 * 8), (void*)vex->guest_GPR19); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R20 * 8), (void*)vex->guest_GPR20); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R21 * 8), (void*)vex->guest_GPR21); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R22 * 8), (void*)vex->guest_GPR22); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R23 * 8), (void*)vex->guest_GPR23); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R24 * 8), (void*)vex->guest_GPR24); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R25 * 8), (void*)vex->guest_GPR25); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R26 * 8), (void*)vex->guest_GPR26); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R27 * 8), (void*)vex->guest_GPR27); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R28 * 8), (void*)vex->guest_GPR28); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R29 * 8), (void*)vex->guest_GPR29); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R30 * 8), (void*)vex->guest_GPR30); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_R31 * 8), (void*)vex->guest_GPR31); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_NIP * 8), (void*)vex->guest_CIA); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_CCR * 8), 
-                                              (void*)(long)LibVEX_GuestPPC64_get_CR(vex)); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_LNK * 8), (void*)vex->guest_LR); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_CTR * 8), (void*)vex->guest_CTR); 
-   rc |= VG_(ptrace)(VKI_PTRACE_POKEUSR, pid, (void*)(VKI_PT_XER * 8), 
-                                              (void*)(long)LibVEX_GuestPPC64_get_XER(vex)); 
-   return rc; 
-
-#elif defined(VGP_arm_linux)
-   struct vki_user_regs_struct uregs;
-   VG_(memset)(&uregs, 0, sizeof(uregs));
-   uregs.ARM_r0   = vex->guest_R0; 
-   uregs.ARM_r1   = vex->guest_R1; 
-   uregs.ARM_r2   = vex->guest_R2; 
-   uregs.ARM_r3   = vex->guest_R3; 
-   uregs.ARM_r4   = vex->guest_R4; 
-   uregs.ARM_r5   = vex->guest_R5; 
-   uregs.ARM_r6   = vex->guest_R6; 
-   uregs.ARM_r7   = vex->guest_R7; 
-   uregs.ARM_r8   = vex->guest_R8; 
-   uregs.ARM_r9   = vex->guest_R9; 
-   uregs.ARM_r10  = vex->guest_R10; 
-   uregs.ARM_fp   = vex->guest_R11; 
-   uregs.ARM_ip   = vex->guest_R12; 
-   uregs.ARM_sp   = vex->guest_R13; 
-   uregs.ARM_lr   = vex->guest_R14; 
-   // Remove the T bit from the bottom of R15T.  It will get shipped
-   // over in CPSR.T instead, since LibVEX_GuestARM_get_cpsr copies
-   // it from R15T[0].
-   uregs.ARM_pc   = vex->guest_R15T & 0xFFFFFFFE;
-   uregs.ARM_cpsr = LibVEX_GuestARM_get_cpsr(vex);
-   return VG_(ptrace)(VKI_PTRACE_SETREGS, pid, NULL, &uregs);
-
-#elif defined(VGP_arm64_linux)
-   I_die_here;
-   //ATC
-   struct vki_user_pt_regs uregs;
-   VG_(memset)(&uregs, 0, sizeof(uregs));
-   uregs.regs[0]  = vex->guest_X0;
-   uregs.regs[1]  = vex->guest_X1;
-   uregs.regs[2]  = vex->guest_X2;
-   uregs.regs[3]  = vex->guest_X3;
-   uregs.regs[4]  = vex->guest_X4;
-   uregs.regs[5]  = vex->guest_X5;
-   uregs.regs[6]  = vex->guest_X6;
-   uregs.regs[7]  = vex->guest_X7;
-   uregs.regs[8]  = vex->guest_X8;
-   uregs.regs[9]  = vex->guest_X9;
-   uregs.regs[10] = vex->guest_X10;
-   uregs.regs[11] = vex->guest_X11;
-   uregs.regs[12] = vex->guest_X12;
-   uregs.regs[13] = vex->guest_X13;
-   uregs.regs[14] = vex->guest_X14;
-   uregs.regs[15] = vex->guest_X15;
-   uregs.regs[16] = vex->guest_X16;
-   uregs.regs[17] = vex->guest_X17;
-   uregs.regs[18] = vex->guest_X18;
-   uregs.regs[19] = vex->guest_X19;
-   uregs.regs[20] = vex->guest_X20;
-   uregs.regs[21] = vex->guest_X21;
-   uregs.regs[22] = vex->guest_X22;
-   uregs.regs[23] = vex->guest_X23;
-   uregs.regs[24] = vex->guest_X24;
-   uregs.regs[25] = vex->guest_X25;
-   uregs.regs[26] = vex->guest_X26;
-   uregs.regs[27] = vex->guest_X27;
-   uregs.regs[28] = vex->guest_X28;
-   uregs.regs[29] = vex->guest_X29;
-   uregs.regs[30] = vex->guest_X30;
-   uregs.sp       = vex->guest_XSP;
-   uregs.pc       = vex->guest_PC;
-   uregs.pstate   = LibVEX_GuestARM64_get_nzcv(vex); /* is this correct? */
-   return VG_(ptrace)(VKI_PTRACE_SETREGS, pid, NULL, &uregs);
-
-#elif defined(VGP_x86_darwin)
-   I_die_here;
-
-#elif defined(VGP_amd64_darwin)
-   I_die_here;
-
-#elif defined(VGP_s390x_linux)
-   struct vki_user_regs_struct regs;
-   vki_ptrace_area pa;
-
-   /* We don't set the psw mask and start at offset 8 */
-   pa.vki_len = (unsigned long) &regs.per_info - (unsigned long) &regs.psw.addr;
-   pa.vki_process_addr = (unsigned long) &regs.psw.addr;
-   pa.vki_kernel_addr = 8;
-
-   VG_(memset)(&regs, 0, sizeof(regs));
-   regs.psw.addr = vex->guest_IA;
-
-   /* We don't set the mask */
-   regs.gprs[0] = vex->guest_r0;
-   regs.gprs[1] = vex->guest_r1;
-   regs.gprs[2] = vex->guest_r2;
-   regs.gprs[3] = vex->guest_r3;
-   regs.gprs[4] = vex->guest_r4;
-   regs.gprs[5] = vex->guest_r5;
-   regs.gprs[6] = vex->guest_r6;
-   regs.gprs[7] = vex->guest_r7;
-   regs.gprs[8] = vex->guest_r8;
-   regs.gprs[9] = vex->guest_r9;
-   regs.gprs[10] = vex->guest_r10;
-   regs.gprs[11] = vex->guest_r11;
-   regs.gprs[12] = vex->guest_r12;
-   regs.gprs[13] = vex->guest_r13;
-   regs.gprs[14] = vex->guest_r14;
-   regs.gprs[15] = vex->guest_r15;
-
-   regs.acrs[0] = vex->guest_a0;
-   regs.acrs[1] = vex->guest_a1;
-   regs.acrs[2] = vex->guest_a2;
-   regs.acrs[3] = vex->guest_a3;
-   regs.acrs[4] = vex->guest_a4;
-   regs.acrs[5] = vex->guest_a5;
-   regs.acrs[6] = vex->guest_a6;
-   regs.acrs[7] = vex->guest_a7;
-   regs.acrs[8] = vex->guest_a8;
-   regs.acrs[9] = vex->guest_a9;
-   regs.acrs[10] = vex->guest_a10;
-   regs.acrs[11] = vex->guest_a11;
-   regs.acrs[12] = vex->guest_a12;
-   regs.acrs[13] = vex->guest_a13;
-   regs.acrs[14] = vex->guest_a14;
-   regs.acrs[15] = vex->guest_a15;
-
-   /* only used for system call restart and friends, just use r2 */
-   regs.orig_gpr2 = vex->guest_r2;
-
-   regs.fp_regs.fprs[0].ui = vex->guest_f0;
-   regs.fp_regs.fprs[1].ui = vex->guest_f1;
-   regs.fp_regs.fprs[2].ui = vex->guest_f2;
-   regs.fp_regs.fprs[3].ui = vex->guest_f3;
-   regs.fp_regs.fprs[4].ui = vex->guest_f4;
-   regs.fp_regs.fprs[5].ui = vex->guest_f5;
-   regs.fp_regs.fprs[6].ui = vex->guest_f6;
-   regs.fp_regs.fprs[7].ui = vex->guest_f7;
-   regs.fp_regs.fprs[8].ui = vex->guest_f8;
-   regs.fp_regs.fprs[9].ui = vex->guest_f9;
-   regs.fp_regs.fprs[10].ui = vex->guest_f10;
-   regs.fp_regs.fprs[11].ui = vex->guest_f11;
-   regs.fp_regs.fprs[12].ui = vex->guest_f12;
-   regs.fp_regs.fprs[13].ui = vex->guest_f13;
-   regs.fp_regs.fprs[14].ui = vex->guest_f14;
-   regs.fp_regs.fprs[15].ui = vex->guest_f15;
-   regs.fp_regs.fpc = vex->guest_fpc;
-
-   return VG_(ptrace)(VKI_PTRACE_POKEUSR_AREA, pid,  &pa, NULL);
-
-#elif defined(VGP_mips32_linux) || defined(VGP_mips64_linux)
-   struct vki_user_regs_struct regs;
-   VG_(memset)(&regs, 0, sizeof(regs));
-   regs.MIPS_r0     = vex->guest_r0;
-   regs.MIPS_r1     = vex->guest_r1;
-   regs.MIPS_r2     = vex->guest_r2;
-   regs.MIPS_r3     = vex->guest_r3;
-   regs.MIPS_r4     = vex->guest_r4;
-   regs.MIPS_r5     = vex->guest_r5;
-   regs.MIPS_r6     = vex->guest_r6;
-   regs.MIPS_r7     = vex->guest_r7;
-   regs.MIPS_r8     = vex->guest_r8;
-   regs.MIPS_r9     = vex->guest_r9;
-   regs.MIPS_r10     = vex->guest_r10;
-   regs.MIPS_r11     = vex->guest_r11;
-   regs.MIPS_r12     = vex->guest_r12;
-   regs.MIPS_r13     = vex->guest_r13;
-   regs.MIPS_r14     = vex->guest_r14;
-   regs.MIPS_r15     = vex->guest_r15;
-   regs.MIPS_r16     = vex->guest_r16;
-   regs.MIPS_r17     = vex->guest_r17;
-   regs.MIPS_r18     = vex->guest_r18;
-   regs.MIPS_r19     = vex->guest_r19;
-   regs.MIPS_r20     = vex->guest_r20;
-   regs.MIPS_r21     = vex->guest_r21;
-   regs.MIPS_r22     = vex->guest_r22;
-   regs.MIPS_r23     = vex->guest_r23;
-   regs.MIPS_r24     = vex->guest_r24;
-   regs.MIPS_r25     = vex->guest_r25;
-   regs.MIPS_r26     = vex->guest_r26;
-   regs.MIPS_r27     = vex->guest_r27;
-   regs.MIPS_r28     = vex->guest_r28;
-   regs.MIPS_r29     = vex->guest_r29;
-   regs.MIPS_r30     = vex->guest_r30;
-   regs.MIPS_r31     = vex->guest_r31;
-   return VG_(ptrace)(VKI_PTRACE_SETREGS, pid, NULL, &regs);
-
-#elif defined(VGP_tilegx_linux)
-   struct vki_user_regs_struct regs;
-   VG_(memset)(&regs, 0, sizeof(regs));
-   regs.TILEGX_r0     = vex->guest_r0;
-   regs.TILEGX_r1     = vex->guest_r1;
-   regs.TILEGX_r2     = vex->guest_r2;
-   regs.TILEGX_r3     = vex->guest_r3;
-   regs.TILEGX_r4     = vex->guest_r4;
-   regs.TILEGX_r5     = vex->guest_r5;
-   regs.TILEGX_r6     = vex->guest_r6;
-   regs.TILEGX_r7     = vex->guest_r7;
-   regs.TILEGX_r8     = vex->guest_r8;
-   regs.TILEGX_r9     = vex->guest_r9;
-   regs.TILEGX_r10     = vex->guest_r10;
-   regs.TILEGX_r11     = vex->guest_r11;
-   regs.TILEGX_r12     = vex->guest_r12;
-   regs.TILEGX_r13     = vex->guest_r13;
-   regs.TILEGX_r14     = vex->guest_r14;
-   regs.TILEGX_r15     = vex->guest_r15;
-   regs.TILEGX_r16     = vex->guest_r16;
-   regs.TILEGX_r17     = vex->guest_r17;
-   regs.TILEGX_r18     = vex->guest_r18;
-   regs.TILEGX_r19     = vex->guest_r19;
-   regs.TILEGX_r20     = vex->guest_r20;
-   regs.TILEGX_r21     = vex->guest_r21;
-   regs.TILEGX_r22     = vex->guest_r22;
-   regs.TILEGX_r23     = vex->guest_r23;
-   regs.TILEGX_r24     = vex->guest_r24;
-   regs.TILEGX_r25     = vex->guest_r25;
-   regs.TILEGX_r26     = vex->guest_r26;
-   regs.TILEGX_r27     = vex->guest_r27;
-   regs.TILEGX_r28     = vex->guest_r28;
-   regs.TILEGX_r29     = vex->guest_r29;
-   regs.TILEGX_r30     = vex->guest_r30;
-   regs.TILEGX_r31     = vex->guest_r31;
-   regs.TILEGX_r32     = vex->guest_r32;
-   regs.TILEGX_r33     = vex->guest_r33;
-   regs.TILEGX_r34     = vex->guest_r34;
-   regs.TILEGX_r35     = vex->guest_r35;
-   regs.TILEGX_r36     = vex->guest_r36;
-   regs.TILEGX_r37     = vex->guest_r37;
-   regs.TILEGX_r38     = vex->guest_r38;
-   regs.TILEGX_r39     = vex->guest_r39;
-   regs.TILEGX_r40     = vex->guest_r40;
-   regs.TILEGX_r41     = vex->guest_r41;
-   regs.TILEGX_r42     = vex->guest_r42;
-   regs.TILEGX_r43     = vex->guest_r43;
-   regs.TILEGX_r44     = vex->guest_r44;
-   regs.TILEGX_r45     = vex->guest_r45;
-   regs.TILEGX_r46     = vex->guest_r46;
-   regs.TILEGX_r47     = vex->guest_r47;
-   regs.TILEGX_r48     = vex->guest_r48;
-   regs.TILEGX_r49     = vex->guest_r49;
-   regs.TILEGX_r50     = vex->guest_r50;
-   regs.TILEGX_r51     = vex->guest_r51;
-   regs.TILEGX_r52     = vex->guest_r52;
-   regs.TILEGX_r53     = vex->guest_r53;
-   regs.TILEGX_r54     = vex->guest_r54;
-   regs.TILEGX_r55     = vex->guest_r55;
-   regs.TILEGX_pc     =  vex->guest_pc;
-
-   return VG_(ptrace)(VKI_PTRACE_SETREGS, pid, NULL, &regs);
-
-#elif defined(VGP_x86_solaris)
-   I_die_here;
-
-#elif defined(VGP_amd64_solaris)
-   I_die_here;
-
-#else
-#  error Unknown arch
-#endif
-}
-
-/* Start debugger and get it to attach to this process.  Called if the
-   user requests this service after an error has been shown, so she can
-   poke around and look at parameters, memory, etc.  You can't
-   meaningfully get the debugger to continue the program, though; to
-   continue, quit the debugger.  */
-void VG_(start_debugger) ( ThreadId tid )
-{
-#  define N_BUF 4096
-   Int pid, rc;
-
-   pid = VG_(fork)();
-
-   if (pid == 0) {
-      /* child */
-      VG_(set_ptracer)();
-      rc = VG_(ptrace)(VKI_PTRACE_TRACEME, 0, NULL, NULL);
-      vg_assert(rc == 0);
-      rc = VG_(kill)(VG_(getpid)(), VKI_SIGSTOP);
-      vg_assert(rc == 0);
-
-   } else if (pid > 0) {
-      /* parent */
-      Int status;
-      Int res;
-
-      if ((res = VG_(waitpid)(pid, &status, 0)) == pid &&
-          WIFSTOPPED(status) && WSTOPSIG(status) == VKI_SIGSTOP &&
-          ptrace_setregs(pid, &(VG_(threads)[tid].arch.vex)) == 0 &&
-          VG_(kill)(pid, VKI_SIGSTOP) == 0 &&
-          VG_(ptrace)(VKI_PTRACE_DETACH, pid, NULL, 0) == 0)
-      {
-         HChar pidbuf[15];
-         HChar file[50];
-         HChar buf[N_BUF];
-         HChar *bufptr;
-         const HChar *cmdptr;
-         
-         VG_(sprintf)(pidbuf, "%d", pid);
-         VG_(sprintf)(file, "/proc/%d/fd/%d", pid, VG_(cl_exec_fd));
- 
-         bufptr = buf;
-         cmdptr = VG_(clo_db_command);
-         
-         while (*cmdptr) {
-            /* each iteration can advance bufptr by at most the length
-               of file[], so the following assertion is generously
-               over-paranoid. */
-            vg_assert(bufptr - buf < N_BUF-15-50-10/*paranoia*/);
-            switch (*cmdptr) {
-               case '%':
-                  switch (*++cmdptr) {
-                     case 'f':
-                        VG_(memcpy)(bufptr, file, VG_(strlen)(file));
-                        bufptr += VG_(strlen)(file);
-                        cmdptr++;
-                        break;
-                     case 'p':
-                        VG_(memcpy)(bufptr, pidbuf, VG_(strlen)(pidbuf));
-                        bufptr += VG_(strlen)(pidbuf);
-                        cmdptr++;
-                        break;
-                     default:
-                        *bufptr++ = *cmdptr++;
-                        break;
-                  }
-                  break;
-               default:
-                  *bufptr++ = *cmdptr++;
-                  break;
-            }
-            vg_assert(bufptr - buf < N_BUF-15-50-10/*paranoia*/);
-         }
-         
-         *bufptr++ = '\0';
-  
-         VG_(message)(Vg_UserMsg, "starting debugger with cmd: %s\n", buf);
-         res = VG_(system)(buf);
-         if (res == 0) {      
-            VG_(message)(Vg_UserMsg, "\n");
-            VG_(message)(Vg_UserMsg, 
-                         "Debugger has detached.  Valgrind regains control."
-                         "  We continue.\n");
-         } else {
-            VG_(message)(Vg_UserMsg, 
-                         "Warning: Debugger attach failed! (sys_system)\n");
-            VG_(message)(Vg_UserMsg, "\n");
-         }
-      } else {
-         VG_(message)(Vg_UserMsg, 
-                      "Warning: Debugger attach failed! (ptrace problem?)\n");
-         VG_(message)(Vg_UserMsg, "\n");
-      }
-
-      VG_(kill)(pid, VKI_SIGKILL);
-      VG_(waitpid)(pid, &status, 0);
-   }
-#  undef N_BUF
-}
-
-
-
-/*--------------------------------------------------------------------*/
-/*--- end                                                          ---*/
-/*--------------------------------------------------------------------*/

diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index 2ea6370f16857d899748e5260e6d24928f60bc11..bf510a303a7f518c8d9d8936935ec322094bf436 100644 (file)
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -31,7 +31,6 @@
 #include "pub_core_basics.h"
 #include "pub_core_vki.h"
 #include "pub_core_threadstate.h"      // For VG_N_THREADS
-#include "pub_core_debugger.h"
 #include "pub_core_debuginfo.h"
 #include "pub_core_debuglog.h"
 #include "pub_core_errormgr.h"
@@ -515,7 +514,7 @@ Bool VG_(is_action_requested) ( const HChar* action, Bool* clo )
 
 /* Do text-mode actions on error, that is, immediately after an error
    is printed.  These are:
-   * possibly, attach to a debugger
+   * possibly, call the GDB server
    * possibly, generate a suppression.
    Note this should not be called in XML mode! 
 */
@@ -533,15 +532,6 @@ void do_actions_on_error(const Error* err, Bool allow_db_attach)
       VG_(umsg)("Continuing ...\n");
    }
 
-   /* Perhaps we want a debugger attach at this point? */
-   /* GDBTD ??? maybe we should/could remove the below assuming the
-      gdbserver interface is better ??? */
-   if (allow_db_attach &&
-       VG_(is_action_requested)( "Attach to debugger", & VG_(clo_db_attach) ))
-   {   
-      if (0) VG_(printf)("starting debugger\n");
-      VG_(start_debugger)( err->tid );
-   }  
    /* Or maybe we want to generate the error's suppression? */
    if (VG_(clo_gen_suppressions) == 2
        || (VG_(clo_gen_suppressions) == 1

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 9b491e5840d23dc90a8d2f88b3770b089de98af5..a8426913903d1fa5f7846e0fee29c30e07887f3c 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -133,9 +133,6 @@ static void usage_NORETURN ( Bool debug_help )
 "                              load default suppressions [yes]\n"
 "    --suppressions=<filename> suppress errors described in <filename>\n"
 "    --gen-suppressions=no|yes|all    print suppressions for errors? [no]\n"
-"    --db-attach=no|yes        start debugger when errors detected? [no]\n"
-"                              Note: deprecated feature\n"
-"    --db-command=<command>    command to start debugger [%s -nw %%f %%p]\n"
 "    --input-fd=<number>       file descriptor for input [0=stdin]\n"
 "    --dsymutil=no|yes         run dsymutil on Mac OS X when helpful? [no]\n"
 "    --max-stackframe=<number> assume stack switch for SP changes larger\n"
@@ -301,7 +298,6 @@ static void usage_NORETURN ( Bool debug_help )
 "  Bug reports, feedback, admiration, abuse, etc, to: %s.\n"
 "\n";
 
-   const HChar* gdb_path = GDB_PATH;
    HChar default_alignment[30];      // large enough
    HChar default_redzone_size[30];   // large enough
 
@@ -319,7 +315,6 @@ static void usage_NORETURN ( Bool debug_help )
    /* 'usage1' a type as described after each arg. */
    VG_(printf)(usage1, 
                VG_(clo_vgdb_error)        /* int */,
-               gdb_path                   /* char* */,
                default_alignment          /* char* */,
                default_redzone_size       /* char* */,
                VG_(clo_vgdb_poll)         /* int */,
@@ -617,7 +612,6 @@ void main_process_cmd_line_options ( /*OUT*/Bool* logging_to_fd,
       }
       else if VG_BOOL_CLO(arg, "--vgdb-shadow-registers",
                             VG_(clo_vgdb_shadow_registers)) {}
-      else if VG_BOOL_CLO(arg, "--db-attach",      VG_(clo_db_attach)) {}
       else if VG_BOOL_CLO(arg, "--demangle",       VG_(clo_demangle)) {}
       else if VG_STR_CLO (arg, "--soname-synonyms",VG_(clo_soname_synonyms)) {}
       else if VG_BOOL_CLO(arg, "--error-limit",    VG_(clo_error_limit)) {}
@@ -682,7 +676,6 @@ void main_process_cmd_line_options ( /*OUT*/Bool* logging_to_fd,
 
       else if VG_BOOL_CLO(arg, "--trace-syscalls",   VG_(clo_trace_syscalls)) {}
       else if VG_BOOL_CLO(arg, "--wait-for-gdb",     VG_(clo_wait_for_gdb)) {}
-      else if VG_STR_CLO (arg, "--db-command",       VG_(clo_db_command)) {}
       else if VG_BOOL_CLO(arg, "--sym-offsets",      VG_(clo_sym_offsets)) {}
       else if VG_BOOL_CLO(arg, "--read-inline-info", VG_(clo_read_inline_info)) {}
       else if VG_BOOL_CLO(arg, "--read-var-info",    VG_(clo_read_var_info)) {}
@@ -902,11 +895,7 @@ void main_process_cmd_line_options ( /*OUT*/Bool* logging_to_fd,
 
    /* END command-line processing loop */
 
-   /* Notify about deprecated features */
-   if (VG_(clo_db_attach))
-      VG_(umsg)
-         ("\nWarning: --db-attach is a deprecated feature which will be\n"
-          "   removed in the next release. Use --vgdb-error=1 instead\n\n");
+   /* Notify about deprecated features here. */
 
    /* Determine the path prefix for vgdb */
    if (VG_(clo_vgdb_prefix) == NULL)
@@ -998,16 +987,6 @@ void main_process_cmd_line_options ( /*OUT*/Bool* logging_to_fd,
             "--gen-suppressions=yes.\n");
       }
 
-      /* We can't allow DB attaching (or we maybe could, but results
-         could be chaotic ..) since it requires user input.  Hence
-         disallow. */
-      if (VG_(clo_db_attach)) {
-         VG_(fmsg_bad_option)(
-            "--xml=yes together with --db-attach=yes",
-            "--db-attach=yes is not allowed with --xml=yes\n"
-            "because it would require user input.\n");
-      }
-
       /* Disallow dump_error in XML mode; sounds like a recipe for
          chaos.  No big deal; dump_error is a flag for debugging V
          itself. */

diff --git a/coregrind/m_options.c b/coregrind/m_options.c
index 300d6207a4132ec63494f37cb2dd8011d9e1298b..86beb774e0cb80868f996d82535543ebcc02ed7d 100644 (file)
--- a/coregrind/m_options.c
+++ b/coregrind/m_options.c
@@ -67,8 +67,6 @@ const HChar *VG_(clo_vgdb_prefix)    = NULL;
 const HChar *VG_(arg_vgdb_prefix)    = NULL;
 Bool   VG_(clo_vgdb_shadow_registers) = False;
 
-Bool   VG_(clo_db_attach)      = False;
-const HChar*  VG_(clo_db_command)     = GDB_PATH " -nw %f %p";
 Int    VG_(clo_gen_suppressions) = 0;
 Int    VG_(clo_sanity_level)   = 1;
 Int    VG_(clo_verbosity)      = 1;

diff --git a/coregrind/m_signals.c b/coregrind/m_signals.c
index e231f3d32b0554063ae646d17f25cfcd26fa868a..d80cfc9a1fec3cb07f8a8065d2ded54bb1f81607 100644 (file)
--- a/coregrind/m_signals.c
+++ b/coregrind/m_signals.c
@@ -207,7 +207,6 @@
 #include "pub_core_xarray.h"
 #include "pub_core_clientstate.h"
 #include "pub_core_aspacemgr.h"
-#include "pub_core_debugger.h"      // For VG_(start_debugger)
 #include "pub_core_errormgr.h"
 #include "pub_core_gdbserver.h"
 #include "pub_core_libcbase.h"
@@ -1899,10 +1898,6 @@ static void default_action(const vki_siginfo_t *info, ThreadId tid)
       VG_(gdbserver_report_fatal_signal) (info, tid);
    }
 
-   if (VG_(is_action_requested)( "Attach to debugger", & VG_(clo_db_attach) )) {
-      VG_(start_debugger)( tid );
-   }
-
    if (core) {
       static const struct vki_rlimit zero = { 0, 0 };
 

diff --git a/coregrind/pub_core_debugger.h b/coregrind/pub_core_debugger.h
deleted file mode 100644 (file)
index a3ac809..0000000
--- a/coregrind/pub_core_debugger.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Attaching a debugger.                    pub_core_debugger.h ---*/
-/*--------------------------------------------------------------------*/
-
-/*
-   This file is part of Valgrind, a dynamic binary instrumentation
-   framework.
-
-   Copyright (C) 2000-2013 Julian Seward
-      jseward@acm.org
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307, USA.
-
-   The GNU General Public License is contained in the file COPYING.
-*/
-
-#ifndef __PUB_CORE_DEBUGGER_H
-#define __PUB_CORE_DEBUGGER_H
-
-//--------------------------------------------------------------------
-// PURPOSE: This simple module just deals with attaching a debugger to the
-// running program.
-//--------------------------------------------------------------------
-
-#include "pub_core_basics.h"      // ThreadId
-
-extern void VG_(start_debugger) ( ThreadId tid );
-
-#endif   // __PUB_CORE_DEBUGGER_H
-
-/*--------------------------------------------------------------------*/
-/*--- end                                                          ---*/
-/*--------------------------------------------------------------------*/

diff --git a/coregrind/pub_core_gdbserver.h b/coregrind/pub_core_gdbserver.h
index 71fc711d8550620bbeb45d952ee0f20fd5ae9e68..4f3210c774708edaf04fd1e8a94bae137128def6 100644 (file)
--- a/coregrind/pub_core_gdbserver.h
+++ b/coregrind/pub_core_gdbserver.h
@@ -63,7 +63,7 @@ extern Bool VG_(gdbserver_activity) (ThreadId tid);
 void VG_(gdbserver_exit) (ThreadId tid, VgSchedReturnCode tids_schedretcode);
 
 /* On systems that defines PR_SET_PTRACER, verify if ptrace_scope is
-   is permissive enough for vgdb or --db-attach=yes.
+   is permissive enough for vgdb.
    Otherwise, call set_ptracer.
    This is especially aimed at Ubuntu >= 10.10 which has added
    the ptrace_scope context. */

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index a1239f8c812416a9ae30e28e60ca54913be9f02d..b9d0d4da17bec715c3b02cdb6ab6ca582e4a95a2 100644 (file)
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -88,10 +88,6 @@ extern const HChar *VG_(clo_vgdb_prefix);
    shadow registers */
 extern Bool  VG_(clo_vgdb_shadow_registers);
 
-/* Enquire about whether to attach to a debugger at errors?   default: NO */
-extern Bool  VG_(clo_db_attach);
-/* The debugger command?  default: whatever gdb ./configure found */
-extern const HChar* VG_(clo_db_command);
 /* Generating a suppression for each error?   default: 0 (NO)
    Other values: 1 (yes, but ask user), 2 (yes, don't ask user) */
 extern Int   VG_(clo_gen_suppressions);

diff --git a/docs/xml/manual-core.xml b/docs/xml/manual-core.xml
index c79f27186b72cf037da566c45e0f971838834468..80a3e664757c390fc5e396a14dba71b342c8e443 100644 (file)
--- a/docs/xml/manual-core.xml
+++ b/docs/xml/manual-core.xml
@@ -1412,11 +1412,13 @@ that can report errors, e.g. Memcheck, but not Cachegrind.</para>
       after every error shown and print the line:
       <literallayout><computeroutput>    ---- Print suppression ? --- [Return/N/n/Y/y/C/c] ----</computeroutput></literallayout>
 
-      The prompt's behaviour is the same as for the
-      <option>--db-attach</option> option (see below).</para>
+      Pressing <varname>Ret</varname>, or <varname>N Ret</varname> or
+      <varname>n Ret</varname>, causes Valgrind continue execution without
+      printing a suppression for this error.</para>
 
-      <para>If you choose to, Valgrind will print out a suppression for
-      this error.  You can then cut and paste it into a suppression file
+      <para>Pressing <varname>Y Ret</varname> or
+      <varname>y Ret</varname> causes Valgrind to write a suppression
+      for this error.  You can then cut and paste it into a suppression file
       if you don't want to hear about the error in the future.</para>
 
       <para>When set to <varname>all</varname>, Valgrind will print a
@@ -1451,76 +1453,12 @@ that can report errors, e.g. Memcheck, but not Cachegrind.</para>
     </listitem>
   </varlistentry>
 
-  <varlistentry id="opt.db-attach" xreflabel="--db-attach">
-    <term>
-      <option><![CDATA[--db-attach=<yes|no> [default: no] ]]></option>
-    </term>
-    <listitem>
-      <para>When enabled, Valgrind will pause after every error shown
-      and print the line:
-      <literallayout><computeroutput>    ---- Attach to debugger ? --- [Return/N/n/Y/y/C/c] ----</computeroutput></literallayout>
-
-      Pressing <varname>Ret</varname>, or <varname>N Ret</varname> or
-      <varname>n Ret</varname>, causes Valgrind not to start a debugger
-      for this error.</para>
-
-      <para>Pressing <varname>Y Ret</varname> or
-      <varname>y Ret</varname> causes Valgrind to start a debugger for
-      the program at this point. When you have finished with the
-      debugger, quit from it, and the program will continue. Trying to
-      continue from inside the debugger doesn't work.</para>
-
-      <para>
-      Note: if you use GDB, more powerful debugging support is
-      provided by the <option>--vgdb=</option> <varname>yes</varname>
-      or <varname>full</varname> value.  This activates Valgrind's
-      internal gdbserver, which provides more-or-less full GDB-style
-      control of the application: insertion of breakpoints, continuing 
-      from inside GDB, inferior function calls, and much more.
-      </para> 
-
-      <para><varname>C Ret</varname> or <varname>c Ret</varname> causes
-      Valgrind not to start a debugger, and not to ask again.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry id="opt.db-command" xreflabel="--db-command">
-    <term>
-      <option><![CDATA[--db-command=<command> [default: gdb -nw %f %p] ]]></option>
-    </term>
-    <listitem>
-      <para>Specify the debugger to use with the
-      <option>--db-attach</option> command. The default debugger is
-      GDB. This option is a template that is expanded by Valgrind at
-      runtime.  <literal>%f</literal> is replaced with the executable's
-      file name and <literal>%p</literal> is replaced by the process ID
-      of the executable.</para>
-
-      <para>This specifies how Valgrind will invoke the debugger.  By
-      default it will use whatever GDB is detected at build time, which
-      is usually <computeroutput>/usr/bin/gdb</computeroutput>.  Using
-      this command, you can specify some alternative command to invoke
-      the debugger you want to use.</para>
-
-      <para>The command string given can include one or instances of the
-      <literal>%p</literal> and <literal>%f</literal> expansions. Each
-      instance of <literal>%p</literal> expands to the PID of the
-      process to be debugged and each instance of <literal>%f</literal>
-      expands to the path to the executable for the process to be
-      debugged.</para>
-
-      <para>Since <computeroutput>&lt;command&gt;</computeroutput> is likely
-      to contain spaces, you will need to put this entire option in
-      quotes to ensure it is correctly handled by the shell.</para>
-    </listitem>
-  </varlistentry>
-
   <varlistentry id="opt.input-fd" xreflabel="--input-fd">
     <term>
       <option><![CDATA[--input-fd=<number> [default: 0, stdin] ]]></option>
     </term>
     <listitem>
-      <para>When using <option>--db-attach=yes</option> or
+      <para>When using
       <option>--gen-suppressions=yes</option>, Valgrind will stop so as
       to read keyboard input from you when each error occurs.  By
       default it reads from the standard input (stdin), which is
@@ -2452,8 +2390,7 @@ things.  If you wish to see the list, use the
 
 <para>If you wish to debug your program rather than debugging
 Valgrind itself, then you should use the options
-<option>--vgdb=yes</option> or <option>--vgdb=full</option>
-or <option>--db-attach=yes</option>.
+<option>--vgdb=yes</option> or <option>--vgdb=full</option>.
 </para>
 
 <!-- end of xi:include in the manpage -->

diff --git a/include/vki/vki-solaris.h b/include/vki/vki-solaris.h
index ba2631efa75ea010e5a752e373b2ceb21c3dc531..e17e33f322f984870708dbc0535e5f03a913d64c 100644 (file)
--- a/include/vki/vki-solaris.h
+++ b/include/vki/vki-solaris.h
@@ -60,12 +60,6 @@
 #define __EXTENSIONS__ 1
 /* assert _FILE_OFFSET_BITS == 32 */
 
-/* XXX These two PTRACE defines are currently used only in m_debugger.c for
-   legacy 'attach debugger' functionality. This is going to be removed
-   in future Valgrind version and so can these two as well. */
-#define VKI_PTRACE_TRACEME 0
-#define VKI_PTRACE_DETACH -1
-
 #define VKI_PAGE_SHIFT 12
 #define VKI_PAGE_SIZE (1UL << VKI_PAGE_SHIFT)
 #define VKI_PAGEMASK (~VKI_PAGEOFFSET)

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 355b554bda04b3fb83136b1990dc4a6fa4fbe696..f0208bd7a71db401f91795252e0e73e900ef7a51 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -47,9 +47,6 @@ usage: valgrind [options] prog-and-args
                               load default suppressions [yes]
     --suppressions=<filename> suppress errors described in <filename>
     --gen-suppressions=no|yes|all    print suppressions for errors? [no]
-    --db-attach=no|yes        start debugger when errors detected? [no]
-                              Note: deprecated feature
-    --db-command=<command>    command to start debugger [... -nw %f %p]
     --input-fd=<number>       file descriptor for input [0=stdin]
     --dsymutil=no|yes         run dsymutil on Mac OS X when helpful? [no]
     --max-stackframe=<number> assume stack switch for SP changes larger

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 59619b08da41446d5ef35b5e1c84133c4444a5cc..c6b6055fa058d0de1f1762153c21819f37089c33 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -47,9 +47,6 @@ usage: valgrind [options] prog-and-args
                               load default suppressions [yes]
     --suppressions=<filename> suppress errors described in <filename>
     --gen-suppressions=no|yes|all    print suppressions for errors? [no]
-    --db-attach=no|yes        start debugger when errors detected? [no]
-                              Note: deprecated feature
-    --db-command=<command>    command to start debugger [... -nw %f %p]
     --input-fd=<number>       file descriptor for input [0=stdin]
     --dsymutil=no|yes         run dsymutil on Mac OS X when helpful? [no]
     --max-stackframe=<number> assume stack switch for SP changes larger