Skip to content

Commit 51c4b2f

Browse files
committed
mark some deprecated instr
1 parent 7fd20c3 commit 51c4b2f

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

src/dexbox/code.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ tb_void_t dx_code_dump(dx_code_ref_t code, dx_file_ref_t file)
115115
tb_printf(" .catches %lu\n", dx_code_tries_size(code));
116116

117117
// dump tries
118-
tb_size_t i = 0;
118+
tb_size_t i = 0;
119119
dx_try_ref_t tries_data = dx_code_tries(code);
120-
tb_size_t tries_size = dx_code_tries_size(code);
120+
tb_size_t tries_size = dx_code_tries_size(code);
121121
for (i = 0; i < tries_size; i++)
122122
{
123123
// get the try

src/dexbox/instr.h

+20-24
Original file line numberDiff line numberDiff line change
@@ -56,45 +56,41 @@ typedef enum __dx_instr_format_e
5656
, DX_INSTR_FMT_22t //!< op vA, vB, +CCCC
5757
, DX_INSTR_FMT_22s //!< op vA, vB, #+CCCC
5858
, DX_INSTR_FMT_22c //!< op vA, vB, thing@CCCC
59-
, DX_INSTR_FMT_22cs //!< [opt] op vA, vB, field offset CCCC
59+
, DX_INSTR_FMT_22cs //!< [opt] op vA, vB, field offset CCCC (TODO deprecated)
6060
, DX_INSTR_FMT_30t //!< op +AAAAAAAA
6161
, DX_INSTR_FMT_32x //!< op vAAAA, vBBBB
6262
, DX_INSTR_FMT_31i //!< op vAA, #+BBBBBBBB
6363
, DX_INSTR_FMT_31t //!< op vAA, +BBBBBBBB
6464
, DX_INSTR_FMT_31c //!< op vAA, string@BBBBBBBB
6565
, DX_INSTR_FMT_35c //!< op {vC,vD,vE,vF,vG}, thing@BBBB
66-
, DX_INSTR_FMT_35ms //!< [opt] invoke-virtual+super
66+
, DX_INSTR_FMT_35ms //!< [opt] invoke-virtual+super (TODO deprecated)
6767
, DX_INSTR_FMT_3rc //!< op {vCCCC .. v(CCCC+AA-1)}, thing@BBBB
68-
, DX_INSTR_FMT_3rms //!< [opt] invoke-virtual+super/range
68+
, DX_INSTR_FMT_3rms //!< [opt] invoke-virtual+super/range (TODO deprecated)
6969
, DX_INSTR_FMT_51l //!< op vAA, #+BBBBBBBBBBBBBBBB
70-
, DX_INSTR_FMT_35mi //!< [opt] inline invoke
71-
, DX_INSTR_FMT_3rmi //!< [opt] inline invoke/range
72-
73-
// TODO
74-
, DX_INSTR_FMT_45cc //!< new, unknown
75-
, DX_INSTR_FMT_4rcc //!< new, unknown
70+
, DX_INSTR_FMT_35mi //!< [opt] inline invoke (TODO deprecated)
71+
, DX_INSTR_FMT_3rmi //!< [opt] inline invoke/range (TODO deprecated)
72+
, DX_INSTR_FMT_45cc //!< op {vC, vD, vE, vF, vG}, meth@BBBB, proto@HHHH (A: count), format: AG op BBBB FEDC HHHH
73+
, DX_INSTR_FMT_4rcc //!< op {VCCCC .. v(CCCC+AA-1)}, meth@BBBB, proto@HHHH (AA: count), format: AA op BBBB CCCC HHHH
7674

7775
}dx_instr_format_e;
7876

7977
/// the types of indexed reference that are associated with opcodes
8078
typedef enum __dx_instr_index_type_e
8179
{
8280
DX_INSTR_INDEX_TYPE_UNKNOWN = 0
83-
, DX_INSTR_INDEX_TYPE_NONE //!< has no index
84-
, DX_INSTR_INDEX_TYPE_VARIES //!< "It depends." Used for throw-verification-error
85-
, DX_INSTR_INDEX_TYPE_TYPE_REF //!< type reference index
86-
, DX_INSTR_INDEX_TYPE_STRING_REF //!< string reference index
87-
, DX_INSTR_INDEX_TYPE_METHOD_REF //!< method reference index
88-
, DX_INSTR_INDEX_TYPE_FIELD_REF //!< field reference index
89-
, DX_INSTR_INDEX_TYPE_INLINE_METHOD //!< inline method index (for inline linked methods)
90-
, DX_INSTR_INDEX_TYPE_VTABLE_OFFSET //!< vtable offset (for static linked methods)
91-
, DX_INSTR_INDEX_TYPE_FIELD_OFFSET //!< field offset (for static linked fields)
92-
93-
// TODO
94-
, DX_INSTR_INDEX_TYPE_METHOD_AND_PROTO_REF
95-
, DX_INSTR_INDEX_TYPE_CALL_SITE_REF
96-
, DX_INSTR_INDEX_TYPE_METHOD_HANDLE_REF
97-
, DX_INSTR_INDEX_TYPE_PROTO_REF
81+
, DX_INSTR_INDEX_TYPE_NONE //!< has no index
82+
, DX_INSTR_INDEX_TYPE_VARIES //!< "It depends." Used for throw-verification-error (TODO deprecated)
83+
, DX_INSTR_INDEX_TYPE_TYPE_REF //!< type reference index
84+
, DX_INSTR_INDEX_TYPE_STRING_REF //!< string reference index
85+
, DX_INSTR_INDEX_TYPE_METHOD_REF //!< method reference index
86+
, DX_INSTR_INDEX_TYPE_FIELD_REF //!< field reference index
87+
, DX_INSTR_INDEX_TYPE_INLINE_METHOD //!< inline method index (for inline linked methods) (TODO deprecated)
88+
, DX_INSTR_INDEX_TYPE_VTABLE_OFFSET //!< vtable offset (for static linked methods)
89+
, DX_INSTR_INDEX_TYPE_FIELD_OFFSET //!< field offset (for static linked fields)
90+
, DX_INSTR_INDEX_TYPE_METHOD_AND_PROTO_REF //!< method and a proto reference index (for invoke-polymorphic)
91+
, DX_INSTR_INDEX_TYPE_CALL_SITE_REF //!< call site reference index
92+
, DX_INSTR_INDEX_TYPE_METHOD_HANDLE_REF //!< constant method handle reference index
93+
, DX_INSTR_INDEX_TYPE_PROTO_REF //!< prototype reference index
9894

9995
}dx_instr_index_type_e;
10096

0 commit comments

Comments
 (0)