Skip to content

Commit 28638df

Browse files
jeplerjepler
committed
vm: cut vmentrytable size
This also adds a bit of code everywhere we DISPATCH(), but the net is +232 bytes free on Feather M0 Adalogger. Key assumption: All of the offsets in mp_execute_bytecode fit in 16 bits; it is not clear whether the compiler will verify this assumption (e.g., by warning that a constant will be truncated)
1 parent d2056a4 commit 28638df

File tree

2 files changed

+81
-79
lines changed

2 files changed

+81
-79
lines changed

‎py/vm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ mp_vm_return_kind_t PLACE_IN_ITCM(mp_execute_bytecode)(mp_code_state_t *code_sta
132132
#define DISPATCH() do { \
133133
TRACE(ip); \
134134
MARK_EXC_IP_GLOBAL(); \
135-
goto *entry_table[*ip++]; \
135+
goto *(void*)((char*)&&entry_MP_BC_LOAD_CONST_FALSE + entry_table[*ip++]); \
136136
} while (0)
137137
#define DISPATCH_WITH_PEND_EXC_CHECK() goto pending_exception_check
138138
#define ENTRY(op) entry_##op

‎py/vmentrytable.h

Lines changed: 80 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -31,88 +31,90 @@
3131

3232
#include "supervisor/linker.h"
3333

