kopia lustrzana https://github.com/micropython/micropython
7b050b366b
Although the original motivation given for the workaround[1] is correct,
nlr.o and nlrthumb.o are linked with a small enough distance that the
problem does not occur, and the workaround isn't necessary. The distance
between the b instruction and its target (nlr_push_tail) is just 64
bytes[2], well within the ±2046 byte range addressable by an
unconditional branch instruction in Thumb mode.
The workaround induces a relocation in the text section (textrel), which
isn't supported everywhere, notably not on musl-libc[3], where it causes
a crash on start-up. With the workaround removed, micropython works on an
ARMv5T Linux system built with musl-libc.
This commit changes nlrthumb.c to use a direct jump by default, but
leaves the long jump workaround as an option for those cases where it's
actually needed.
[1]: commit
|
||
|---|---|---|
| .. | ||
| argcheck.c | ||
| asmarm.c | ||
| asmarm.h | ||
| asmbase.c | ||
| asmbase.h | ||
| asmthumb.c | ||
| asmthumb.h | ||
| asmx64.c | ||
| asmx64.h | ||
| asmx86.c | ||
| asmx86.h | ||
| asmxtensa.c | ||
| asmxtensa.h | ||
| bc.c | ||
| bc.h | ||
| bc0.h | ||
| binary.c | ||
| binary.h | ||
| builtin.h | ||
| builtinevex.c | ||
| builtinhelp.c | ||
| builtinimport.c | ||
| compile.c | ||
| compile.h | ||
| dynruntime.h | ||
| dynruntime.mk | ||
| emit.h | ||
| emitbc.c | ||
| emitcommon.c | ||
| emitglue.c | ||
| emitglue.h | ||
| emitinlinethumb.c | ||
| emitinlinextensa.c | ||
| emitnarm.c | ||
| emitnative.c | ||
| emitnthumb.c | ||
| emitnx64.c | ||
| emitnx86.c | ||
| emitnxtensa.c | ||
| emitnxtensawin.c | ||
| formatfloat.c | ||
| formatfloat.h | ||
| frozenmod.c | ||
| frozenmod.h | ||
| gc.c | ||
| gc.h | ||
| grammar.h | ||
| lexer.c | ||
| lexer.h | ||
| make_root_pointers.py | ||
| makecompresseddata.py | ||
| makemoduledefs.py | ||
| makeqstrdata.py | ||
| makeqstrdefs.py | ||
| makeversionhdr.py | ||
| malloc.c | ||
| map.c | ||
| misc.h | ||
| mkenv.mk | ||
| mkrules.cmake | ||
| mkrules.mk | ||
| modarray.c | ||
| modbuiltins.c | ||
| modcmath.c | ||
| modcollections.c | ||
| moderrno.c | ||
| modgc.c | ||
| modio.c | ||
| modmath.c | ||
| modmicropython.c | ||
| modstruct.c | ||
| modsys.c | ||
| modthread.c | ||
| mpconfig.h | ||
| mperrno.h | ||
| mphal.h | ||
| mpprint.c | ||
| mpprint.h | ||
| mpstate.c | ||
| mpstate.h | ||
| mpthread.h | ||
| mpz.c | ||
| mpz.h | ||
| nativeglue.c | ||
| nativeglue.h | ||
| nlr.c | ||
| nlr.h | ||
| nlraarch64.c | ||
| nlrmips.c | ||
| nlrpowerpc.c | ||
| nlrsetjmp.c | ||
| nlrthumb.c | ||
| nlrx64.c | ||
| nlrx86.c | ||
| nlrxtensa.c | ||
| obj.c | ||
| obj.h | ||
| objarray.c | ||
| objarray.h | ||
| objattrtuple.c | ||
| objbool.c | ||
| objboundmeth.c | ||
| objcell.c | ||
| objclosure.c | ||
| objcomplex.c | ||
| objdeque.c | ||
| objdict.c | ||
| objenumerate.c | ||
| objexcept.c | ||
| objexcept.h | ||
| objfilter.c | ||
| objfloat.c | ||
| objfun.c | ||
| objfun.h | ||
| objgenerator.c | ||
| objgenerator.h | ||
| objgetitemiter.c | ||
| objint.c | ||
| objint.h | ||
| objint_longlong.c | ||
| objint_mpz.c | ||
| objlist.c | ||
| objlist.h | ||
| objmap.c | ||
| objmodule.c | ||
| objmodule.h | ||
| objnamedtuple.c | ||
| objnamedtuple.h | ||
| objnone.c | ||
| objobject.c | ||
| objpolyiter.c | ||
| objproperty.c | ||
| objrange.c | ||
| objreversed.c | ||
| objset.c | ||
| objsingleton.c | ||
| objslice.c | ||
| objstr.c | ||
| objstr.h | ||
| objstringio.c | ||
| objstringio.h | ||
| objstrunicode.c | ||
| objtuple.c | ||
| objtuple.h | ||
| objtype.c | ||
| objtype.h | ||
| objzip.c | ||
| opmethods.c | ||
| pairheap.c | ||
| pairheap.h | ||
| parse.c | ||
| parse.h | ||
| parsenum.c | ||
| parsenum.h | ||
| parsenumbase.c | ||
| parsenumbase.h | ||
| persistentcode.c | ||
| persistentcode.h | ||
| profile.c | ||
| profile.h | ||
| py.cmake | ||
| py.mk | ||
| pystack.c | ||
| pystack.h | ||
| qstr.c | ||
| qstr.h | ||
| qstrdefs.h | ||
| reader.c | ||
| reader.h | ||
| repl.c | ||
| repl.h | ||
| ringbuf.c | ||
| ringbuf.h | ||
| runtime.c | ||
| runtime.h | ||
| runtime0.h | ||
| runtime_utils.c | ||
| scheduler.c | ||
| scope.c | ||
| scope.h | ||
| sequence.c | ||
| showbc.c | ||
| smallint.c | ||
| smallint.h | ||
| stackctrl.c | ||
| stackctrl.h | ||
| stream.c | ||
| stream.h | ||
| unicode.c | ||
| unicode.h | ||
| usermod.cmake | ||
| vm.c | ||
| vmentrytable.h | ||
| vstr.c | ||
| warning.c | ||