diff options
| author | Jacques-Henri Jourdan <jacques-henri.jourdan@normalesup.org> | 2019-07-16 13:42:04 +0200 |
|---|---|---|
| committer | Jacques-Henri Jourdan <jacques-henri.jourdan@normalesup.org> | 2019-07-16 13:42:04 +0200 |
| commit | 78de99ecc2f1d4e1b83b85c1be922acae4d174a5 (patch) | |
| tree | ba06390ac0f18e35a9db824f8483d0a5bf0527c3 /debugger | |
| parent | 593f94055a72c8569e0f79833feb274a64241005 (diff) | |
| download | ocaml-78de99ecc2f1d4e1b83b85c1be922acae4d174a5.tar.gz | |
Xavier Clerc's remarks.
Diffstat (limited to 'debugger')
| -rw-r--r-- | debugger/breakpoints.ml | 4 | ||||
| -rw-r--r-- | debugger/breakpoints.mli | 4 | ||||
| -rw-r--r-- | debugger/symbols.ml | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/debugger/breakpoints.ml b/debugger/breakpoints.ml index dfbf410091..f375528211 100644 --- a/debugger/breakpoints.ml +++ b/debugger/breakpoints.ml @@ -122,7 +122,9 @@ let update_breakpoints () = let execute_without_breakpoints f = Misc.protect_refs [Misc.R (Debugger_config.break_on_load, false); Misc.R (current_version, 0); - Misc.R (positions, [])] + Misc.R (positions, []); + Misc.R (breakpoints, []); + Misc.R (breakpoint_number, 0)] f (* Add a position in the position list. *) diff --git a/debugger/breakpoints.mli b/debugger/breakpoints.mli index 623c0ef3fb..d26d9b241f 100644 --- a/debugger/breakpoints.mli +++ b/debugger/breakpoints.mli @@ -31,7 +31,7 @@ val breakpoints : (breakpoint_id * Events.code_event) list ref val breakpoint_at_pc : Debugcom.pc -> bool (* List of breakpoints at `pc'. *) -val breakpoints_at_pc : Debugcom.pc -> int list +val breakpoints_at_pc : Debugcom.pc -> breakpoint_id list (*** Set and remove breakpoints ***) @@ -46,7 +46,7 @@ val execute_without_breakpoints : (unit -> unit) -> unit val new_breakpoint : Events.code_event -> unit (* Remove a breakpoint from lists. *) -val remove_breakpoint : int -> unit +val remove_breakpoint : breakpoint_id -> unit val remove_all_breakpoints : unit -> unit diff --git a/debugger/symbols.ml b/debugger/symbols.ml index 6cb49c1ea2..8ed9b9db76 100644 --- a/debugger/symbols.ml +++ b/debugger/symbols.ml @@ -29,8 +29,6 @@ let modules = let program_source_dirs = ref ([] : string list) -let events = - ref ([] : debug_event list) let events_by_pc = (Hashtbl.create 257 : (pc, debug_event) Hashtbl.t) let events_by_module = @@ -96,7 +94,7 @@ let read_symbols' bytecode_file = !eventlists, !dirs let clear_symbols () = - modules := []; events := []; + modules := []; program_source_dirs := []; Hashtbl.clear events_by_pc; Hashtbl.clear events_by_module; Hashtbl.clear all_events_by_module @@ -106,7 +104,6 @@ let add_symbols frag all_events = (fun evl -> List.iter (fun ev -> - events := ev :: !events; Hashtbl.add events_by_pc {frag; pos = ev.ev_pos} ev) evl) all_events; |