From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eli Zaretskii To: msnyder@redhat.com, gdb-patches@sources.redhat.com, ac131313@cygnus.com Subject: Re: [RFA] enum enable Date: Sun, 29 Jul 2001 00:49:00 -0000 Message-id: <200107290750.KAA01200@is.elta.co.il> References: <3B4E41B5.64FB@redhat.com> <3028-Sat14Jul2001140821+0300-eliz@is.elta.co.il> X-SW-Source: 2001-07/msg00707.html Ping! Is it okay to commit this, trunk and branch? > Date: Sat, 14 Jul 2001 14:08:22 +0300 > From: "Eli Zaretskii" > CC: gdb-patches@sources.redhat.com, ac131313@cygnus.com > Reply-to: Eli Zaretskii > > > Date: Thu, 12 Jul 2001 17:32:53 -0700 > > From: Michael Snyder > > > > Eli Zaretskii wrote: > > > > > > Is it possible to rename the enum to something less general, such as > > > `enum bp_enable'? > > > > It's been discussed before, and I think the consensus > > was that it is a good idea. I'm certainly open to it. > > Here's what I came up with. This includes changes to TUI files, since > they used the affected members of struct breakpoint. > > Please review. > > 2001-07-14 Eli Zaretskii > > The following changes avoid polluting global namespace with the > `enable' and `disable' identifiers, because some platforms define > in their system headers symbols with global scope that go by those > names. > > * breakpoint.h (enum enable_state): Rename from `enum enable'. > Also rename all the enum members to have the "bp_" prefix. > (struct breakpoint): Rename the `enable' member to `enable_state'. > (enum bpdisp): Rename all members to have the "disp_" prefix. > > * breakpoint.c: All users of `enum enable' and `enum bpdisp' > changed. > (args_for_catchpoint_enable): Rename the `enable' member to > `enable_p'. All users changed. > > * tracepoint.h (enum enable): Remove. > (struct tracepoint): The member `enabled' is now `int enabled_p'. > > * tracepoint.c: All users of the `enabled' member changed. > > * printcmd.c (struct display): The `status' member is now an int. > > * memattr.h (struct mem_region): Rename the `status' member to > `enabled_p'. > (enum enable): Remove. > > * memattr.c: Change all users of the `status' member of struct > mem_region to use `enabled_p' instead. > > * infcmd.c (run_stack_dummy): Use disp_del instead of del. > > * go32-nat.c: Remove the kludgey work-around for conflicts between > and "breakpoint.h". > > > --- gdb/breakpoint.h~0 Sun May 6 04:35:56 2001 > +++ gdb/breakpoint.h Sat Jul 14 13:09:40 2001 > @@ -133,21 +133,21 @@ > > /* States of enablement of breakpoint. */ > > -enum enable > +enum enable_state > { > - disabled, /* The eventpoint is inactive, and cannot trigger. */ > - enabled, /* The eventpoint is active, and can trigger. */ > - shlib_disabled, /* The eventpoint's address is in an unloaded solib. > + bp_disabled, /* The eventpoint is inactive, and cannot trigger. */ > + bp_enabled, /* The eventpoint is active, and can trigger. */ > + bp_shlib_disabled, /* The eventpoint's address is in an unloaded solib. > The eventpoint will be automatically enabled > and reset when that solib is loaded. */ > - call_disabled, /* The eventpoint has been disabled while a call > + bp_call_disabled, /* The eventpoint has been disabled while a call > into the inferior is "in flight", because some > eventpoints interfere with the implementation of > a call on some targets. The eventpoint will be > automatically enabled and reset when the call > "lands" (either completes, or stops at another > eventpoint). */ > - permanent /* There is a breakpoint instruction hard-wired into > + bp_permanent /* There is a breakpoint instruction hard-wired into > the target's code. Don't try to write another > breakpoint instruction on top of it, or restore > its value. Step over it using the architecture's > @@ -159,10 +159,10 @@ > > enum bpdisp > { > - del, /* Delete it */ > - del_at_next_stop, /* Delete at next stop, whether hit or not */ > - disable, /* Disable it */ > - donttouch /* Leave it alone */ > + disp_del, /* Delete it */ > + disp_del_at_next_stop, /* Delete at next stop, whether hit or not */ > + disp_disable, /* Disable it */ > + disp_donttouch /* Leave it alone */ > }; > > enum target_hw_bp_type > @@ -187,7 +187,7 @@ > /* Type of breakpoint. */ > enum bptype type; > /* Zero means disabled; remember the info but don't break here. */ > - enum enable enable; > + enum enable_state enable_state; > /* What to do with this breakpoint after we hit it. */ > enum bpdisp disposition; > /* Number assigned to distinguish breakpoints. */ > > > --- gdb/breakpoint.c~0 Wed May 23 03:52:44 2001 > +++ gdb/breakpoint.c Sat Jul 14 13:21:16 2001 > @@ -135,7 +135,7 @@ static enum print_stop_action print_bp_s > typedef struct > { > enum exception_event_kind kind; > - int enable; > + int enable_p; > } > args_for_catchpoint_enable; > > @@ -721,7 +721,7 @@ insert_breakpoints (void) > > ALL_BREAKPOINTS_SAFE (b, temp) > { > - if (b->enable == permanent) > + if (b->enable_state == bp_permanent) > /* Permanent breakpoints cannot be inserted or removed. */ > continue; > else if (b->type != bp_watchpoint > @@ -733,9 +733,9 @@ insert_breakpoints (void) > && b->type != bp_catch_exec > && b->type != bp_catch_throw > && b->type != bp_catch_catch > - && b->enable != disabled > - && b->enable != shlib_disabled > - && b->enable != call_disabled > + && b->enable_state != bp_disabled > + && b->enable_state != bp_shlib_disabled > + && b->enable_state != bp_call_disabled > && !b->inserted > && !b->duplicate) > { > @@ -774,7 +774,7 @@ insert_breakpoints (void) > { > /* See also: disable_breakpoints_in_shlibs. */ > val = 0; > - b->enable = shlib_disabled; > + b->enable_state = bp_shlib_disabled; > if (!disabled_breaks) > { > target_terminal_ours_for_output (); > @@ -802,9 +802,9 @@ insert_breakpoints (void) > return_val = val; /* remember failure */ > } > else if (ep_is_exception_catchpoint (b) > - && b->enable != disabled > - && b->enable != shlib_disabled > - && b->enable != call_disabled > + && b->enable_state != bp_disabled > + && b->enable_state != bp_shlib_disabled > + && b->enable_state != bp_call_disabled > && !b->inserted > && !b->duplicate) > > @@ -822,7 +822,7 @@ insert_breakpoints (void) > target_terminal_ours_for_output (); > warning ("Cannot insert catchpoint %d; disabling it.", > b->number); > - b->enable = disabled; > + b->enable_state = bp_disabled; > } > else > { > @@ -831,7 +831,7 @@ insert_breakpoints (void) > args_for_catchpoint_enable args; > args.kind = b->type == bp_catch_catch ? > EX_EVENT_CATCH : EX_EVENT_THROW; > - args.enable = 1; > + args.enable_p = 1; > val = catch_errors (cover_target_enable_exception_callback, > &args, > message, RETURN_MASK_ALL); > @@ -846,7 +846,7 @@ insert_breakpoints (void) > target_terminal_ours_for_output (); > warning ("Cannot insert catchpoint %d; disabling it.", > b->number); > - b->enable = disabled; > + b->enable_state = bp_disabled; > } > } > > @@ -857,8 +857,8 @@ insert_breakpoints (void) > else if ((b->type == bp_hardware_watchpoint || > b->type == bp_read_watchpoint || > b->type == bp_access_watchpoint) > - && b->enable == enabled > - && b->disposition != del_at_next_stop > + && b->enable_state == bp_enabled > + && b->disposition != disp_del_at_next_stop > && !b->inserted > && !b->duplicate) > { > @@ -965,8 +965,8 @@ insert_breakpoints (void) > printf_filtered ("because the program has left the block \n"); > printf_filtered ("in which its expression is valid.\n"); > if (b->related_breakpoint) > - b->related_breakpoint->disposition = del_at_next_stop; > - b->disposition = del_at_next_stop; > + b->related_breakpoint->disposition = disp_del_at_next_stop; > + b->disposition = disp_del_at_next_stop; > } > > /* Restore the frame and level. */ > @@ -980,7 +980,7 @@ insert_breakpoints (void) > else if ((b->type == bp_catch_fork > || b->type == bp_catch_vfork > || b->type == bp_catch_exec) > - && b->enable == enabled > + && b->enable_state == bp_enabled > && !b->inserted > && !b->duplicate) > { > @@ -1249,7 +1249,7 @@ remove_breakpoint (struct breakpoint *b, > { > int val; > > - if (b->enable == permanent) > + if (b->enable_state == bp_permanent) > /* Permanent breakpoints cannot be inserted or removed. */ > return 0; > > @@ -1301,7 +1301,7 @@ remove_breakpoint (struct breakpoint *b, > else if ((b->type == bp_hardware_watchpoint || > b->type == bp_read_watchpoint || > b->type == bp_access_watchpoint) > - && b->enable == enabled > + && b->enable_state == bp_enabled > && !b->duplicate) > { > value_ptr v, n; > @@ -1356,7 +1356,7 @@ remove_breakpoint (struct breakpoint *b, > else if ((b->type == bp_catch_fork || > b->type == bp_catch_vfork || > b->type == bp_catch_exec) > - && b->enable == enabled > + && b->enable_state == bp_enabled > && !b->duplicate) > { > val = -1; > @@ -1381,7 +1381,7 @@ remove_breakpoint (struct breakpoint *b, > } > else if ((b->type == bp_catch_catch || > b->type == bp_catch_throw) > - && b->enable == enabled > + && b->enable_state == bp_enabled > && !b->duplicate) > { > > @@ -1392,7 +1392,7 @@ remove_breakpoint (struct breakpoint *b, > } > else if (ep_is_exception_catchpoint (b) > && b->inserted /* sometimes previous insert doesn't happen */ > - && b->enable == enabled > + && b->enable_state == bp_enabled > && !b->duplicate) > { > > @@ -1503,15 +1503,15 @@ breakpoint_here_p (CORE_ADDR pc) > int any_breakpoint_here = 0; > > ALL_BREAKPOINTS (b) > - if ((b->enable == enabled > - || b->enable == permanent) > + if ((b->enable_state == bp_enabled > + || b->enable_state == bp_permanent) > && b->address == pc) /* bp is enabled and matches pc */ > { > if (overlay_debugging && > section_is_overlay (b->section) && > !section_is_mapped (b->section)) > continue; /* unmapped overlay -- can't be a match */ > - else if (b->enable == permanent) > + else if (b->enable_state == bp_permanent) > return permanent_breakpoint_here; > else > any_breakpoint_here = 1; > @@ -1589,9 +1589,9 @@ breakpoint_thread_match (CORE_ADDR pc, p > thread = pid_to_thread_id (ptid); > > ALL_BREAKPOINTS (b) > - if (b->enable != disabled > - && b->enable != shlib_disabled > - && b->enable != call_disabled > + if (b->enable_state != bp_disabled > + && b->enable_state != bp_shlib_disabled > + && b->enable_state != bp_call_disabled > && b->address == pc > && (b->thread == -1 || b->thread == thread)) > { > @@ -2360,8 +2360,8 @@ which its expression is valid.\n", bs->b > #endif > > if (b->related_breakpoint) > - b->related_breakpoint->disposition = del_at_next_stop; > - b->disposition = del_at_next_stop; > + b->related_breakpoint->disposition = disp_del_at_next_stop; > + b->disposition = disp_del_at_next_stop; > > return WP_DELETED; > } > @@ -2408,9 +2408,9 @@ bpstat_stop_status (CORE_ADDR *pc, int n > > ALL_BREAKPOINTS_SAFE (b, temp) > { > - if (b->enable == disabled > - || b->enable == shlib_disabled > - || b->enable == call_disabled) > + if (b->enable_state == bp_disabled > + || b->enable_state == bp_shlib_disabled > + || b->enable_state == bp_call_disabled) > continue; > > if (b->type != bp_watchpoint > @@ -2517,8 +2517,8 @@ bpstat_stop_status (CORE_ADDR *pc, int n > /* Error from catch_errors. */ > printf_filtered ("Watchpoint %d deleted.\n", b->number); > if (b->related_breakpoint) > - b->related_breakpoint->disposition = del_at_next_stop; > - b->disposition = del_at_next_stop; > + b->related_breakpoint->disposition = disp_del_at_next_stop; > + b->disposition = disp_del_at_next_stop; > /* We've already printed what needs to be printed. */ > bs->print_it = print_it_done; > > @@ -2589,8 +2589,8 @@ bpstat_stop_status (CORE_ADDR *pc, int n > /* Error from catch_errors. */ > printf_filtered ("Watchpoint %d deleted.\n", b->number); > if (b->related_breakpoint) > - b->related_breakpoint->disposition = del_at_next_stop; > - b->disposition = del_at_next_stop; > + b->related_breakpoint->disposition = disp_del_at_next_stop; > + b->disposition = disp_del_at_next_stop; > /* We've already printed what needs to be printed. */ > bs->print_it = print_it_done; > break; > @@ -2649,8 +2649,8 @@ bpstat_stop_status (CORE_ADDR *pc, int n > else > { > /* We will stop here */ > - if (b->disposition == disable) > - b->enable = disabled; > + if (b->disposition == disp_disable) > + b->enable_state = bp_disabled; > bs->commands = b->commands; > if (b->silent) > bs->print = 0; > @@ -2991,7 +2991,7 @@ bpstat_should_step (void) > { > struct breakpoint *b; > ALL_BREAKPOINTS (b) > - if (b->enable == enabled && b->type == bp_watchpoint) > + if (b->enable_state == bp_enabled && b->type == bp_watchpoint) > return 1; > return 0; > } > @@ -3002,7 +3002,7 @@ bpstat_have_active_hw_watchpoints (void) > { > struct breakpoint *b; > ALL_BREAKPOINTS (b) > - if ((b->enable == enabled) && > + if ((b->enable_state == bp_enabled) && > (b->inserted) && > ((b->type == bp_hardware_watchpoint) || > (b->type == bp_read_watchpoint) || > @@ -3161,10 +3161,10 @@ print_one_breakpoint (struct breakpoint > /* 4 */ > annotate_field (3); > #ifdef UI_OUT > - ui_out_field_fmt (uiout, "enabled", "%c", bpenables[(int) b->enable]); > + ui_out_field_fmt (uiout, "enabled", "%c", bpenables[(int) b->enable_state]); > ui_out_spaces (uiout, 2); > #else > - printf_filtered ("%-3c ", bpenables[(int) b->enable]); > + printf_filtered ("%-3c ", bpenables[(int) b->enable_state]); > #endif > > /* 5 and 6 */ > @@ -3708,10 +3708,10 @@ describe_other_breakpoints (CORE_ADDR pc > others--; > printf_filtered ("%d%s%s ", > b->number, > - ((b->enable == disabled || > - b->enable == shlib_disabled || > - b->enable == call_disabled) ? " (disabled)" > - : b->enable == permanent ? " (permanent)" > + ((b->enable_state == bp_disabled || > + b->enable_state == bp_shlib_disabled || > + b->enable_state == bp_call_disabled) ? " (disabled)" > + : b->enable_state == bp_permanent ? " (permanent)" > : ""), > (others > 1) ? "," > : ((others == 1) ? " and" : "")); > @@ -3788,15 +3788,15 @@ check_duplicates (struct breakpoint *bpt > return; > > ALL_BREAKPOINTS (b) > - if (b->enable != disabled > - && b->enable != shlib_disabled > - && b->enable != call_disabled > + if (b->enable_state != bp_disabled > + && b->enable_state != bp_shlib_disabled > + && b->enable_state != bp_call_disabled > && b->address == address > && (overlay_debugging == 0 || b->section == section) > && breakpoint_address_is_meaningful (b)) > { > /* Have we found a permanent breakpoint? */ > - if (b->enable == permanent) > + if (b->enable_state == bp_permanent) > { > perm_bp = b; > break; > @@ -3827,9 +3827,9 @@ check_duplicates (struct breakpoint *bpt > "another breakpoint was inserted on top of " > "a permanent breakpoint"); > > - if (b->enable != disabled > - && b->enable != shlib_disabled > - && b->enable != call_disabled > + if (b->enable_state != bp_disabled > + && b->enable_state != bp_shlib_disabled > + && b->enable_state != bp_call_disabled > && b->address == address > && (overlay_debugging == 0 || b->section == section) > && breakpoint_address_is_meaningful (b)) > @@ -3872,7 +3872,7 @@ set_raw_breakpoint (struct symtab_and_li > b->input_radix = input_radix; > b->thread = -1; > b->line_number = sal.line; > - b->enable = enabled; > + b->enable_state = bp_enabled; > b->next = 0; > b->silent = 0; > b->ignore_count = 0; > @@ -3909,7 +3909,7 @@ set_raw_breakpoint (struct symtab_and_li > void > make_breakpoint_permanent (struct breakpoint *b) > { > - b->enable = permanent; > + b->enable_state = bp_permanent; > > /* By definition, permanent breakpoints are already present in the code. */ > b->inserted = 1; > @@ -3939,8 +3939,8 @@ create_longjmp_breakpoint (char *func_na > b = set_raw_breakpoint (sal, > func_name != NULL ? bp_longjmp : bp_longjmp_resume); > > - b->disposition = donttouch; > - b->enable = disabled; > + b->disposition = disp_donttouch; > + b->enable_state = bp_disabled; > b->silent = 1; > if (func_name) > b->addr_string = xstrdup (func_name); > @@ -3961,7 +3961,7 @@ enable_longjmp_breakpoint (void) > ALL_BREAKPOINTS (b) > if (b->type == bp_longjmp) > { > - b->enable = enabled; > + b->enable_state = bp_enabled; > check_duplicates (b); > } > } > @@ -3975,7 +3975,7 @@ disable_longjmp_breakpoint (void) > if (b->type == bp_longjmp > || b->type == bp_longjmp_resume) > { > - b->enable = disabled; > + b->enable_state = bp_disabled; > check_duplicates (b); > } > } > @@ -3993,8 +3993,8 @@ create_thread_event_breakpoint (CORE_ADD > b = set_raw_breakpoint (sal, bp_thread_event); > > b->number = internal_breakpoint_number--; > - b->disposition = donttouch; > - b->enable = enabled; > + b->disposition = disp_donttouch; > + b->enable_state = bp_enabled; > /* addr_string has to be used or breakpoint_re_set will delete me. */ > sprintf (addr_string, "*0x%s", paddr (b->address)); > b->addr_string = xstrdup (addr_string); > @@ -4034,7 +4034,7 @@ create_solib_event_breakpoint (CORE_ADDR > sal.section = find_pc_overlay (sal.pc); > b = set_raw_breakpoint (sal, bp_shlib_event); > b->number = internal_breakpoint_number--; > - b->disposition = donttouch; > + b->disposition = disp_donttouch; > > return b; > } > @@ -4054,11 +4054,11 @@ disable_breakpoints_in_shlibs (int silen > #if defined (PC_SOLIB) > if (((b->type == bp_breakpoint) || > (b->type == bp_hardware_breakpoint)) && > - b->enable == enabled && > + b->enable_state == bp_enabled && > !b->duplicate && > PC_SOLIB (b->address)) > { > - b->enable = shlib_disabled; > + b->enable_state = bp_shlib_disabled; > if (!silent) > { > if (!disabled_shlib_breaks) > @@ -4081,14 +4081,14 @@ re_enable_breakpoints_in_shlibs (void) > struct breakpoint *b; > > ALL_BREAKPOINTS (b) > - if (b->enable == shlib_disabled) > + if (b->enable_state == bp_shlib_disabled) > { > char buf[1]; > > /* Do not reenable the breakpoint if the shared library > is still not mapped in. */ > if (target_read_memory (b->address, buf, 1) == 0) > - b->enable = enabled; > + b->enable_state = bp_enabled; > } > } > > @@ -4155,8 +4155,8 @@ solib_load_unload_1 (char *hookname, int > else if (addr_start) > b->addr_string = savestring (addr_start, addr_end - addr_start); > > - b->enable = enabled; > - b->disposition = tempflag ? del : donttouch; > + b->enable_state = bp_enabled; > + b->disposition = tempflag ? disp_del : disp_donttouch; > > if (dll_pathname == NULL) > b->dll_pathname = NULL; > @@ -4207,8 +4207,8 @@ create_fork_vfork_event_catchpoint (int > NULL : savestring (cond_string, strlen (cond_string)); > b->thread = thread; > b->addr_string = NULL; > - b->enable = enabled; > - b->disposition = tempflag ? del : donttouch; > + b->enable_state = bp_enabled; > + b->disposition = tempflag ? disp_del : disp_donttouch; > b->forked_inferior_pid = 0; > > mention (b); > @@ -4246,8 +4246,8 @@ create_exec_event_catchpoint (int tempfl > NULL : savestring (cond_string, strlen (cond_string)); > b->thread = thread; > b->addr_string = NULL; > - b->enable = enabled; > - b->disposition = tempflag ? del : donttouch; > + b->enable_state = bp_enabled; > + b->disposition = tempflag ? disp_del : disp_donttouch; > > mention (b); > } > @@ -4260,7 +4260,7 @@ hw_breakpoint_used_count (void) > > ALL_BREAKPOINTS (b) > { > - if (b->type == bp_hardware_breakpoint && b->enable == enabled) > + if (b->type == bp_hardware_breakpoint && b->enable_state == bp_enabled) > i++; > } > > @@ -4276,14 +4276,14 @@ hw_watchpoint_used_count (enum bptype ty > *other_type_used = 0; > ALL_BREAKPOINTS (b) > { > - if (b->enable == enabled) > + if (b->enable_state == bp_enabled) > { > if (b->type == type) > i++; > else if ((b->type == bp_hardware_watchpoint || > b->type == bp_read_watchpoint || > b->type == bp_access_watchpoint) > - && b->enable == enabled) > + && b->enable_state == bp_enabled) > *other_type_used = 1; > } > } > @@ -4305,7 +4305,7 @@ set_longjmp_resume_breakpoint (CORE_ADDR > if (b->type == bp_longjmp_resume) > { > b->address = pc; > - b->enable = enabled; > + b->enable_state = bp_enabled; > if (frame != NULL) > b->frame = frame->frame; > else > @@ -4327,9 +4327,9 @@ disable_watchpoints_before_interactive_c > || (b->type == bp_read_watchpoint) > || (b->type == bp_access_watchpoint) > || ep_is_exception_catchpoint (b)) > - && (b->enable == enabled)) > + && (b->enable_state == bp_enabled)) > { > - b->enable = call_disabled; > + b->enable_state = bp_call_disabled; > check_duplicates (b); > } > } > @@ -4347,9 +4347,9 @@ enable_watchpoints_after_interactive_cal > || (b->type == bp_read_watchpoint) > || (b->type == bp_access_watchpoint) > || ep_is_exception_catchpoint (b)) > - && (b->enable == call_disabled)) > + && (b->enable_state == bp_call_disabled)) > { > - b->enable = enabled; > + b->enable_state = bp_enabled; > check_duplicates (b); > } > } > @@ -4366,8 +4366,8 @@ set_momentary_breakpoint (struct symtab_ > { > register struct breakpoint *b; > b = set_raw_breakpoint (sal, type); > - b->enable = enabled; > - b->disposition = donttouch; > + b->enable_state = bp_enabled; > + b->disposition = disp_donttouch; > b->frame = (frame ? frame->frame : 0); > > /* If we're debugging a multi-threaded program, then we > @@ -4597,7 +4597,7 @@ create_breakpoints (struct symtabs_and_l > b->addr_string = addr_string[i]; > b->cond_string = cond_string[i]; > b->ignore_count = ignore_count; > - b->enable = enabled; > + b->enable_state = bp_enabled; > b->disposition = disposition; > mention (b); > } > @@ -4822,7 +4822,7 @@ break_command_1 (char *arg, int flag, in > > create_breakpoints (sals, addr_string, cond, cond_string, > hardwareflag ? bp_hardware_breakpoint : bp_breakpoint, > - tempflag ? del : donttouch, > + tempflag ? disp_del : disp_donttouch, > thread, ignore_count, from_tty); > > if (sals.nelts > 1) > @@ -4934,7 +4934,7 @@ do_captured_breakpoint (void *data) > > create_breakpoints (sals, addr_string, cond, cond_string, > args->hardwareflag ? bp_hardware_breakpoint : bp_breakpoint, > - args->tempflag ? del : donttouch, > + args->tempflag ? disp_del : disp_donttouch, > args->thread, args->ignore_count, 0/*from-tty*/); > > /* That's it. Discard the cleanups for data inserted into the > @@ -5400,7 +5400,7 @@ watch_command_1 (char *arg, int accessfl > b = set_raw_breakpoint (sal, bp_type); > set_breakpoint_count (breakpoint_count + 1); > b->number = breakpoint_count; > - b->disposition = donttouch; > + b->disposition = disp_donttouch; > b->exp = exp; > b->exp_valid_block = exp_valid_block; > b->exp_string = savestring (exp_start, exp_end - exp_start); > @@ -5439,10 +5439,10 @@ watch_command_1 (char *arg, int accessfl > set_breakpoint_count (breakpoint_count + 1); > scope_breakpoint->number = breakpoint_count; > > - scope_breakpoint->enable = enabled; > + scope_breakpoint->enable_state = bp_enabled; > > /* Automatically delete the breakpoint when it hits. */ > - scope_breakpoint->disposition = del; > + scope_breakpoint->disposition = disp_del; > > /* Only break in the proper frame (help with recursion). */ > scope_breakpoint->frame = prev_frame->frame; > @@ -6193,8 +6193,8 @@ create_exception_catchpoint (int tempfla > NULL : savestring (cond_string, strlen (cond_string)); > b->thread = thread; > b->addr_string = NULL; > - b->enable = enabled; > - b->disposition = tempflag ? del : donttouch; > + b->enable_state = bp_enabled; > + b->disposition = tempflag ? disp_del : disp_donttouch; > mention (b); > } > > @@ -6257,7 +6257,7 @@ cover_target_enable_exception_callback ( > { > args_for_catchpoint_enable *args = arg; > struct symtab_and_line *sal; > - sal = target_enable_exception_callback (args->kind, args->enable); > + sal = target_enable_exception_callback (args->kind, args->enable_p); > if (sal == NULL) > return 0; > else if (sal == (struct symtab_and_line *) -1) > @@ -6357,8 +6357,8 @@ handle_gnu_4_16_catch_command (char *arg > b->number = breakpoint_count; > > b->cond = cond; > - b->enable = enabled; > - b->disposition = tempflag ? del : donttouch; > + b->enable_state = bp_enabled; > + b->disposition = tempflag ? disp_del : disp_donttouch; > > mention (b); > } > @@ -6387,8 +6387,8 @@ create_temp_exception_breakpoint (CORE_A > > b = set_raw_breakpoint (sal, bp_breakpoint); > > - b->disposition = del; > - b->enable = enabled; > + b->disposition = disp_del; > + b->enable_state = bp_enabled; > b->silent = 1; > b->number = internal_breakpoint_number--; > return b; > @@ -6712,13 +6712,13 @@ breakpoint_auto_delete (bpstat bs) > struct breakpoint *b, *temp; > > for (; bs; bs = bs->next) > - if (bs->breakpoint_at && bs->breakpoint_at->disposition == del > + if (bs->breakpoint_at && bs->breakpoint_at->disposition == disp_del > && bs->stop) > delete_breakpoint (bs->breakpoint_at); > > ALL_BREAKPOINTS_SAFE (b, temp) > { > - if (b->disposition == del_at_next_stop) > + if (b->disposition == disp_del_at_next_stop) > delete_breakpoint (b); > } > } > @@ -6778,7 +6778,7 @@ delete_breakpoint (struct breakpoint *bp > sprintf (message, message1, bpt->number); > args.kind = bpt->type == bp_catch_catch ? > EX_EVENT_CATCH : EX_EVENT_THROW; > - args.enable = 0; > + args.enable_p = 0; > catch_errors (cover_target_enable_exception_callback, &args, > message, RETURN_MASK_ALL); > } > @@ -6826,9 +6826,9 @@ delete_breakpoint (struct breakpoint *bp > if (b->address == bpt->address > && b->section == bpt->section > && !b->duplicate > - && b->enable != disabled > - && b->enable != shlib_disabled > - && b->enable != call_disabled) > + && b->enable_state != bp_disabled > + && b->enable_state != bp_shlib_disabled > + && b->enable_state != bp_call_disabled) > { > int val; > > @@ -6836,7 +6836,7 @@ delete_breakpoint (struct breakpoint *bp > breakpoint at the same address as the one being deleted. > If there is a permanent breakpoint somewhere, it should > always be the only one inserted. */ > - if (b->enable == permanent) > + if (b->enable_state == bp_permanent) > internal_error (__FILE__, __LINE__, > "another breakpoint was inserted on top of " > "a permanent breakpoint"); > @@ -6972,7 +6972,7 @@ breakpoint_re_set_one (PTR bint) > int i; > struct symtabs_and_lines sals; > char *s; > - enum enable save_enable; > + enum enable_state save_enable; > > switch (b->type) > { > @@ -6992,8 +6992,8 @@ breakpoint_re_set_one (PTR bint) > } > /* In case we have a problem, disable this breakpoint. We'll restore > its status if we succeed. */ > - save_enable = b->enable; > - b->enable = disabled; > + save_enable = b->enable_state; > + b->enable_state = bp_disabled; > > set_language (b->language); > input_radix = b->input_radix; > @@ -7049,7 +7049,7 @@ breakpoint_re_set_one (PTR bint) > breakpoints_changed (); > } > b->section = sals.sals[i].section; > - b->enable = save_enable; /* Restore it, this worked. */ > + b->enable_state = save_enable; /* Restore it, this worked. */ > > > /* Now that this is re-enabled, check_duplicates > @@ -7093,7 +7093,7 @@ breakpoint_re_set_one (PTR bint) > xfree (b->cond); > b->cond = parse_exp_1 (&s, (struct block *) 0, 0); > } > - if (b->enable == enabled) > + if (b->enable_state == bp_enabled) > mention (b); > value_free_to_mark (mark); > break; > @@ -7314,10 +7314,10 @@ disable_breakpoint (struct breakpoint *b > return; > > /* You can't disable permanent breakpoints. */ > - if (bpt->enable == permanent) > + if (bpt->enable_state == bp_permanent) > return; > > - bpt->enable = disabled; > + bpt->enable_state = bp_disabled; > > check_duplicates (bpt); > > @@ -7381,8 +7381,8 @@ do_enable_breakpoint (struct breakpoint > error ("Hardware breakpoints used exceeds limit."); > } > > - if (bpt->enable != permanent) > - bpt->enable = enabled; > + if (bpt->enable_state != bp_permanent) > + bpt->enable_state = bp_enabled; > bpt->disposition = disposition; > check_duplicates (bpt); > breakpoints_changed (); > @@ -7406,7 +7406,7 @@ do_enable_breakpoint (struct breakpoint > printf_filtered ("\ > Cannot enable watchpoint %d because the block in which its expression\n\ > is valid is not currently in scope.\n", bpt->number); > - bpt->enable = disabled; > + bpt->enable_state = bp_disabled; > return; > } > > @@ -7440,7 +7440,7 @@ is valid is not currently in scope.\n", > printf_filtered ("\ > Cannot enable watchpoint %d because target watch resources\n\ > have been allocated for other watchpoints.\n", bpt->number); > - bpt->enable = disabled; > + bpt->enable_state = bp_disabled; > value_free_to_mark (mark); > return; > } > @@ -7502,7 +7502,7 @@ enable_command (char *args, int from_tty > static void > enable_once_breakpoint (struct breakpoint *bpt) > { > - do_enable_breakpoint (bpt, disable); > + do_enable_breakpoint (bpt, disp_disable); > } > > /* ARGSUSED */ > @@ -7515,7 +7515,7 @@ enable_once_command (char *args, int fro > static void > enable_delete_breakpoint (struct breakpoint *bpt) > { > - do_enable_breakpoint (bpt, del); > + do_enable_breakpoint (bpt, disp_del); > } > > /* ARGSUSED */ > > > --- gdb/memattr.h~0 Thu Mar 1 23:56:34 2001 > +++ gdb/memattr.h Sat Jul 14 12:17:06 2001 > @@ -60,8 +60,8 @@ struct mem_region > /* Item number of this memory region. */ > int number; > > - /* Status of this memory region (enabled or disabled) */ > - int status; > + /* Status of this memory region (enabled if non-zero, otherwise disabled) */ > + int enabled_p; > > /* Attributes for this region */ > struct mem_attrib attrib; > > > --- gdb/memattr.c~0 Tue Mar 27 22:36:22 2001 > +++ gdb/memattr.c Sat Jul 14 12:15:44 2001 > @@ -8,16 +8,6 @@ > #include "language.h" > #include "gdb_string.h" > > -/* FIXME: While this conflicts with the enum defined in breakpoint.h, > - I used them to be consistant with how breakpoints, tracepoints, and > - displays are implemented. It doesn't lose now because breakpoint.h > - is not included. */ > -enum enable > -{ > - disabled, > - enabled > -}; > - > const struct mem_attrib default_mem_attrib = > { > MEM_RW, /* mode */ > @@ -58,7 +48,7 @@ create_mem_region (CORE_ADDR lo, CORE_AD > new->lo = lo; > new->hi = hi; > new->number = ++mem_number; > - new->status = enabled; > + new->enabled_p = 1; > new->attrib = *attrib; > > /* link in new node */ > @@ -97,7 +87,7 @@ lookup_mem_region (CORE_ADDR addr) > > for (m = mem_region_chain; m; m = m->next) > { > - if (m->status == enabled) > + if (m->enabled_p == 1) > { > if (addr >= m->lo && addr < m->hi) > return m; > @@ -214,7 +204,7 @@ mem_info_command (char *args, int from_t > { > printf_filtered ("%d: %c\t", > m->number, > - m->status ? 'y' : 'n'); > + m->enabled_p ? 'y' : 'n'); > printf_filtered ("%s - ", > local_hex_string_custom ((unsigned long) m->lo, "08l")); > printf_filtered ("%s\t", > @@ -300,7 +290,7 @@ mem_enable (int num) > for (m = mem_region_chain; m; m = m->next) > if (m->number == num) > { > - m->status = enabled; > + m->enabled_p = 1; > return; > } > printf_unfiltered ("No memory region number %d.\n", num); > @@ -319,7 +309,7 @@ mem_enable_command (char *args, int from > if (p == 0) > { > for (m = mem_region_chain; m; m = m->next) > - m->status = enabled; > + m->enabled_p = 1; > } > else > while (*p) > @@ -350,7 +340,7 @@ mem_disable (int num) > for (m = mem_region_chain; m; m = m->next) > if (m->number == num) > { > - m->status = disabled; > + m->enabled_p = 0; > return; > } > printf_unfiltered ("No memory region number %d.\n", num); > @@ -369,7 +359,7 @@ mem_disable_command (char *args, int fro > if (p == 0) > { > for (m = mem_region_chain; m; m = m->next) > - m->status = disabled; > + m->enabled_p = 0; > } > else > while (*p) > > > --- gdb/tracepoint.h~0 Tue Mar 6 10:21:16 2001 > +++ gdb/tracepoint.h Sat Jul 14 12:29:56 2001 > @@ -21,12 +21,6 @@ > #if !defined (TRACEPOINT_H) > #define TRACEPOINT_H 1 > > -#if !defined (BREAKPOINT_H) > -enum enable > - { > - disabled, enabled > - }; > -#endif > /* The data structure for an action: */ > struct action_line > { > @@ -40,7 +34,7 @@ > { > struct tracepoint *next; > > - enum enable enabled; > + int enabled_p; > > #if 0 > /* Type of tracepoint (MVS FIXME: needed?). */ > > > --- gdb/tracepoint.c~0 Tue Apr 17 23:16:30 2001 > +++ gdb/tracepoint.c Sat Jul 14 12:30:52 2001 > @@ -355,7 +355,7 @@ set_raw_tracepoint (struct symtab_and_li > t->language = current_language->la_language; > t->input_radix = input_radix; > t->line_number = sal.line; > - t->enabled = enabled; > + t->enabled_p = 1; > t->next = 0; > t->step_count = 0; > t->pass_count = 0; > @@ -496,7 +496,7 @@ tracepoints_info (char *tpnum_exp, int f > } > > printf_filtered ("%-3d %-3s ", t->number, > - t->enabled == enabled ? "y" : "n"); > + t->enabled_p ? "y" : "n"); > if (addressprint) > { > char *tmp; > @@ -571,12 +571,12 @@ tracepoint_operation (struct tracepoint > switch (opcode) > { > case enable_op: > - t->enabled = enabled; > + t->enabled_p = 1; > if (modify_tracepoint_hook) > modify_tracepoint_hook (t); > break; > case disable_op: > - t->enabled = disabled; > + t->enabled_p = 0; > if (modify_tracepoint_hook) > modify_tracepoint_hook (t); > break; > @@ -1743,7 +1743,7 @@ trace_start_command (char *args, int fro > > sprintf_vma (tmp, t->address); > sprintf (buf, "QTDP:%x:%s:%c:%lx:%x", t->number, tmp, /* address */ > - t->enabled == enabled ? 'E' : 'D', > + t->enabled_p ? 'E' : 'D', > t->step_count, t->pass_count); > > if (t->actions) > > > --- gdb/printcmd.c~0 Sat May 12 07:08:22 2001 > +++ gdb/printcmd.c Sat Jul 14 12:23:40 2001 > @@ -111,7 +111,7 @@ struct display > /* Innermost block required by this expression when evaluated */ > struct block *block; > /* Status of this display (enabled or disabled) */ > - enum enable status; > + int enabled_p; > }; > > /* Chain of expressions whose values should be displayed > @@ -1427,7 +1427,7 @@ display_command (char *exp, int from_tty > new->next = display_chain; > new->number = ++display_number; > new->format = fmt; > - new->status = enabled; > + new->enabled_p = 1; > display_chain = new; > > if (from_tty && target_has_execution) > @@ -1538,7 +1538,7 @@ do_one_display (struct display *d) > { > int within_current_scope; > > - if (d->status == disabled) > + if (d->enabled_p == 0) > return; > > if (d->block) > @@ -1638,7 +1638,7 @@ disable_display (int num) > for (d = display_chain; d; d = d->next) > if (d->number == num) > { > - d->status = disabled; > + d->enabled_p = 0; > return; > } > printf_unfiltered ("No display number %d.\n", num); > @@ -1669,7 +1669,7 @@ Num Enb Expression\n"); > > for (d = display_chain; d; d = d->next) > { > - printf_filtered ("%d: %c ", d->number, "ny"[(int) d->status]); > + printf_filtered ("%d: %c ", d->number, "ny"[(int) d->enabled_p]); > if (d->format.size) > printf_filtered ("/%d%c%c ", d->format.count, d->format.size, > d->format.format); > @@ -1694,7 +1694,7 @@ enable_display (char *args, int from_tty > if (p == 0) > { > for (d = display_chain; d; d = d->next) > - d->status = enabled; > + d->enabled_p = 1; > } > else > while (*p) > @@ -1710,7 +1710,7 @@ enable_display (char *args, int from_tty > for (d = display_chain; d; d = d->next) > if (d->number == num) > { > - d->status = enabled; > + d->enabled_p = 1; > goto win; > } > printf_unfiltered ("No display number %d.\n", num); > @@ -1732,7 +1732,7 @@ disable_display_command (char *args, int > if (p == 0) > { > for (d = display_chain; d; d = d->next) > - d->status = disabled; > + d->enabled_p = 0; > } > else > while (*p) > > > --- gdb/infcmd.c~0 Wed May 16 23:05:48 2001 > +++ gdb/infcmd.c Sat Jul 14 13:16:06 2001 > @@ -893,7 +893,7 @@ run_stack_dummy (CORE_ADDR addr, char *b > bpt = set_momentary_breakpoint (sal, > get_current_frame (), > bp_call_dummy); > - bpt->disposition = del; > + bpt->disposition = disp_del; > > /* If all error()s out of proceed ended up calling normal_stop (and > perhaps they should; it already does in the special case of error > > > --- gdb/go32-nat.c~3 Tue Jul 10 20:40:20 2001 > +++ gdb/go32-nat.c Sat Jul 14 12:04:50 2001 > @@ -41,10 +41,7 @@ > #include > #include > #include > -/* breakpoint.h defines `disable' which is an enum member. */ > -#define disable interrup_disable > #include > -#undef disable > #include > #include > #include > > > > 2001-07-14 Eli Zaretskii > > * tuiSourceWin.c: Use disp_del instead of del. > > * tuiSource.c: Use disp_del instead of del. > > * tuiDisassem.c: Use disp_del instead of del. > > > --- gdb/tui/tuiDisassem.c~0 Sun May 28 04:12:42 2000 > +++ gdb/tui/tuiDisassem.c Sat Jul 14 13:18:18 2001 > @@ -112,7 +112,7 @@ extern void strcat_address_numeric (CORE > element->whichElement.source.hasBreak = > (bp != (struct breakpoint *) NULL && > (!element->whichElement.source.isExecPoint || > - (bp->disposition != del || bp->hit_count <= 0))); > + (bp->disposition != disp_del || bp->hit_count <= 0))); > curLine++; > pc = newpc; > /* reset the buffer to empty */ > > > --- gdb/tui/tuiSource.c~0 Sun May 28 04:12:42 2000 > +++ gdb/tui/tuiSource.c Sat Jul 14 13:20:46 2001 > @@ -165,8 +165,8 @@ tuiSetSourceContent (s, lineNo, noerror) > element->whichElement.source.hasBreak = > (bp != (struct breakpoint *) NULL && > (!element->whichElement.source.isExecPoint || > - (bp->disposition != del || bp->hit_count <= 0))); > + (bp->disposition != disp_del || bp->hit_count <= 0))); > if (c != EOF) > { > i = strlen (srcLine) - 1; > > > --- gdb/tui/tuiSourceWin.c~0 Wed Jul 7 23:19:30 1999 > +++ gdb/tui/tuiSourceWin.c Sat Jul 14 13:19:42 2001 > @@ -756,7 +756,7 @@ tuiSetExecInfoContent (winInfo) > srcElement->whichElement.source.lineOrAddr.addr); > if (found) > srcElement->whichElement.source.hasBreak = > - (bp->disposition != del || bp->hit_count <= 0); > + (bp->disposition != disp_del || bp->hit_count <= 0); > } > if (!found) > srcElement->whichElement.source.hasBreak = FALSE; >