Skip to content

Commit

Permalink
model: track any not-byte data item
Browse files Browse the repository at this point in the history
  • Loading branch information
bamiaux committed Aug 7, 2018
1 parent a796756 commit 78f71ed
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 33 deletions.
2 changes: 1 addition & 1 deletion YaLibs/YaToolsIDALib/YaHelpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,6 @@ namespace ya
|| !!(flags & FF_BNOT)
|| is_defarg0(flags)
|| is_defarg1(flags)
|| is_align(flags);
|| (is_data(flags) && !is_byte(flags));
}
}
19 changes: 8 additions & 11 deletions tests/test_yadiff.linux2.golden
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,7 @@ do_augroup
do_autochdir
do_autocmd
do_autocmd_event
do_bang
do_buffer
do_c_expr_indent
do_check_cursorbind
Expand Down Expand Up @@ -1091,27 +1092,21 @@ f_arglistid
f_argv
f_assert_exception
f_assert_fails
f_assert_false
f_assert_inrange
f_assert_notequal
f_assert_true
f_bufexists
f_bufname
f_bufnr
f_byte2line
f_ch_canread
f_ch_close
f_ch_close_in
f_ch_evalraw
f_ch_getbufnr
f_ch_getjob
f_ch_info
f_ch_log
f_ch_logfile
f_ch_open
f_ch_read
f_ch_readraw
f_ch_sendraw
f_ch_setoptions
f_ch_status
f_changenr
Expand Down Expand Up @@ -1152,6 +1147,8 @@ f_foldclosedend
f_foldlevel
f_foldtext
f_foldtextresult
f_funcref
f_function
f_garbagecollect
f_get
f_getbufinfo
Expand All @@ -1161,7 +1158,6 @@ f_getcharsearch
f_getcmdline
f_getcmdwintype
f_getcompletion
f_getcurpos
f_getcwd
f_getfperm
f_getftime
Expand All @@ -1170,12 +1166,13 @@ f_getline
f_getloclist
f_getmatches
f_getpid
f_getpos
f_getreg
f_getregtype
f_gettabinfo
f_gettabvar
f_gettabwinvar
f_getwininfo
f_getwinvar
f_glob
f_glob2regpat
f_globpath
Expand Down Expand Up @@ -1218,11 +1215,11 @@ f_line
f_lispindent
f_localtime
f_map
f_maparg
f_mapcheck
f_matchaddpos
f_matcharg
f_matchdelete
f_max
f_min
f_mkdir
f_mode
f_nextnonblank
Expand Down Expand Up @@ -3181,4 +3178,4 @@ wvsp_one
yank_copy_line
yank_register_mline

symbols: 3182
symbols: 3179
17 changes: 5 additions & 12 deletions tests/test_yadiff.win32.golden
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ arabic_maycombine
arabic_maycombine_0
arabic_shape
ask_yesno
assert_bool
assert_exception
assert_fails
assert_inrange
Expand Down Expand Up @@ -487,7 +486,6 @@ collection
coloncmd
command_height
common_channel_read
common_function
common_init
comp_col
comp_textwidth
Expand Down Expand Up @@ -518,7 +516,6 @@ create_timer
crypt_append_msg
crypt_blowfish_init
crypt_check_current_method
crypt_check_method
crypt_check_method_0
crypt_create
crypt_create_for_writing
Expand Down Expand Up @@ -1096,6 +1093,8 @@ f_assert_notequal
f_bufexists
f_bufname
f_bufnr
f_bufwinid
f_bufwinnr
f_byte2line
f_ch_canread
f_ch_close
Expand All @@ -1107,8 +1106,6 @@ f_ch_info
f_ch_log
f_ch_logfile
f_ch_open
f_ch_read
f_ch_readraw
f_ch_sendexpr
f_ch_setoptions
f_ch_status
Expand Down Expand Up @@ -1141,6 +1138,7 @@ f_extend
f_feedkeys
f_filereadable
f_filewritable
f_filter
f_findfile
f_fnameescape
f_fnamemodify
Expand All @@ -1149,8 +1147,6 @@ f_foldclosedend
f_foldlevel
f_foldtext
f_foldtextresult
f_funcref
f_function
f_garbagecollect
f_get
f_getbufinfo
Expand Down Expand Up @@ -1218,8 +1214,7 @@ f_libcallnr
f_line
f_lispindent
f_localtime
f_maparg
f_mapcheck
f_map
f_matchaddpos
f_matcharg
f_matchdelete
Expand Down Expand Up @@ -1290,8 +1285,6 @@ f_synIDattr
f_synIDtrans
f_synconcealed
f_synstack
f_system
f_systemlist
f_tabpagebuflist
f_tabpagewinnr
f_tagfiles
Expand Down Expand Up @@ -3183,4 +3176,4 @@ wvsp_one
yank_copy_line
yank_register_mline

symbols: 3184
symbols: 3177
6 changes: 3 additions & 3 deletions tests/tests/test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def test_op_type_on_data(self):
ea = 0x414204
ida_bytes.clr_op_type(ea, 0)
ea = 0x41421C
ida_bytes.clr_op_type(ea, 0)
ida_bytes.del_items(ea, 0, 4)
"""),
self.save_ea(0x414204),
self.save_ea(0x41421C),
Expand All @@ -218,7 +218,7 @@ def test_op_offset_on_data(self):
idaapi.set_name(ea, "somename")
ida_bytes.clr_op_type(ea, 0)
ea = 0x414718
ida_bytes.clr_op_type(ea, 0)
ida_bytes.del_items(ea, 0, 4)
"""),
)

Expand All @@ -242,7 +242,7 @@ def test_op_offset_on_data(self):
ea = 0x414714
ida_bytes.clr_op_type(ea, 0)
ea = 0x414718
ida_bytes.clr_op_type(ea, 0)
ida_bytes.del_items(ea, 0, 4)
"""),
self.save_ea(0x414714),
self.save_ea(0x414718),
Expand Down
6 changes: 4 additions & 2 deletions tests/tests/test_export.700.golden
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
objects: 29072
objects: 29074

bin: 1
bin_66000000 Qt5Svgd.dll
Expand Down Expand Up @@ -11156,7 +11156,7 @@ cod_6604f194
cod_6604f564
cod_6604f570

dat: 7235
dat: 7237
dat_66001000
dat_66005321
dat_66005381
Expand Down Expand Up @@ -12409,6 +12409,7 @@ dat_6604f532
dat_66051a4f
dat_66051a6f
dat_66052a9b
dat_66052c00
dat_66053000 unk_66053000
dat_66053104
dat_66053108
Expand Down Expand Up @@ -14542,6 +14543,7 @@ dat_6605fd91 aCurrentframe
dat_6605fd9e
dat_6605fda0 asc_6605FDA0
dat_6605fda2
dat_6605fdb0
dat_6605fdb2
dat_6605ff18 a2repaintneeded
dat_6605ff29 aQsvgrendererCp_0
Expand Down
Loading

0 comments on commit 78f71ed

Please sign in to comment.