Skip to content

Commit 78f71ed

Browse files
committed
model: track any not-byte data item
1 parent a796756 commit 78f71ed

7 files changed

+120
-33
lines changed

YaLibs/YaToolsIDALib/YaHelpers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,6 @@ namespace ya
530530
|| !!(flags & FF_BNOT)
531531
|| is_defarg0(flags)
532532
|| is_defarg1(flags)
533-
|| is_align(flags);
533+
|| (is_data(flags) && !is_byte(flags));
534534
}
535535
}

tests/test_yadiff.linux2.golden

+8-11
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,7 @@ do_augroup
769769
do_autochdir
770770
do_autocmd
771771
do_autocmd_event
772+
do_bang
772773
do_buffer
773774
do_c_expr_indent
774775
do_check_cursorbind
@@ -1091,27 +1092,21 @@ f_arglistid
10911092
f_argv
10921093
f_assert_exception
10931094
f_assert_fails
1094-
f_assert_false
10951095
f_assert_inrange
10961096
f_assert_notequal
1097-
f_assert_true
10981097
f_bufexists
10991098
f_bufname
11001099
f_bufnr
11011100
f_byte2line
11021101
f_ch_canread
11031102
f_ch_close
11041103
f_ch_close_in
1105-
f_ch_evalraw
11061104
f_ch_getbufnr
11071105
f_ch_getjob
11081106
f_ch_info
11091107
f_ch_log
11101108
f_ch_logfile
11111109
f_ch_open
1112-
f_ch_read
1113-
f_ch_readraw
1114-
f_ch_sendraw
11151110
f_ch_setoptions
11161111
f_ch_status
11171112
f_changenr
@@ -1152,6 +1147,8 @@ f_foldclosedend
11521147
f_foldlevel
11531148
f_foldtext
11541149
f_foldtextresult
1150+
f_funcref
1151+
f_function
11551152
f_garbagecollect
11561153
f_get
11571154
f_getbufinfo
@@ -1161,7 +1158,6 @@ f_getcharsearch
11611158
f_getcmdline
11621159
f_getcmdwintype
11631160
f_getcompletion
1164-
f_getcurpos
11651161
f_getcwd
11661162
f_getfperm
11671163
f_getftime
@@ -1170,12 +1166,13 @@ f_getline
11701166
f_getloclist
11711167
f_getmatches
11721168
f_getpid
1173-
f_getpos
11741169
f_getreg
11751170
f_getregtype
11761171
f_gettabinfo
11771172
f_gettabvar
1173+
f_gettabwinvar
11781174
f_getwininfo
1175+
f_getwinvar
11791176
f_glob
11801177
f_glob2regpat
11811178
f_globpath
@@ -1218,11 +1215,11 @@ f_line
12181215
f_lispindent
12191216
f_localtime
12201217
f_map
1218+
f_maparg
1219+
f_mapcheck
12211220
f_matchaddpos
12221221
f_matcharg
12231222
f_matchdelete
1224-
f_max
1225-
f_min
12261223
f_mkdir
12271224
f_mode
12281225
f_nextnonblank
@@ -3181,4 +3178,4 @@ wvsp_one
31813178
yank_copy_line
31823179
yank_register_mline
31833180

3184-
symbols: 3182
3181+
symbols: 3179

tests/test_yadiff.win32.golden

