m2-internship/dwarf-synthesis
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

synth: tolerate rbp def/undef merges (one way only)

Browse source 
The easy way of RBP defined vs. undefined merge is implemented (if a
block is defined with RBP undef, we tolerate merging upon it with a
defined RBP by losing this information).
This commit is contained in:
Théophile Bastian 2019-07-05 17:17:43 +02:00
parent 1aa6caa36c
commit 4811d68213
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
DwarfSynth/Simplest.ml
View file

@ -746,6 +746,18 @@ let process_sub sub next_instr_graph : subroutine_cfa_data =
let entry_blk = get_entry_blk cfg (first_bap_addr) in let entry_blk = get_entry_blk cfg (first_bap_addr) in
let rbp_pop_set = find_rbp_pop_set cfg entry_blk in let rbp_pop_set = find_rbp_pop_set cfg entry_blk in
let valid_merge previous_regs cur_regs =
let valid_rbp_merge old cur =
(old = cur) || (match old, cur with
| RbpUndef, RbpCfaOffset _ -> true
| _ -> false)
in
let prev_cfa, prev_rbp = previous_regs in
let cur_cfa, cur_rbp = cur_regs in
(prev_cfa = cur_cfa) && valid_rbp_merge prev_rbp cur_rbp
in
let rec dfs_process let rec dfs_process
allow_rbp allow_rbp
(sub_changes: (reg_changes_fde * reg_pos) TIdMap.t) (sub_changes: (reg_changes_fde * reg_pos) TIdMap.t)
@ -775,7 +787,7 @@ let process_sub sub next_instr_graph : subroutine_cfa_data =
~init:n_sub_changes ~init:n_sub_changes
| Some (_, former_entry_offset) -> | Some (_, former_entry_offset) ->
(* Already visited: check that entry values are matching *) (* Already visited: check that entry values are matching *)
if entry_offset <> former_entry_offset then ( if not @@ valid_merge former_entry_offset entry_offset then (
if allow_rbp then if allow_rbp then
Format.eprintf "Found inconsistency (0x%Lx <%a>): %a -- %a@." Format.eprintf "Found inconsistency (0x%Lx <%a>): %a -- %a@."
(int64_addr_of cur_blk) (int64_addr_of cur_blk)