diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-10-25 18:19:55 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-10-25 23:37:57 +0100 |
| commit | 124df6f8d07b53542b6960dbeea9b63bff469a67 (patch) | |
| tree | 39ea11d0bed72ed828c406d2b4a8fc069b00ca4e /py/objexcept.c | |
| parent | d7353fe6fe9c9d421ef045c0eea8d4591710e1ba (diff) | |
| download | micropython-124df6f8d07b53542b6960dbeea9b63bff469a67.tar.gz micropython-124df6f8d07b53542b6960dbeea9b63bff469a67.zip | |
py: Add mp_pending_exception global variable, for VM soft interrupt.
This allows to implement KeyboardInterrupt on unix, and a much safer
ctrl-C in stmhal port. First ctrl-C is a soft one, with hope that VM
will notice it; second ctrl-C is a hard one that kills anything (for
both unix and stmhal).
One needs to check for a pending exception in the VM only for jump
opcodes. Others can't produce an infinite loop (infinite recursion is
caught by stack check).
Diffstat (limited to 'py/objexcept.c')
| -rw-r--r-- | py/objexcept.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objexcept.c b/py/objexcept.c index 203517b106..9b39788759 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -211,7 +211,7 @@ const mp_obj_type_t mp_type_ ## exc_name = { \ // http://docs.python.org/3/library/exceptions.html MP_DEFINE_EXCEPTION_BASE(BaseException) MP_DEFINE_EXCEPTION(SystemExit, BaseException) -//MP_DEFINE_EXCEPTION(KeyboardInterrupt, BaseException) +MP_DEFINE_EXCEPTION(KeyboardInterrupt, BaseException) MP_DEFINE_EXCEPTION(GeneratorExit, BaseException) MP_DEFINE_EXCEPTION(Exception, BaseException) MP_DEFINE_EXCEPTION_BASE(Exception) |