Skip to content

Commit 4cd9ced

Browse files
dpgeorgedpgeorge
committed
py: Implement closures in native code generator.
Currently supports only x64 and Thumb2 archs.
1 parent 2cc5473 commit 4cd9ced

File tree

5 files changed

+61
-23
lines changed

5 files changed

+61
-23
lines changed

‎py/asmx64.c‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,15 @@ STATIC void asm_x64_write_word32_to(asm_x64_t *as, int offset, int w32) {
235235
*/
236236

237237
STATIC void asm_x64_write_r64_disp(asm_x64_t *as, int r64, int disp_r64, int disp_offset) {
238-
assert(disp_r64 < 8);
239238
assert(disp_r64 != ASM_X64_REG_RSP);
240239

240+
if (disp_r64 == ASM_X64_REG_R12) {
241+
// special case for r12; not fully implemented
242+
assert(SIGNED_FIT8(disp_offset));
243+
asm_x64_write_byte_3(as, MODRM_R64(r64) | MODRM_RM_DISP8 | MODRM_RM_R64(disp_r64), 0x24, IMM32_L0(disp_offset));
244+
return;
245+
}
246+
241247
if (disp_offset == 0 && disp_r64 != ASM_X64_REG_RBP) {
242248
asm_x64_write_byte_1(as, MODRM_R64(r64) | MODRM_RM_DISP0 | MODRM_RM_R64(disp_r64));
243249
} else if (SIGNED_FIT8(disp_offset)) {
@@ -317,8 +323,7 @@ void asm_x64_mov_r16_to_mem16(asm_x64_t *as, int src_r64, int dest_r64, int dest
317323

318324
void asm_x64_mov_r64_to_mem64(asm_x64_t *as, int src_r64, int dest_r64, int dest_disp) {
319325
// use REX prefix for 64 bit operation
320-
assert(dest_r64 < 8);
321-
asm_x64_write_byte_2(as, REX_PREFIX | REX_W | (src_r64 < 8 ? 0 : REX_R), OPCODE_MOV_R64_TO_RM64);
326+
asm_x64_write_byte_2(as, REX_PREFIX | REX_W | (src_r64 < 8 ? 0 : REX_R) | (dest_r64 < 8 ? 0 : REX_B), OPCODE_MOV_R64_TO_RM64);
322327
asm_x64_write_r64_disp(as, src_r64, dest_r64, dest_disp);
323328
}
324329

@@ -344,8 +349,7 @@ void asm_x64_mov_mem16_to_r64zx(asm_x64_t *as, int src_r64, int src_disp, int de
344349

345350
void asm_x64_mov_mem64_to_r64(asm_x64_t *as, int src_r64, int src_disp, int dest_r64) {
346351
// use REX prefix for 64 bit operation
347-
assert(src_r64 < 8);
348-
asm_x64_write_byte_2(as, REX_PREFIX | REX_W | (dest_r64 < 8 ? 0 : REX_R), OPCODE_MOV_RM64_TO_R64);
352+
asm_x64_write_byte_2(as, REX_PREFIX | REX_W | (dest_r64 < 8 ? 0 : REX_R) | (src_r64 < 8 ? 0 : REX_B), OPCODE_MOV_RM64_TO_R64);
349353
asm_x64_write_r64_disp(as, dest_r64, src_r64, src_disp);
350354
}
351355

‎py/emitnative.c‎

Lines changed: 47 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,12 @@
140140
#define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_x64_sub_r64_r64((as), (reg_dest), (reg_src))
141141

142142
#define ASM_LOAD_REG_REG(as, reg_dest, reg_base) asm_x64_mov_mem64_to_r64((as), (reg_base), 0, (reg_dest))
143+
#define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_x64_mov_mem64_to_r64((as), (reg_base), 8 * (word_offset), (reg_dest))
143144
#define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) asm_x64_mov_mem8_to_r64zx((as), (reg_base), 0, (reg_dest))
144145
#define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) asm_x64_mov_mem16_to_r64zx((as), (reg_base), 0, (reg_dest))
145146

146147
#define ASM_STORE_REG_REG(as, reg_src, reg_base) asm_x64_mov_r64_to_mem64((as), (reg_src), (reg_base), 0)
148+
#define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_x64_mov_r64_to_mem64((as), (reg_src), (reg_base), 8 * (word_offset))
147149
#define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_x64_mov_r8_to_mem8((as), (reg_src), (reg_base), 0)
148150
#define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_x64_mov_r16_to_mem16((as), (reg_src), (reg_base), 0)
149151

@@ -353,10 +355,12 @@ STATIC byte mp_f_n_args[MP_F_NUMBER_OF] = {
353355
#define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_thumb_sub_rlo_rlo_rlo((as), (reg_dest), (reg_dest), (reg_src))
354356

355357
#define ASM_LOAD_REG_REG(as, reg_dest, reg_base) asm_thumb_ldr_rlo_rlo_i5((as), (reg_dest), (reg_base), 0)
358+
#define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_thumb_ldr_rlo_rlo_i5((as), (reg_dest), (reg_base), (word_offset))
356359
#define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) asm_thumb_ldrb_rlo_rlo_i5((as), (reg_dest), (reg_base), 0)
357360
#define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) asm_thumb_ldrh_rlo_rlo_i5((as), (reg_dest), (reg_base), 0)
358361

359362
#define ASM_STORE_REG_REG(as, reg_src, reg_base) asm_thumb_str_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
363+
#define ASM_STORE_REG_REG_OFFSET(as, reg_src, reg_base, word_offset) asm_thumb_str_rlo_rlo_i5((as), (reg_src), (reg_base), (word_offset))
360364
#define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_thumb_strb_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
361365
#define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_thumb_strh_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
362366

@@ -547,6 +551,8 @@ STATIC void emit_native_set_native_type(emit_t *emit, mp_uint_t op, mp_uint_t ar
547551
}
548552
}
549553

554+
STATIC void emit_post_push_reg(emit_t *emit, vtype_kind_t vtype, int reg);
555+
STATIC void emit_native_store_fast(emit_t *emit, qstr qst, mp_uint_t local_num);
550556
STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
551557
DEBUG_printf("start_pass(pass=%u, scope=%p)\n", pass, scope);
552558

@@ -669,6 +675,16 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
669675
#else
670676
#error not implemented
671677
#endif
678+
679+
// initialise closed over variables
680+
for (int i = 0; i < scope->id_info_len; i++) {
681+
id_info_t *id = &scope->id_info[i];
682+
if (id->kind == ID_INFO_KIND_CELL) {
683+
ASM_CALL_IND(emit->as, mp_fun_table[MP_F_NEW_CELL], MP_F_NEW_CELL);
684+
emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
685+
emit_native_store_fast(emit, id->qst, id->local_num);
686+
}
687+
}
672688
}
673689

674690
STATIC void emit_native_end_pass(emit_t *emit) {
@@ -1224,12 +1240,15 @@ STATIC void emit_native_load_fast(emit_t *emit, qstr qst, mp_uint_t local_num) {
12241240
}
12251241

12261242
STATIC void emit_native_load_deref(emit_t *emit, qstr qst, mp_uint_t local_num) {
1227-
// not implemented
1228-
// in principle could support this quite easily (ldr r0, [r0, #0]) and then get closed over variables!
1229-
(void)emit;
1230-
(void)qst;
1231-
(void)local_num;
1232-
assert(0);
1243+
DEBUG_printf("load_deref(%s, " UINT_FMT ")\n", qstr_str(qst), local_num);
1244+
need_reg_single(emit, REG_RET, 0);
1245+
emit_native_load_fast(emit, qst, local_num);
1246+
vtype_kind_t vtype;
1247+
int reg_base = REG_RET;
1248+
emit_pre_pop_reg_flexible(emit, &vtype, &reg_base, -1, -1);
1249+
ASM_LOAD_REG_REG_OFFSET(emit->as, REG_RET, reg_base, 1);
1250+
// closed over vars are always Python objects
1251+
emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
12331252
}
12341253

12351254
STATIC void emit_native_load_name(emit_t *emit, qstr qst) {
@@ -1446,11 +1465,17 @@ STATIC void emit_native_store_fast(emit_t *emit, qstr qst, mp_uint_t local_num)
14461465
}
14471466

14481467
STATIC void emit_native_store_deref(emit_t *emit, qstr qst, mp_uint_t local_num) {
1449-
// not implemented
1450-
(void)emit;
1451-
(void)qst;
1452-
(void)local_num;
1453-
assert(0);
1468+
DEBUG_printf("store_deref(%s, " UINT_FMT ")\n", qstr_str(qst), local_num);
1469+
need_reg_single(emit, REG_TEMP0, 0);
1470+
need_reg_single(emit, REG_TEMP1, 0);
1471+
emit_native_load_fast(emit, qst, local_num);
1472+
vtype_kind_t vtype;
1473+
int reg_base = REG_TEMP0;
1474+
emit_pre_pop_reg_flexible(emit, &vtype, &reg_base, -1, -1);
1475+
int reg_src = REG_TEMP1;
1476+
emit_pre_pop_reg_flexible(emit, &vtype, &reg_src, reg_base, reg_base);
1477+
ASM_STORE_REG_REG_OFFSET(emit->as, reg_src, reg_base, 1);
1478+
emit_post(emit);
14541479
}
14551480

14561481
STATIC void emit_native_store_name(emit_t *emit, qstr qst) {
@@ -2133,12 +2158,17 @@ STATIC void emit_native_make_function(emit_t *emit, scope_t *scope, mp_uint_t n_
21332158
}
21342159

21352160
STATIC void emit_native_make_closure(emit_t *emit, scope_t *scope, mp_uint_t n_closed_over, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults) {
2136-
(void)emit;
2137-
(void)scope;
2138-
(void)n_closed_over;
2139-
(void)n_pos_defaults;
2140-
(void)n_kw_defaults;
2141-
assert(0);
2161+
emit_native_pre(emit);
2162+
if (n_pos_defaults == 0 && n_kw_defaults == 0) {
2163+
emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, n_closed_over);
2164+
ASM_MOV_IMM_TO_REG(emit->as, n_closed_over, REG_ARG_2);
2165+
} else {
2166+
emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, n_closed_over + 2);
2167+
ASM_MOV_IMM_TO_REG(emit->as, 0x100 | n_closed_over, REG_ARG_2);
2168+
}
2169+
ASM_MOV_ALIGNED_IMM_TO_REG(emit->as, (mp_uint_t)scope->raw_code, REG_ARG_1);
2170+
ASM_CALL_IND(emit->as, mp_fun_table[MP_F_MAKE_CLOSURE_FROM_RAW_CODE], MP_F_MAKE_CLOSURE_FROM_RAW_CODE);
2171+
emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
21422172
}
21432173

21442174
STATIC void emit_native_call_function(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags) {

‎py/nativeglue.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ void *const mp_fun_table[MP_F_NUMBER_OF] = {
132132
mp_unpack_ex,
133133
mp_delete_name,
134134
mp_delete_global,
135+
mp_obj_new_cell,
136+
mp_make_closure_from_raw_code,
135137
};
136138

137139
/*

‎py/runtime0.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ typedef enum {
148148
MP_F_UNPACK_EX,
149149
MP_F_DELETE_NAME,
150150
MP_F_DELETE_GLOBAL,
151+
MP_F_NEW_CELL,
152+
MP_F_MAKE_CLOSURE_FROM_RAW_CODE,
151153
MP_F_NUMBER_OF,
152154
} mp_fun_kind_t;
153155

‎tests/run-tests‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def run_tests(pyb, tests, args):
153153
# Some tests are known to fail with native emitter
154154
# Remove them from the below when they work
155155
if args.emit == 'native':
156-
skip_tests.update({'basics/%s.py' % t for t in 'bytes_gen class_store_class class_super class_super_object closure1 closure2 closure_defargs del_deref del_local fun3 fun_calldblstar fun_callstar fun_callstardblstar fun_defargs fun_defargs2 fun_kwargs fun_kwonly fun_kwonlydef fun_kwvarargs fun_varargs gen_yield_from gen_yield_from_close gen_yield_from_ducktype gen_yield_from_exc gen_yield_from_iter gen_yield_from_send gen_yield_from_throw generator1 generator2 generator_args generator_close generator_closure generator_exc generator_return generator_send globals_del string_format string_join subclass_native2_list subclass_native2_tuple try_finally_loops try_finally_return try_reraise try_reraise2 unboundlocal with1 with_break with_continue with_return'.split()})
156+
skip_tests.update({'basics/%s.py' % t for t in 'bytes_gen class_store_class closure_defargs del_deref del_local fun3 fun_calldblstar fun_callstar fun_callstardblstar fun_defargs fun_defargs2 fun_kwargs fun_kwonly fun_kwonlydef fun_kwvarargs fun_varargs gen_yield_from gen_yield_from_close gen_yield_from_ducktype gen_yield_from_exc gen_yield_from_iter gen_yield_from_send gen_yield_from_throw generator1 generator2 generator_args generator_close generator_closure generator_exc generator_return generator_send globals_del string_format string_join subclass_native2_list subclass_native2_tuple try_finally_loops try_finally_return try_reraise try_reraise2 unboundlocal with1 with_break with_continue with_return'.split()})
157157
skip_tests.add('basics/array_construct2.py') # requires generators
158158
skip_tests.add('basics/bool1.py') # seems to randomly fail
159159
skip_tests.add('basics/boundmeth1.py') # requires support for many args

0 commit comments

Comments
 (0)