b37b578214
Support for architecture-specific qstr linking was removed ind4d53e9e11, where native code was changed to access qstr values via qstr_table. The only remaining use for the special qstr link table in persistentcode.c is to support native module written in C, linked via mpy_ld.py. But native modules can also use the standard module-level qstr_table (and obj_table) which was introduced in the .mpy file reworking inf2040bfc7e. This commit removes the remaining native qstr liking support in persistentcode.c's load_raw_code function, and adds two new relocation options for constants.qstr_table and constants.obj_table. mpy_ld.py is updated to use these relocations options instead of the native qstr link table. Signed-off-by: Damien George <damien@micropython.org>
127 lines
3.2 KiB
Python
127 lines
3.2 KiB
Python
# test importing of .mpy files with native code
|
|
|
|
try:
|
|
import usys, uio, uos
|
|
|
|
usys.implementation._mpy
|
|
uio.IOBase
|
|
uos.mount
|
|
except (ImportError, AttributeError):
|
|
print("SKIP")
|
|
raise SystemExit
|
|
|
|
mpy_arch = usys.implementation._mpy >> 8
|
|
if mpy_arch == 0:
|
|
print("SKIP")
|
|
raise SystemExit
|
|
|
|
|
|
class UserFile(uio.IOBase):
|
|
def __init__(self, data):
|
|
self.data = memoryview(data)
|
|
self.pos = 0
|
|
|
|
def readinto(self, buf):
|
|
n = min(len(buf), len(self.data) - self.pos)
|
|
buf[:n] = self.data[self.pos : self.pos + n]
|
|
self.pos += n
|
|
return n
|
|
|
|
def ioctl(self, req, arg):
|
|
return 0
|
|
|
|
|
|
class UserFS:
|
|
def __init__(self, files):
|
|
self.files = files
|
|
|
|
def mount(self, readonly, mksfs):
|
|
pass
|
|
|
|
def umount(self):
|
|
pass
|
|
|
|
def stat(self, path):
|
|
if path in self.files:
|
|
return (32768, 0, 0, 0, 0, 0, 0, 0, 0, 0)
|
|
raise OSError
|
|
|
|
def open(self, path, mode):
|
|
return UserFile(self.files[path])
|
|
|
|
|
|
# these are the test .mpy files
|
|
valid_header = bytes([77, 6, mpy_arch, 31])
|
|
# fmt: off
|
|
user_files = {
|
|
# bad architecture
|
|
'/mod0.mpy': b'M\x06\xfc\x1f',
|
|
|
|
# test loading of viper and asm
|
|
'/mod1.mpy': valid_header + (
|
|
b'\x02' # n_qstr
|
|
b'\x00' # n_obj
|
|
|
|
b'\x0emod1.py\x00' # qstr0 = "mod1.py"
|
|
b'\x0aouter\x00' # qstr1 = "outer"
|
|
|
|
b'\x2c' # 5 bytes, have children, bytecode
|
|
b'\x00\x02' # prelude
|
|
b'\x01' # simple name (qstr index)
|
|
b'\x51' # LOAD_CONST_NONE
|
|
b'\x63' # RETURN_VALUE
|
|
|
|
b'\x02' # 2 children
|
|
|
|
b'\x42' # 8 bytes, no children, viper code
|
|
b'\x00\x00\x00\x00\x00\x00\x00\x00' # dummy machine code
|
|
b'\x00' # scope_flags
|
|
|
|
b'\x43' # 8 bytes, no children, asm code
|
|
b'\x00\x00\x00\x00\x00\x00\x00\x00' # dummy machine code
|
|
b'\x00\x00\x00' # scope_flags, n_pos_args, type_sig
|
|
),
|
|
|
|
# test loading viper with additional scope flags and relocation
|
|
'/mod2.mpy': valid_header + (
|
|
b'\x02' # n_qstr
|
|
b'\x00' # n_obj
|
|
|
|
b'\x0emod2.py\x00' # qstr0 = "mod2.py"
|
|
b'\x0aouter\x00' # qstr1 = "outer"
|
|
|
|
b'\x2c' # 5 bytes, have children, bytecode
|
|
b'\x00\x02' # prelude
|
|
b'\x01' # simple name (qstr index)
|
|
b'\x51' # LOAD_CONST_NONE
|
|
b'\x63' # RETURN_VALUE
|
|
|
|
b'\x01' # 1 child
|
|
|
|
b'\x22' # 4 bytes, no children, viper code
|
|
b'\x00\x00\x00\x00' # dummy machine code
|
|
b'\x70' # scope_flags: VIPERBSS | VIPERRODATA | VIPERRELOC
|
|
b'\x06\x04' # rodata=6 bytes, bss=4 bytes
|
|
b'rodata' # rodata content
|
|
b'\x03\x01\x00' # dummy relocation of rodata
|
|
),
|
|
}
|
|
# fmt: on
|
|
|
|
# create and mount a user filesystem
|
|
uos.mount(UserFS(user_files), "/userfs")
|
|
usys.path.append("/userfs")
|
|
|
|
# import .mpy files from the user filesystem
|
|
for i in range(len(user_files)):
|
|
mod = "mod%u" % i
|
|
try:
|
|
__import__(mod)
|
|
print(mod, "OK")
|
|
except ValueError as er:
|
|
print(mod, "ValueError", er)
|
|
|
|
# unmount and undo path addition
|
|
uos.umount("/userfs")
|
|
usys.path.pop()
|