Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1 | #include <stdlib.h> |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 2 | #include <assert.h> |
| 3 | |
| 4 | #include "nlr.h" |
| 5 | #include "misc.h" |
| 6 | #include "mpconfig.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 7 | #include "qstr.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 8 | #include "obj.h" |
| 9 | #include "runtime.h" |
| 10 | #include "bc.h" |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 11 | #include "objgenerator.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 12 | |
| 13 | /******************************************************************************/ |
| 14 | /* generator wrapper */ |
| 15 | |
| 16 | typedef struct _mp_obj_gen_wrap_t { |
| 17 | mp_obj_base_t base; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 18 | mp_obj_t *fun; |
| 19 | } mp_obj_gen_wrap_t; |
| 20 | |
Paul Sokolovsky | 7fafb28 | 2014-03-30 20:21:28 +0300 | [diff] [blame] | 21 | mp_obj_t mp_obj_new_gen_instance(const byte *bytecode, uint n_args, const mp_obj_t *args, uint n_args2, const mp_obj_t *args2); |
| 22 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 23 | STATIC mp_obj_t gen_wrap_call(mp_obj_t self_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 24 | mp_obj_gen_wrap_t *self = self_in; |
| 25 | mp_obj_t self_fun = self->fun; |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 26 | assert(MP_OBJ_IS_TYPE(self_fun, &mp_type_fun_bc)); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 27 | int bc_n_args; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 28 | const byte *bc_code; |
Damien George | bee17b0 | 2014-03-27 11:07:04 +0000 | [diff] [blame] | 29 | mp_obj_fun_bc_get(self_fun, &bc_n_args, &bc_code); |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 30 | |
Paul Sokolovsky | 7fafb28 | 2014-03-30 20:21:28 +0300 | [diff] [blame] | 31 | const mp_obj_t *args1, *args2; |
| 32 | uint len1, len2; |
Damien George | 0997af9 | 2014-03-30 21:55:28 +0100 | [diff] [blame] | 33 | if (!mp_obj_fun_prepare_simple_args(self_fun, n_args, n_kw, args, &len1, &args1, &len2, &args2)) { |
| 34 | assert(0); |
| 35 | } |
Paul Sokolovsky | 7fafb28 | 2014-03-30 20:21:28 +0300 | [diff] [blame] | 36 | |
| 37 | return mp_obj_new_gen_instance(bc_code, len1, args1, len2, args2); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 38 | } |
| 39 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 40 | const mp_obj_type_t mp_type_gen_wrap = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 41 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 42 | .name = MP_QSTR_generator, |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 43 | .call = gen_wrap_call, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 44 | }; |
| 45 | |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 46 | mp_obj_t mp_obj_new_gen_wrap(mp_obj_t fun) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 47 | mp_obj_gen_wrap_t *o = m_new_obj(mp_obj_gen_wrap_t); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 48 | o->base.type = &mp_type_gen_wrap; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 49 | o->fun = fun; |
| 50 | return o; |
| 51 | } |
| 52 | |
| 53 | /******************************************************************************/ |
| 54 | /* generator instance */ |
| 55 | |
| 56 | typedef struct _mp_obj_gen_instance_t { |
| 57 | mp_obj_base_t base; |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 58 | const byte *code_info; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 59 | const byte *ip; |
| 60 | mp_obj_t *sp; |
Paul Sokolovsky | 8dc768b | 2014-03-22 22:53:53 +0200 | [diff] [blame] | 61 | // bit 0 is saved currently_in_except_block value |
Damien George | 89f94b5 | 2014-03-30 00:57:09 +0000 | [diff] [blame] | 62 | mp_exc_stack_t *exc_sp; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 63 | uint n_state; |
Paul Sokolovsky | 8dc768b | 2014-03-22 22:53:53 +0200 | [diff] [blame] | 64 | // Variable-length |
| 65 | mp_obj_t state[0]; |
| 66 | // Variable-length, never accessed by name, only as (void*)(state + n_state) |
Damien George | 89f94b5 | 2014-03-30 00:57:09 +0000 | [diff] [blame] | 67 | mp_exc_stack_t exc_state[0]; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 68 | } mp_obj_gen_instance_t; |
| 69 | |
Paul Sokolovsky | 76d982e | 2014-01-13 19:19:16 +0200 | [diff] [blame] | 70 | void gen_instance_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 71 | print(env, "<generator object 'fun-name' at %p>", self_in); |
| 72 | } |
| 73 | |
| 74 | mp_obj_t gen_instance_getiter(mp_obj_t self_in) { |
| 75 | return self_in; |
| 76 | } |
| 77 | |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 78 | mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t *ret_val) { |
Paul Sokolovsky | aaff716 | 2014-03-30 02:32:30 +0200 | [diff] [blame] | 79 | assert(MP_OBJ_IS_TYPE(self_in, &mp_type_gen_instance)); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 80 | mp_obj_gen_instance_t *self = self_in; |
Paul Sokolovsky | 14d28be | 2014-01-27 01:01:37 +0200 | [diff] [blame] | 81 | if (self->ip == 0) { |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 82 | *ret_val = MP_OBJ_NULL; |
| 83 | return MP_VM_RETURN_NORMAL; |
Paul Sokolovsky | 14d28be | 2014-01-27 01:01:37 +0200 | [diff] [blame] | 84 | } |
Paul Sokolovsky | bf38e2a | 2014-01-26 20:50:11 +0200 | [diff] [blame] | 85 | if (self->sp == self->state - 1) { |
| 86 | if (send_value != mp_const_none) { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 87 | nlr_jump(mp_obj_new_exception_msg(&mp_type_TypeError, "can't send non-None value to a just-started generator")); |
Paul Sokolovsky | bf38e2a | 2014-01-26 20:50:11 +0200 | [diff] [blame] | 88 | } |
| 89 | } else { |
| 90 | *self->sp = send_value; |
| 91 | } |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 92 | mp_vm_return_kind_t ret_kind = mp_execute_byte_code_2(self->code_info, &self->ip, |
Damien George | 89f94b5 | 2014-03-30 00:57:09 +0000 | [diff] [blame] | 93 | &self->state[self->n_state - 1], &self->sp, (mp_exc_stack_t*)(self->state + self->n_state), |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 94 | &self->exc_sp, throw_value); |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 95 | |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 96 | switch (ret_kind) { |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 97 | case MP_VM_RETURN_NORMAL: |
| 98 | // Explicitly mark generator as completed. If we don't do this, |
| 99 | // subsequent next() may re-execute statements after last yield |
| 100 | // again and again, leading to side effects. |
| 101 | // TODO: check how return with value behaves under such conditions |
| 102 | // in CPython. |
| 103 | self->ip = 0; |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 104 | *ret_val = *self->sp; |
| 105 | break; |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 106 | |
| 107 | case MP_VM_RETURN_YIELD: |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 108 | *ret_val = *self->sp; |
| 109 | break; |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 110 | |
| 111 | case MP_VM_RETURN_EXCEPTION: |
Paul Sokolovsky | 61fd20f | 2014-03-22 16:44:58 +0200 | [diff] [blame] | 112 | self->ip = 0; |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 113 | *ret_val = self->state[self->n_state - 1]; |
| 114 | break; |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 115 | |
| 116 | default: |
| 117 | assert(0); |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 118 | *ret_val = mp_const_none; |
| 119 | break; |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 120 | } |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 121 | |
| 122 | return ret_kind; |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 123 | } |
| 124 | |
| 125 | STATIC mp_obj_t gen_resume_and_raise(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value) { |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 126 | mp_obj_t ret; |
| 127 | switch (mp_obj_gen_resume(self_in, send_value, throw_value, &ret)) { |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 128 | case MP_VM_RETURN_NORMAL: |
| 129 | // Optimize return w/o value in case generator is used in for loop |
Paul Sokolovsky | 1eac05d | 2014-03-31 04:08:42 +0300 | [diff] [blame] | 130 | if (ret == mp_const_none || ret == MP_OBJ_NULL) { |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 131 | return MP_OBJ_NULL; |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 132 | } else { |
| 133 | nlr_jump(mp_obj_new_exception_args(&mp_type_StopIteration, 1, &ret)); |
| 134 | } |
| 135 | |
| 136 | case MP_VM_RETURN_YIELD: |
Paul Sokolovsky | 817e76a | 2014-03-31 04:09:53 +0300 | [diff] [blame] | 137 | if (throw_value != MP_OBJ_NULL && mp_obj_is_subclass_fast(mp_obj_get_type(throw_value), &mp_type_GeneratorExit)) { |
| 138 | nlr_jump(mp_obj_new_exception_msg(&mp_type_RuntimeError, "generator ignored GeneratorExit")); |
| 139 | } |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 140 | return ret; |
| 141 | |
| 142 | case MP_VM_RETURN_EXCEPTION: |
Paul Sokolovsky | f39d3b9 | 2014-03-30 23:14:55 +0300 | [diff] [blame] | 143 | // TODO: Optimization of returning MP_OBJ_NULL is really part |
| 144 | // of mp_iternext() protocol, but this function is called by other methods |
| 145 | // too, which may not handled MP_OBJ_NULL. |
| 146 | if (mp_obj_is_subclass_fast(mp_obj_get_type(ret), &mp_type_StopIteration)) { |
| 147 | return MP_OBJ_NULL; |
| 148 | } else { |
| 149 | nlr_jump(ret); |
| 150 | } |
Paul Sokolovsky | 61fd20f | 2014-03-22 16:44:58 +0200 | [diff] [blame] | 151 | |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 152 | default: |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 153 | assert(0); |
| 154 | return mp_const_none; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 155 | } |
| 156 | } |
Paul Sokolovsky | bf38e2a | 2014-01-26 20:50:11 +0200 | [diff] [blame] | 157 | |
| 158 | mp_obj_t gen_instance_iternext(mp_obj_t self_in) { |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 159 | return gen_resume_and_raise(self_in, mp_const_none, MP_OBJ_NULL); |
Paul Sokolovsky | bf38e2a | 2014-01-26 20:50:11 +0200 | [diff] [blame] | 160 | } |
| 161 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 162 | STATIC mp_obj_t gen_instance_send(mp_obj_t self_in, mp_obj_t send_value) { |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 163 | mp_obj_t ret = gen_resume_and_raise(self_in, send_value, MP_OBJ_NULL); |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 164 | if (ret == MP_OBJ_NULL) { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 165 | nlr_jump(mp_obj_new_exception(&mp_type_StopIteration)); |
| 166 | } else { |
| 167 | return ret; |
Paul Sokolovsky | 14d28be | 2014-01-27 01:01:37 +0200 | [diff] [blame] | 168 | } |
Paul Sokolovsky | 14d28be | 2014-01-27 01:01:37 +0200 | [diff] [blame] | 169 | } |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 170 | |
Paul Sokolovsky | d5df6cd | 2014-02-12 18:15:40 +0200 | [diff] [blame] | 171 | STATIC MP_DEFINE_CONST_FUN_OBJ_2(gen_instance_send_obj, gen_instance_send); |
Paul Sokolovsky | 14d28be | 2014-01-27 01:01:37 +0200 | [diff] [blame] | 172 | |
Paul Sokolovsky | 9a54a22 | 2014-03-30 13:13:12 +0300 | [diff] [blame] | 173 | STATIC mp_obj_t gen_instance_close(mp_obj_t self_in); |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 174 | STATIC mp_obj_t gen_instance_throw(uint n_args, const mp_obj_t *args) { |
Paul Sokolovsky | 9a54a22 | 2014-03-30 13:13:12 +0300 | [diff] [blame] | 175 | mp_obj_t exc = (n_args == 2) ? args[1] : args[2]; |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 176 | exc = mp_make_raise_obj(exc); |
Paul Sokolovsky | 9a54a22 | 2014-03-30 13:13:12 +0300 | [diff] [blame] | 177 | |
| 178 | mp_obj_t ret = gen_resume_and_raise(args[0], mp_const_none, exc); |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 179 | if (ret == MP_OBJ_NULL) { |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 180 | nlr_jump(mp_obj_new_exception(&mp_type_StopIteration)); |
| 181 | } else { |
| 182 | return ret; |
| 183 | } |
| 184 | } |
| 185 | |
| 186 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gen_instance_throw_obj, 2, 4, gen_instance_throw); |
| 187 | |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 188 | STATIC mp_obj_t gen_instance_close(mp_obj_t self_in) { |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 189 | mp_obj_t ret; |
Damien George | 07ddab5 | 2014-03-29 13:15:08 +0000 | [diff] [blame] | 190 | switch (mp_obj_gen_resume(self_in, mp_const_none, (mp_obj_t)&mp_const_GeneratorExit_obj, &ret)) { |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 191 | case MP_VM_RETURN_YIELD: |
| 192 | nlr_jump(mp_obj_new_exception_msg(&mp_type_RuntimeError, "generator ignored GeneratorExit")); |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 193 | |
Damien George | 69b3ba0 | 2014-03-26 19:33:23 +0000 | [diff] [blame] | 194 | // Swallow StopIteration & GeneratorExit (== successful close), and re-raise any other |
| 195 | case MP_VM_RETURN_EXCEPTION: |
| 196 | // ret should always be an instance of an exception class |
| 197 | if (mp_obj_is_subclass_fast(mp_obj_get_type(ret), &mp_type_GeneratorExit) || |
| 198 | mp_obj_is_subclass_fast(mp_obj_get_type(ret), &mp_type_StopIteration)) { |
| 199 | return mp_const_none; |
| 200 | } |
| 201 | nlr_jump(ret); |
| 202 | |
| 203 | default: |
| 204 | // The only choice left is MP_VM_RETURN_NORMAL which is successful close |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 205 | return mp_const_none; |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 206 | } |
Paul Sokolovsky | 962b1cd | 2014-03-23 21:48:29 +0200 | [diff] [blame] | 207 | } |
| 208 | |
| 209 | STATIC MP_DEFINE_CONST_FUN_OBJ_1(gen_instance_close_obj, gen_instance_close); |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 210 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 211 | STATIC const mp_map_elem_t gen_instance_locals_dict_table[] = { |
| 212 | { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&gen_instance_close_obj }, |
| 213 | { MP_OBJ_NEW_QSTR(MP_QSTR_send), (mp_obj_t)&gen_instance_send_obj }, |
| 214 | { MP_OBJ_NEW_QSTR(MP_QSTR_throw), (mp_obj_t)&gen_instance_throw_obj }, |
Paul Sokolovsky | bf38e2a | 2014-01-26 20:50:11 +0200 | [diff] [blame] | 215 | }; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 216 | |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 217 | STATIC MP_DEFINE_CONST_DICT(gen_instance_locals_dict, gen_instance_locals_dict_table); |
| 218 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 219 | const mp_obj_type_t mp_type_gen_instance = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 220 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 221 | .name = MP_QSTR_generator, |
Damien George | 97209d3 | 2014-01-07 15:58:30 +0000 | [diff] [blame] | 222 | .print = gen_instance_print, |
| 223 | .getiter = gen_instance_getiter, |
| 224 | .iternext = gen_instance_iternext, |
Damien George | 9b196cd | 2014-03-26 21:47:19 +0000 | [diff] [blame] | 225 | .locals_dict = (mp_obj_t)&gen_instance_locals_dict, |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 226 | }; |
| 227 | |
Paul Sokolovsky | 7fafb28 | 2014-03-30 20:21:28 +0300 | [diff] [blame] | 228 | mp_obj_t mp_obj_new_gen_instance(const byte *bytecode, uint n_args, const mp_obj_t *args, uint n_args2, const mp_obj_t *args2) { |
Paul Sokolovsky | 6ae237d | 2014-03-30 02:33:08 +0200 | [diff] [blame] | 229 | const byte *code_info = bytecode; |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 230 | // get code info size, and skip the line number table |
| 231 | machine_uint_t code_info_size = bytecode[0] | (bytecode[1] << 8) | (bytecode[2] << 16) | (bytecode[3] << 24); |
| 232 | bytecode += code_info_size; |
| 233 | |
Damien George | bee17b0 | 2014-03-27 11:07:04 +0000 | [diff] [blame] | 234 | // bytecode prelude: get state size and exception stack size |
| 235 | machine_uint_t n_state = bytecode[0] | (bytecode[1] << 8); |
| 236 | machine_uint_t n_exc_stack = bytecode[2] | (bytecode[3] << 8); |
| 237 | bytecode += 4; |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 238 | |
| 239 | // bytecode prelude: initialise closed over variables |
| 240 | // TODO |
| 241 | // for now we just make sure there are no cells variables |
| 242 | // need to work out how to implement closed over variables in generators |
| 243 | assert(bytecode[0] == 0); |
| 244 | bytecode += 1; |
| 245 | |
Damien George | 89f94b5 | 2014-03-30 00:57:09 +0000 | [diff] [blame] | 246 | mp_obj_gen_instance_t *o = m_new_obj_var(mp_obj_gen_instance_t, byte, n_state * sizeof(mp_obj_t) + n_exc_stack * sizeof(mp_exc_stack_t)); |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 247 | o->base.type = &mp_type_gen_instance; |
Paul Sokolovsky | 6ae237d | 2014-03-30 02:33:08 +0200 | [diff] [blame] | 248 | o->code_info = code_info; |
Damien George | 0ff8839 | 2014-01-02 20:57:05 +0000 | [diff] [blame] | 249 | o->ip = bytecode; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 250 | o->sp = &o->state[0] - 1; // sp points to top of stack, which starts off 1 below the state |
Damien George | 89f94b5 | 2014-03-30 00:57:09 +0000 | [diff] [blame] | 251 | o->exc_sp = (mp_exc_stack_t*)(o->state + n_state) - 1; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 252 | o->n_state = n_state; |
Damien George | 0ff8839 | 2014-01-02 20:57:05 +0000 | [diff] [blame] | 253 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 254 | // copy args to end of state array, in reverse (that's how mp_execute_byte_code_2 needs it) |
Paul Sokolovsky | 7fafb28 | 2014-03-30 20:21:28 +0300 | [diff] [blame] | 255 | for (uint i = 0; i < n_args; i++) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 256 | o->state[n_state - 1 - i] = args[i]; |
Damien George | 0ff8839 | 2014-01-02 20:57:05 +0000 | [diff] [blame] | 257 | } |
Paul Sokolovsky | 7fafb28 | 2014-03-30 20:21:28 +0300 | [diff] [blame] | 258 | for (uint i = 0; i < n_args2; i++) { |
| 259 | o->state[n_state - 1 - n_args - i] = args2[i]; |
| 260 | } |
Damien George | 0ff8839 | 2014-01-02 20:57:05 +0000 | [diff] [blame] | 261 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 262 | return o; |
| 263 | } |