f486487f55
This is a patch I extracted from Pedro's C++ branch. It contains the most trivial enum fixes, where an integer type/value was used instead of the appropriate enum type/value. It fixes many C++ errors, since in C++ you can't mix integers and enums implicitely. Regardless of the C++ conversion, I think this is a good cleanup to make use of the appropriate enum types. Regression-tested on native x86_64. gdb/ChangeLog: * aarch64-linux-nat.c (aarch64_linux_can_use_hw_breakpoint): Use enum type or value instead of integer. (aarch64_linux_insert_watchpoint): Likewise. (aarch64_linux_remove_watchpoint): Likewise. * ada-lang.c (ada_op_print_tab): Likewise. * amd64-linux-tdep.c (amd64_canonicalize_syscall): Likewise. (amd64_linux_syscall_record_common): Likewise. * arch-utils.c (target_byte_order_user): Likewise. (default_byte_order): Likewise. * arm-linux-nat.c (arm_linux_can_use_hw_breakpoint): Likewise. (arm_linux_get_hwbp_type): Likewise. (arm_linux_hw_watchpoint_initialize): Likewise. (arm_linux_insert_watchpoint): Likewise. * arm-linux-tdep.c (arm_canonicalize_syscall): Likewise. (arm_linux_syscall_record): Likewise. * breakpoint.c (update_watchpoint): Likewise. (breakpoint_here_p): Likewise. (bpstat_print): Likewise. (enable_breakpoint_disp): Likewise. * c-lang.c (c_op_print_tab): Likewise. * cli/cli-decode.c (add_info_alias): Likewise. * d-lang.c (d_op_print_tab): Likewise. * eval.c (evaluate_subexp_standard): Likewise. * f-exp.y (dot_ops): Likewise. (f77_keywords): Likewise. * f-lang.c (f_op_print_tab): Likewise. * go-lang.c (go_op_print_tab): Likewise. * guile/scm-breakpoint.c (gdbscm_make_breakpoint): Likewise. * guile/scm-cmd.c (gdbscm_make_command): Likewise. * guile/scm-param.c (gdbscm_make_parameter): Likewise. * guile/scm-pretty-print.c (gdbscm_apply_val_pretty_printer): Likewise. * guile/scm-string.c (struct scm_to_stringn_data): Likewise. (struct scm_from_stringn_data): Likewise. * i386-linux-tdep.c (i386_canonicalize_syscall): Likewise. * ia64-linux-nat.c (ia64_linux_insert_watchpoint): Likewise. (ia64_linux_remove_watchpoint): Likewise. (ia64_linux_can_use_hw_breakpoint): Likewise. * infrun.c (print_stop_event): Likewise. * jv-lang.c (java_op_print_tab): Likewise. * linux-nat.c (linux_proc_xfer_partial): Likewise. * linux-nat.h (struct lwp_info): Likewise. * linux-thread-db.c (enable_thread_event): Likewise. * m2-lang.c (m2_op_print_tab): Likewise. * mi/mi-cmd-stack.c (mi_cmd_stack_list_locals): Likewise. (mi_cmd_stack_list_variables): Likewise. * mi/mi-main.c (mi_cmd_trace_frame_collected): Likewise. * mi/mi-out.c (mi_table_begin): Likewise. (mi_table_header): Likewise. * mips-linux-nat.c (mips_linux_can_use_hw_breakpoint): Likewise. (mips_linux_insert_watchpoint): Likewise. (mips_linux_remove_watchpoint): Likewise. * nat/mips-linux-watch.c (mips_linux_watch_type_to_irw): Likewise. * nat/mips-linux-watch.h (struct mips_watchpoint): Likewise. (mips_linux_watch_type_to_irw): Likewise. * nto-procfs.c (procfs_can_use_hw_breakpoint): Likewise. (procfs_insert_hw_watchpoint): Likewise. (procfs_remove_hw_watchpoint): Likewise. (procfs_hw_watchpoint): Likewise. (procfs_can_use_hw_breakpoint): Likewise. (procfs_remove_hw_watchpoint): Likewise. (procfs_insert_hw_watchpoint): Likewise. * p-lang.c (pascal_op_print_tab): Likewise. * ppc-linux-nat.c (ppc_linux_can_use_hw_breakpoint): Likewise. * ppc-linux-tdep.c (ppu2spu_unwind_register): Likewise. * ppc-sysv-tdep.c (get_decimal_float_return_value): Likewise. * procfs.c (procfs_can_use_hw_breakpoint): Likewise. (procfs_insert_watchpoint): Likewise. (procfs_remove_watchpoint): Likewise. * psymtab.c (recursively_search_psymtabs): Likewise. * remote-m32r-sdi.c (m32r_can_use_hw_watchpoint): Likewise. (m32r_insert_watchpoint): Likewise. * remote-mips.c (mips_can_use_watchpoint): Likewise. (mips_insert_watchpoint): Likewise. (mips_remove_watchpoint): Likewise. * remote.c (watchpoint_to_Z_packet): Likewise. (remote_insert_watchpoint): Likewise. (remote_remove_watchpoint): Likewise. (remote_check_watch_resources): Likewise. * s390-linux-nat.c (s390_insert_watchpoint): Likewise. (s390_remove_watchpoint): Likewise. (s390_can_use_hw_breakpoint): Likewise. * s390-linux-tdep.c (s390_gdbarch_init): Likewise. * spu-linux-nat.c (spu_can_use_hw_breakpoint): Likewise. * target.h (struct target_ops): Likewise. * tilegx-tdep.c (tilegx_analyze_prologue): Likewise. * ui-out.c (struct ui_out_hdr): Likewise. (append_header_to_list): Likewise. (get_next_header): Likewise. (verify_field): Likewise. (ui_out_begin): Likewise. (ui_out_field_int): Likewise. (ui_out_field_fmt_int): Likewise. (ui_out_field_skip): Likewise. (ui_out_field_string): Likewise. (ui_out_field_fmt): Likewise. * varobj.c (new_variable): Likewise. * x86-nat.c (x86_insert_watchpoint): Likewise. (x86_remove_watchpoint): Likewise. (x86_can_use_hw_breakpoint): Likewise. * xtensa-tdep.h (struct gdbarch_tdep): Likewise. * inflow.c (enum gdb_has_a_terminal_flag_enum): Add name to previously anonymous enumeration type.. * linux-record.h (enum gdb_syscall): Add gdb_sys_no_syscall value. * target-debug.h (target_debug_print_enum_target_hw_bp_type): New. (target_debug_print_enum_bptype): New. * target-delegates.c: Regenerate.
118 lines
3.7 KiB
C
118 lines
3.7 KiB
C
/* Copyright (C) 2009-2015 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 <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef MIPS_LINUX_WATCH_H
|
|
#define MIPS_LINUX_WATCH_H 1
|
|
|
|
#include <asm/ptrace.h>
|
|
#include "break-common.h"
|
|
|
|
#define MAX_DEBUG_REGISTER 8
|
|
|
|
/* If macro PTRACE_GET_WATCH_REGS is not defined, kernel header doesn't
|
|
have hardware watchpoint-related structures. Define them below. */
|
|
|
|
#ifndef PTRACE_GET_WATCH_REGS
|
|
# define PTRACE_GET_WATCH_REGS 0xd0
|
|
# define PTRACE_SET_WATCH_REGS 0xd1
|
|
|
|
enum pt_watch_style {
|
|
pt_watch_style_mips32,
|
|
pt_watch_style_mips64
|
|
};
|
|
|
|
/* A value of zero in a watchlo indicates that it is available. */
|
|
|
|
struct mips32_watch_regs
|
|
{
|
|
uint32_t watchlo[MAX_DEBUG_REGISTER];
|
|
/* Lower 16 bits of watchhi. */
|
|
uint16_t watchhi[MAX_DEBUG_REGISTER];
|
|
/* Valid mask and I R W bits.
|
|
* bit 0 -- 1 if W bit is usable.
|
|
* bit 1 -- 1 if R bit is usable.
|
|
* bit 2 -- 1 if I bit is usable.
|
|
* bits 3 - 11 -- Valid watchhi mask bits.
|
|
*/
|
|
uint16_t watch_masks[MAX_DEBUG_REGISTER];
|
|
/* The number of valid watch register pairs. */
|
|
uint32_t num_valid;
|
|
/* There is confusion across gcc versions about structure alignment,
|
|
so we force 8 byte alignment for these structures so they match
|
|
the kernel even if it was build with a different gcc version. */
|
|
} __attribute__ ((aligned (8)));
|
|
|
|
struct mips64_watch_regs
|
|
{
|
|
uint64_t watchlo[MAX_DEBUG_REGISTER];
|
|
uint16_t watchhi[MAX_DEBUG_REGISTER];
|
|
uint16_t watch_masks[MAX_DEBUG_REGISTER];
|
|
uint32_t num_valid;
|
|
} __attribute__ ((aligned (8)));
|
|
|
|
struct pt_watch_regs
|
|
{
|
|
enum pt_watch_style style;
|
|
union
|
|
{
|
|
struct mips32_watch_regs mips32;
|
|
struct mips64_watch_regs mips64;
|
|
};
|
|
};
|
|
|
|
#endif /* !PTRACE_GET_WATCH_REGS */
|
|
|
|
#define W_BIT 0
|
|
#define R_BIT 1
|
|
#define I_BIT 2
|
|
|
|
#define W_MASK (1 << W_BIT)
|
|
#define R_MASK (1 << R_BIT)
|
|
#define I_MASK (1 << I_BIT)
|
|
|
|
#define IRW_MASK (I_MASK | R_MASK | W_MASK)
|
|
|
|
/* We keep list of all watchpoints we should install and calculate the
|
|
watch register values each time the list changes. This allows for
|
|
easy sharing of watch registers for more than one watchpoint. */
|
|
|
|
struct mips_watchpoint
|
|
{
|
|
CORE_ADDR addr;
|
|
int len;
|
|
enum target_hw_bp_type type;
|
|
struct mips_watchpoint *next;
|
|
};
|
|
|
|
uint32_t mips_linux_watch_get_num_valid (struct pt_watch_regs *regs);
|
|
uint32_t mips_linux_watch_get_irw_mask (struct pt_watch_regs *regs, int n);
|
|
CORE_ADDR mips_linux_watch_get_watchlo (struct pt_watch_regs *regs, int n);
|
|
void mips_linux_watch_set_watchlo (struct pt_watch_regs *regs, int n,
|
|
CORE_ADDR value);
|
|
uint32_t mips_linux_watch_get_watchhi (struct pt_watch_regs *regs, int n);
|
|
void mips_linux_watch_set_watchhi (struct pt_watch_regs *regs, int n,
|
|
uint16_t value);
|
|
int mips_linux_watch_try_one_watch (struct pt_watch_regs *regs,
|
|
CORE_ADDR addr, int len, uint32_t irw);
|
|
void mips_linux_watch_populate_regs (struct mips_watchpoint *current_watches,
|
|
struct pt_watch_regs *regs);
|
|
uint32_t mips_linux_watch_type_to_irw (enum target_hw_bp_type type);
|
|
|
|
int mips_linux_read_watch_registers (long lwpid,
|
|
struct pt_watch_regs *watch_readback,
|
|
int *watch_readback_valid, int force);
|
|
#endif
|