From de6f69ad33e8330582d48b4410521d8998c0c882 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Sat, 27 Jul 2013 07:11:46 +0000 Subject: [PATCH] gdb/ * breakpoint.h: Include break-common.h. (enum target_hw_bp_type): Move to ... * common/break-common.h: ... here. New. gdb/gdbserver/ * i386-low.c: Include break-common.h. (enum target_hw_bp_type): Remove. --- gdb/ChangeLog | 6 ++++++ gdb/breakpoint.h | 10 +--------- gdb/common/break-common.h | 30 ++++++++++++++++++++++++++++++ gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/i386-low.c | 9 +-------- 5 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 gdb/common/break-common.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 671a11c48d..94d5c12ced 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-07-27 Yao Qi + + * breakpoint.h: Include break-common.h. + (enum target_hw_bp_type): Move to ... + * common/break-common.h: ... here. New. + 2013-07-26 Cyril Nikolaev * inflow.c (terminal_init_inferior_with_pgrp): Save inferior diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 374164c9df..faedb4a7ea 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -24,6 +24,7 @@ #include "vec.h" #include "ax.h" #include "command.h" +#include "break-common.h" struct value; struct block; @@ -215,15 +216,6 @@ enum bpdisp disp_donttouch /* Leave it alone */ }; -enum target_hw_bp_type - { - hw_write = 0, /* Common HW watchpoint */ - hw_read = 1, /* Read HW watchpoint */ - hw_access = 2, /* Access HW watchpoint */ - hw_execute = 3 /* Execute HW breakpoint */ - }; - - /* Status of breakpoint conditions used when synchronizing conditions with the target. */ diff --git a/gdb/common/break-common.h b/gdb/common/break-common.h new file mode 100644 index 0000000000..16ed0e214e --- /dev/null +++ b/gdb/common/break-common.h @@ -0,0 +1,30 @@ +/* Data structures associated with breakpoints shared in both GDB and + GDBserver. + Copyright (C) 1992-2013 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 3 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, see . */ +#ifndef BREAK_COMMON_H +#define BREAK_COMMON_H 1 + +enum target_hw_bp_type + { + hw_write = 0, /* Common HW watchpoint */ + hw_read = 1, /* Read HW watchpoint */ + hw_access = 2, /* Access HW watchpoint */ + hw_execute = 3 /* Execute HW breakpoint */ + }; + +#endif diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 4af17efdfb..426e2ba6d6 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2013-07-27 Yao Qi + + * i386-low.c: Include break-common.h. + (enum target_hw_bp_type): Remove. + 2013-07-24 Luis Machado * Makefile.in (SFILES): /common/target-common.c. diff --git a/gdb/gdbserver/i386-low.c b/gdb/gdbserver/i386-low.c index 86ec5d8595..4eacda0809 100644 --- a/gdb/gdbserver/i386-low.c +++ b/gdb/gdbserver/i386-low.c @@ -20,6 +20,7 @@ #include "server.h" #include "target.h" #include "i386-low.h" +#include "break-common.h" /* Support for 8-byte wide hw watchpoints. */ #ifndef TARGET_HAS_DR_LEN_8 @@ -27,14 +28,6 @@ #define TARGET_HAS_DR_LEN_8 (sizeof (void *) == 8) #endif -enum target_hw_bp_type - { - hw_write = 0, /* Common HW watchpoint */ - hw_read = 1, /* Read HW watchpoint */ - hw_access = 2, /* Access HW watchpoint */ - hw_execute = 3 /* Execute HW breakpoint */ - }; - /* DR7 Debug Control register fields. */ /* How many bits to skip in DR7 to get to R/W and LEN fields. */ -- 2.34.1