34-
static const void *const PLACE_IN_DTCM_DATA(entry_table[256]) = {
35-
[0 ... 255] = &&entry_default,
36-
[MP_BC_LOAD_CONST_FALSE] = &&entry_MP_BC_LOAD_CONST_FALSE,
37-
[MP_BC_LOAD_CONST_NONE] = &&entry_MP_BC_LOAD_CONST_NONE,
38-
[MP_BC_LOAD_CONST_TRUE] = &&entry_MP_BC_LOAD_CONST_TRUE,
39-
[MP_BC_LOAD_CONST_SMALL_INT] = &&entry_MP_BC_LOAD_CONST_SMALL_INT,
40-
[MP_BC_LOAD_CONST_STRING] = &&entry_MP_BC_LOAD_CONST_STRING,
41-
[MP_BC_LOAD_CONST_OBJ] = &&entry_MP_BC_LOAD_CONST_OBJ,
42-
[MP_BC_LOAD_NULL] = &&entry_MP_BC_LOAD_NULL,
43-
[MP_BC_LOAD_FAST_N] = &&entry_MP_BC_LOAD_FAST_N,
44-
[MP_BC_LOAD_DEREF] = &&entry_MP_BC_LOAD_DEREF,
45-
[MP_BC_LOAD_NAME] = &&entry_MP_BC_LOAD_NAME,
46-
[MP_BC_LOAD_GLOBAL] = &&entry_MP_BC_LOAD_GLOBAL,
47-
[MP_BC_LOAD_ATTR] = &&entry_MP_BC_LOAD_ATTR,
48-
[MP_BC_LOAD_METHOD] = &&entry_MP_BC_LOAD_METHOD,
49-
[MP_BC_LOAD_SUPER_METHOD] = &&entry_MP_BC_LOAD_SUPER_METHOD,
50-
[MP_BC_LOAD_BUILD_CLASS] = &&entry_MP_BC_LOAD_BUILD_CLASS,
51-
[MP_BC_LOAD_SUBSCR] = &&entry_MP_BC_LOAD_SUBSCR,
52-
[MP_BC_STORE_FAST_N] = &&entry_MP_BC_STORE_FAST_N,
53-
[MP_BC_STORE_DEREF] = &&entry_MP_BC_STORE_DEREF,
54-
[MP_BC_STORE_NAME] = &&entry_MP_BC_STORE_NAME,
55-
[MP_BC_STORE_GLOBAL] = &&entry_MP_BC_STORE_GLOBAL,
56-
[MP_BC_STORE_ATTR] = &&entry_MP_BC_STORE_ATTR,
57-
[MP_BC_STORE_SUBSCR] = &&entry_MP_BC_STORE_SUBSCR,
58-
[MP_BC_DELETE_FAST] = &&entry_MP_BC_DELETE_FAST,
59-
[MP_BC_DELETE_DEREF] = &&entry_MP_BC_DELETE_DEREF,
60-
[MP_BC_DELETE_NAME] = &&entry_MP_BC_DELETE_NAME,
61-
[MP_BC_DELETE_GLOBAL] = &&entry_MP_BC_DELETE_GLOBAL,
62-
[MP_BC_DUP_TOP] = &&entry_MP_BC_DUP_TOP,
63-
[MP_BC_DUP_TOP_TWO] = &&entry_MP_BC_DUP_TOP_TWO,
64-
[MP_BC_POP_TOP] = &&entry_MP_BC_POP_TOP,
65-
[MP_BC_ROT_TWO] = &&entry_MP_BC_ROT_TWO,
66-
[MP_BC_ROT_THREE] = &&entry_MP_BC_ROT_THREE,
67-
[MP_BC_JUMP] = &&entry_MP_BC_JUMP,
68-
[MP_BC_POP_JUMP_IF_TRUE] = &&entry_MP_BC_POP_JUMP_IF_TRUE,
69-
[MP_BC_POP_JUMP_IF_FALSE] = &&entry_MP_BC_POP_JUMP_IF_FALSE,
70-
[MP_BC_JUMP_IF_TRUE_OR_POP] = &&entry_MP_BC_JUMP_IF_TRUE_OR_POP,
71-
[MP_BC_JUMP_IF_FALSE_OR_POP] = &&entry_MP_BC_JUMP_IF_FALSE_OR_POP,
72-
[MP_BC_SETUP_WITH] = &&entry_MP_BC_SETUP_WITH,
73-
[MP_BC_WITH_CLEANUP] = &&entry_MP_BC_WITH_CLEANUP,
74-
[MP_BC_UNWIND_JUMP] = &&entry_MP_BC_UNWIND_JUMP,
75-
[MP_BC_SETUP_EXCEPT] = &&entry_MP_BC_SETUP_EXCEPT,
76-
[MP_BC_SETUP_FINALLY] = &&entry_MP_BC_SETUP_FINALLY,
77-
[MP_BC_END_FINALLY] = &&entry_MP_BC_END_FINALLY,
78-
[MP_BC_GET_ITER] = &&entry_MP_BC_GET_ITER,
79-
[MP_BC_GET_ITER_STACK] = &&entry_MP_BC_GET_ITER_STACK,
80-
[MP_BC_FOR_ITER] = &&entry_MP_BC_FOR_ITER,
81-
[MP_BC_POP_BLOCK] = &&entry_MP_BC_POP_BLOCK,
82-
[MP_BC_POP_EXCEPT] = &&entry_MP_BC_POP_EXCEPT,
83-
[MP_BC_BUILD_TUPLE] = &&entry_MP_BC_BUILD_TUPLE,
84-
[MP_BC_BUILD_LIST] = &&entry_MP_BC_BUILD_LIST,
85-
[MP_BC_BUILD_MAP] = &&entry_MP_BC_BUILD_MAP,
86-
[MP_BC_STORE_MAP] = &&entry_MP_BC_STORE_MAP,
34+
#define COMPUTE_ENTRY(x) ((char*)(x) - (char*)&&entry_MP_BC_LOAD_CONST_FALSE)
35+
36+
static int16_t const PLACE_IN_DTCM_DATA(entry_table[256]) = {
37+
[0 ... 255] = COMPUTE_ENTRY(&&entry_default),
38+
[MP_BC_LOAD_CONST_FALSE] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_CONST_FALSE),
39+
[MP_BC_LOAD_CONST_NONE] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_CONST_NONE),
40+
[MP_BC_LOAD_CONST_TRUE] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_CONST_TRUE),
41+
[MP_BC_LOAD_CONST_SMALL_INT] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_CONST_SMALL_INT),
42+
[MP_BC_LOAD_CONST_STRING] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_CONST_STRING),
43+
[MP_BC_LOAD_CONST_OBJ] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_CONST_OBJ),
44+
[MP_BC_LOAD_NULL] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_NULL),
45+
[MP_BC_LOAD_FAST_N] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_FAST_N),
46+
[MP_BC_LOAD_DEREF] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_DEREF),
47+
[MP_BC_LOAD_NAME] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_NAME),
48+
[MP_BC_LOAD_GLOBAL] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_GLOBAL),
49+
[MP_BC_LOAD_ATTR] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_ATTR),
50+
[MP_BC_LOAD_METHOD] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_METHOD),
51+
[MP_BC_LOAD_SUPER_METHOD] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_SUPER_METHOD),
52+
[MP_BC_LOAD_BUILD_CLASS] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_BUILD_CLASS),
53+
[MP_BC_LOAD_SUBSCR] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_SUBSCR),
54+
[MP_BC_STORE_FAST_N] = COMPUTE_ENTRY(&&entry_MP_BC_STORE_FAST_N),
55+
[MP_BC_STORE_DEREF] = COMPUTE_ENTRY(&&entry_MP_BC_STORE_DEREF),
56+
[MP_BC_STORE_NAME] = COMPUTE_ENTRY(&&entry_MP_BC_STORE_NAME),
57+
[MP_BC_STORE_GLOBAL] = COMPUTE_ENTRY(&&entry_MP_BC_STORE_GLOBAL),
58+
[MP_BC_STORE_ATTR] = COMPUTE_ENTRY(&&entry_MP_BC_STORE_ATTR),
59+
[MP_BC_STORE_SUBSCR] = COMPUTE_ENTRY(&&entry_MP_BC_STORE_SUBSCR),
60+
[MP_BC_DELETE_FAST] = COMPUTE_ENTRY(&&entry_MP_BC_DELETE_FAST),
61+
[MP_BC_DELETE_DEREF] = COMPUTE_ENTRY(&&entry_MP_BC_DELETE_DEREF),
62+
[MP_BC_DELETE_NAME] = COMPUTE_ENTRY(&&entry_MP_BC_DELETE_NAME),
63+
[MP_BC_DELETE_GLOBAL] = COMPUTE_ENTRY(&&entry_MP_BC_DELETE_GLOBAL),
64+
[MP_BC_DUP_TOP] = COMPUTE_ENTRY(&&entry_MP_BC_DUP_TOP),
65+
[MP_BC_DUP_TOP_TWO] = COMPUTE_ENTRY(&&entry_MP_BC_DUP_TOP_TWO),
66+
[MP_BC_POP_TOP] = COMPUTE_ENTRY(&&entry_MP_BC_POP_TOP),
67+
[MP_BC_ROT_TWO] = COMPUTE_ENTRY(&&entry_MP_BC_ROT_TWO),
68+
[MP_BC_ROT_THREE] = COMPUTE_ENTRY(&&entry_MP_BC_ROT_THREE),
69+
[MP_BC_JUMP] = COMPUTE_ENTRY(&&entry_MP_BC_JUMP),
70+
[MP_BC_POP_JUMP_IF_TRUE] = COMPUTE_ENTRY(&&entry_MP_BC_POP_JUMP_IF_TRUE),
71+
[MP_BC_POP_JUMP_IF_FALSE] = COMPUTE_ENTRY(&&entry_MP_BC_POP_JUMP_IF_FALSE),
72+
[MP_BC_JUMP_IF_TRUE_OR_POP] = COMPUTE_ENTRY(&&entry_MP_BC_JUMP_IF_TRUE_OR_POP),
73+
[MP_BC_JUMP_IF_FALSE_OR_POP] = COMPUTE_ENTRY(&&entry_MP_BC_JUMP_IF_FALSE_OR_POP),
74+
[MP_BC_SETUP_WITH] = COMPUTE_ENTRY(&&entry_MP_BC_SETUP_WITH),
75+
[MP_BC_WITH_CLEANUP] = COMPUTE_ENTRY(&&entry_MP_BC_WITH_CLEANUP),
76+
[MP_BC_UNWIND_JUMP] = COMPUTE_ENTRY(&&entry_MP_BC_UNWIND_JUMP),
77+
[MP_BC_SETUP_EXCEPT] = COMPUTE_ENTRY(&&entry_MP_BC_SETUP_EXCEPT),
78+
[MP_BC_SETUP_FINALLY] = COMPUTE_ENTRY(&&entry_MP_BC_SETUP_FINALLY),
79+
[MP_BC_END_FINALLY] = COMPUTE_ENTRY(&&entry_MP_BC_END_FINALLY),
80+
[MP_BC_GET_ITER] = COMPUTE_ENTRY(&&entry_MP_BC_GET_ITER),
81+
[MP_BC_GET_ITER_STACK] = COMPUTE_ENTRY(&&entry_MP_BC_GET_ITER_STACK),
82+
[MP_BC_FOR_ITER] = COMPUTE_ENTRY(&&entry_MP_BC_FOR_ITER),
83+
[MP_BC_POP_BLOCK] = COMPUTE_ENTRY(&&entry_MP_BC_POP_BLOCK),
84+
[MP_BC_POP_EXCEPT] = COMPUTE_ENTRY(&&entry_MP_BC_POP_EXCEPT),
85+
[MP_BC_BUILD_TUPLE] = COMPUTE_ENTRY(&&entry_MP_BC_BUILD_TUPLE),
86+
[MP_BC_BUILD_LIST] = COMPUTE_ENTRY(&&entry_MP_BC_BUILD_LIST),
87+
[MP_BC_BUILD_MAP] = COMPUTE_ENTRY(&&entry_MP_BC_BUILD_MAP),
88+
[MP_BC_STORE_MAP] = COMPUTE_ENTRY(&&entry_MP_BC_STORE_MAP),
8789
#if MICROPY_PY_BUILTINS_SET
88-
[MP_BC_BUILD_SET] = &&entry_MP_BC_BUILD_SET,
90+
[MP_BC_BUILD_SET] = COMPUTE_ENTRY(&&entry_MP_BC_BUILD_SET),
8991
#endif
9092
#if MICROPY_PY_BUILTINS_SLICE
91-
[MP_BC_BUILD_SLICE] = &&entry_MP_BC_BUILD_SLICE,
93+
[MP_BC_BUILD_SLICE] = COMPUTE_ENTRY(&&entry_MP_BC_BUILD_SLICE),
9294
#endif
93-
[MP_BC_STORE_COMP] = &&entry_MP_BC_STORE_COMP,
94-
[MP_BC_UNPACK_SEQUENCE] = &&entry_MP_BC_UNPACK_SEQUENCE,
95-
[MP_BC_UNPACK_EX] = &&entry_MP_BC_UNPACK_EX,
96-
[MP_BC_MAKE_FUNCTION] = &&entry_MP_BC_MAKE_FUNCTION,
97-
[MP_BC_MAKE_FUNCTION_DEFARGS] = &&entry_MP_BC_MAKE_FUNCTION_DEFARGS,
98-
[MP_BC_MAKE_CLOSURE] = &&entry_MP_BC_MAKE_CLOSURE,
99-
[MP_BC_MAKE_CLOSURE_DEFARGS] = &&entry_MP_BC_MAKE_CLOSURE_DEFARGS,
100-
[MP_BC_CALL_FUNCTION] = &&entry_MP_BC_CALL_FUNCTION,
101-
[MP_BC_CALL_FUNCTION_VAR_KW] = &&entry_MP_BC_CALL_FUNCTION_VAR_KW,
102-
[MP_BC_CALL_METHOD] = &&entry_MP_BC_CALL_METHOD,
103-
[MP_BC_CALL_METHOD_VAR_KW] = &&entry_MP_BC_CALL_METHOD_VAR_KW,
104-
[MP_BC_RETURN_VALUE] = &&entry_MP_BC_RETURN_VALUE,
105-
[MP_BC_RAISE_VARARGS] = &&entry_MP_BC_RAISE_VARARGS,
106-
[MP_BC_YIELD_VALUE] = &&entry_MP_BC_YIELD_VALUE,
107-
[MP_BC_YIELD_FROM] = &&entry_MP_BC_YIELD_FROM,
108-
[MP_BC_IMPORT_NAME] = &&entry_MP_BC_IMPORT_NAME,
109-
[MP_BC_IMPORT_FROM] = &&entry_MP_BC_IMPORT_FROM,
110-
[MP_BC_IMPORT_STAR] = &&entry_MP_BC_IMPORT_STAR,
111-
[MP_BC_LOAD_CONST_SMALL_INT_MULTI ... MP_BC_LOAD_CONST_SMALL_INT_MULTI + 63] = &&entry_MP_BC_LOAD_CONST_SMALL_INT_MULTI,
112-
[MP_BC_LOAD_FAST_MULTI ... MP_BC_LOAD_FAST_MULTI + 15] = &&entry_MP_BC_LOAD_FAST_MULTI,
113-
[MP_BC_STORE_FAST_MULTI ... MP_BC_STORE_FAST_MULTI + 15] = &&entry_MP_BC_STORE_FAST_MULTI,
114-
[MP_BC_UNARY_OP_MULTI ... MP_BC_UNARY_OP_MULTI + MP_UNARY_OP_NUM_BYTECODE - 1] = &&entry_MP_BC_UNARY_OP_MULTI,
115-
[MP_BC_BINARY_OP_MULTI ... MP_BC_BINARY_OP_MULTI + MP_BINARY_OP_NUM_BYTECODE - 1] = &&entry_MP_BC_BINARY_OP_MULTI,
95+
[MP_BC_STORE_COMP] = COMPUTE_ENTRY(&&entry_MP_BC_STORE_COMP),
96+
[MP_BC_UNPACK_SEQUENCE] = COMPUTE_ENTRY(&&entry_MP_BC_UNPACK_SEQUENCE),
97+
[MP_BC_UNPACK_EX] = COMPUTE_ENTRY(&&entry_MP_BC_UNPACK_EX),
98+
[MP_BC_MAKE_FUNCTION] = COMPUTE_ENTRY(&&entry_MP_BC_MAKE_FUNCTION),
99+
[MP_BC_MAKE_FUNCTION_DEFARGS] = COMPUTE_ENTRY(&&entry_MP_BC_MAKE_FUNCTION_DEFARGS),
100+
[MP_BC_MAKE_CLOSURE] = COMPUTE_ENTRY(&&entry_MP_BC_MAKE_CLOSURE),
101+
[MP_BC_MAKE_CLOSURE_DEFARGS] = COMPUTE_ENTRY(&&entry_MP_BC_MAKE_CLOSURE_DEFARGS),
102+
[MP_BC_CALL_FUNCTION] = COMPUTE_ENTRY(&&entry_MP_BC_CALL_FUNCTION),
103+
[MP_BC_CALL_FUNCTION_VAR_KW] = COMPUTE_ENTRY(&&entry_MP_BC_CALL_FUNCTION_VAR_KW),
104+
[MP_BC_CALL_METHOD] = COMPUTE_ENTRY(&&entry_MP_BC_CALL_METHOD),
105+
[MP_BC_CALL_METHOD_VAR_KW] = COMPUTE_ENTRY(&&entry_MP_BC_CALL_METHOD_VAR_KW),
106+
[MP_BC_RETURN_VALUE] = COMPUTE_ENTRY(&&entry_MP_BC_RETURN_VALUE),
107+
[MP_BC_RAISE_VARARGS] = COMPUTE_ENTRY(&&entry_MP_BC_RAISE_VARARGS),
108+
[MP_BC_YIELD_VALUE] = COMPUTE_ENTRY(&&entry_MP_BC_YIELD_VALUE),
109+
[MP_BC_YIELD_FROM] = COMPUTE_ENTRY(&&entry_MP_BC_YIELD_FROM),
110+
[MP_BC_IMPORT_NAME] = COMPUTE_ENTRY(&&entry_MP_BC_IMPORT_NAME),
111+
[MP_BC_IMPORT_FROM] = COMPUTE_ENTRY(&&entry_MP_BC_IMPORT_FROM),
112+
[MP_BC_IMPORT_STAR] = COMPUTE_ENTRY(&&entry_MP_BC_IMPORT_STAR),
113+
[MP_BC_LOAD_CONST_SMALL_INT_MULTI ... MP_BC_LOAD_CONST_SMALL_INT_MULTI + 63] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_CONST_SMALL_INT_MULTI),
114+
[MP_BC_LOAD_FAST_MULTI ... MP_BC_LOAD_FAST_MULTI + 15] = COMPUTE_ENTRY(&&entry_MP_BC_LOAD_FAST_MULTI),
115+
[MP_BC_STORE_FAST_MULTI ... MP_BC_STORE_FAST_MULTI + 15] = COMPUTE_ENTRY(&&entry_MP_BC_STORE_FAST_MULTI),
116+
[MP_BC_UNARY_OP_MULTI ... MP_BC_UNARY_OP_MULTI + MP_UNARY_OP_NUM_BYTECODE - 1] = COMPUTE_ENTRY(&&entry_MP_BC_UNARY_OP_MULTI),
117+
[MP_BC_BINARY_OP_MULTI ... MP_BC_BINARY_OP_MULTI + MP_BINARY_OP_NUM_BYTECODE - 1] = COMPUTE_ENTRY(&&entry_MP_BC_BINARY_OP_MULTI),
116118
};
117119

118120
#ifdef __clang__

0 commit comments

Comments
 (0)