+5-12
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ arabic_maycombine
229229
arabic_maycombine_0
230230
arabic_shape
231231
ask_yesno
232-
assert_bool
233232
assert_exception
234233
assert_fails
235234
assert_inrange
@@ -487,7 +486,6 @@ collection
487486
coloncmd
488487
command_height
489488
common_channel_read
490-
common_function
491489
common_init
492490
comp_col
493491
comp_textwidth
@@ -518,7 +516,6 @@ create_timer
518516
crypt_append_msg
519517
crypt_blowfish_init
520518
crypt_check_current_method
521-
crypt_check_method
522519
crypt_check_method_0
523520
crypt_create
524521
crypt_create_for_writing
@@ -1096,6 +1093,8 @@ f_assert_notequal
10961093
f_bufexists
10971094
f_bufname
10981095
f_bufnr
1096+
f_bufwinid
1097+
f_bufwinnr
10991098
f_byte2line
11001099
f_ch_canread
11011100
f_ch_close
@@ -1107,8 +1106,6 @@ f_ch_info
11071106
f_ch_log
11081107
f_ch_logfile
11091108
f_ch_open
1110-
f_ch_read
1111-
f_ch_readraw
11121109
f_ch_sendexpr
11131110
f_ch_setoptions
11141111
f_ch_status
@@ -1141,6 +1138,7 @@ f_extend
11411138
f_feedkeys
11421139
f_filereadable
11431140
f_filewritable
1141+
f_filter
11441142
f_findfile
11451143
f_fnameescape
11461144
f_fnamemodify
@@ -1149,8 +1147,6 @@ f_foldclosedend
11491147
f_foldlevel
11501148
f_foldtext
11511149
f_foldtextresult
1152-
f_funcref
1153-
f_function
11541150
f_garbagecollect
11551151
f_get
11561152
f_getbufinfo
@@ -1218,8 +1214,7 @@ f_libcallnr
12181214
f_line
12191215
f_lispindent
12201216
f_localtime
1221-
f_maparg
1222-
f_mapcheck
1217+
f_map
12231218
f_matchaddpos
12241219
f_matcharg
12251220
f_matchdelete
@@ -1290,8 +1285,6 @@ f_synIDattr
12901285
f_synIDtrans
12911286
f_synconcealed
12921287
f_synstack
1293-
f_system
1294-
f_systemlist
12951288
f_tabpagebuflist
12961289
f_tabpagewinnr
12971290
f_tagfiles
@@ -3183,4 +3176,4 @@ wvsp_one
31833176
yank_copy_line
31843177
yank_register_mline
31853178

3186-
symbols: 3184
3179+
symbols: 3177

tests/tests/test_data.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def test_op_type_on_data(self):
193193
ea = 0x414204
194194
ida_bytes.clr_op_type(ea, 0)
195195
ea = 0x41421C
196-
ida_bytes.clr_op_type(ea, 0)
196+
ida_bytes.del_items(ea, 0, 4)
197197
"""),
198198
self.save_ea(0x414204),
199199
self.save_ea(0x41421C),
@@ -218,7 +218,7 @@ def test_op_offset_on_data(self):
218218
idaapi.set_name(ea, "somename")
219219
ida_bytes.clr_op_type(ea, 0)
220220
ea = 0x414718
221-
ida_bytes.clr_op_type(ea, 0)
221+
ida_bytes.del_items(ea, 0, 4)
222222
"""),
223223
)
224224

@@ -242,7 +242,7 @@ def test_op_offset_on_data(self):
242242
ea = 0x414714
243243
ida_bytes.clr_op_type(ea, 0)
244244
ea = 0x414718
245-
ida_bytes.clr_op_type(ea, 0)
245+
ida_bytes.del_items(ea, 0, 4)
246246
"""),
247247
self.save_ea(0x414714),
248248
self.save_ea(0x414718),

tests/tests/test_export.700.golden

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
objects: 29072
1+
objects: 29074
22

33
bin: 1
44
bin_66000000 Qt5Svgd.dll
@@ -11156,7 +11156,7 @@ cod_6604f194
1115611156
cod_6604f564
1115711157
cod_6604f570
1115811158

11159-
dat: 7235
11159+
dat: 7237
1116011160
dat_66001000
1116111161
dat_66005321
1116211162
dat_66005381
@@ -12409,6 +12409,7 @@ dat_6604f532
1240912409
dat_66051a4f
1241012410
dat_66051a6f
1241112411
dat_66052a9b
12412+
dat_66052c00
1241212413
dat_66053000 unk_66053000
1241312414
dat_66053104
1241412415
dat_66053108
@@ -14542,6 +14543,7 @@ dat_6605fd91 aCurrentframe
1454214543
dat_6605fd9e
1454314544
dat_6605fda0 asc_6605FDA0
1454414545
dat_6605fda2
14546+
dat_6605fdb0
1454514547
dat_6605fdb2
1454614548
dat_6605ff18 a2repaintneeded
1454714549
dat_6605ff29 aQsvgrendererCp_0

0 commit comments

Comments
 (0)