diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-21 01:18:05 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-21 01:18:05 +0100 |
| commit | 0ae21a81f70806afc6f96fe099083bc8273ab34c (patch) | |
| tree | c8e4680b545c720ca28e6a142702ef2f5909f5d7 /py/nlrx86.S | |
| parent | 3771a097dac8baaf6dc8a9618dc8a1074a43c439 (diff) | |
| parent | 521de04ce2dc7048afbdb2445979a203512b13e2 (diff) | |
| download | micropython-0ae21a81f70806afc6f96fe099083bc8273ab34c.tar.gz micropython-0ae21a81f70806afc6f96fe099083bc8273ab34c.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/nlrx86.S')
| -rw-r--r-- | py/nlrx86.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/py/nlrx86.S b/py/nlrx86.S index 003de5095f..145bdb9da0 100644 --- a/py/nlrx86.S +++ b/py/nlrx86.S @@ -61,7 +61,11 @@ nlr_jump: #endif mov nlr_top, %edx # load nlr_top test %edx, %edx # check for nlr_top being NULL +#ifdef _WIN32 + je _nlr_jump_fail # fail if nlr_top is NULL +#else je nlr_jump_fail # fail if nlr_top is NULL +#endif mov 4(%esp), %eax # load return value mov %eax, 4(%edx) # store return value mov (%edx), %eax # load prev nlr_top |