1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00

Revert "core: replace BITCOIN_ONLY with a constant only in src/trezor/utils.py"

This reverts commit b9e7e93bcf.

Unfortunately this does not work, compiler cannot see it is a literal constant,
so it won't get optimized out, even when we use const(0). Also const(False)
is not supported at all.
This commit is contained in:
Pavol Rusnak 2019-09-25 12:01:11 +02:00
parent 6a9d986e20
commit d393fc6e85
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 5 additions and 10 deletions

View File

@ -23,13 +23,11 @@ def generate(env):
target = str(target[0])
source = str(source[0])
source_name = source.replace(env['source_dir'], '')
# set utils.BITCOIN_ONLY to constant in src/trezor/utils.py
if source == "src/trezor/utils.py":
btc_only = 'True' if env['bitcoin_only'] == '1' else 'False'
interim = "%s.i" % target[:-4] # replace .mpy with .i
return '$SED "s:^BITCOIN_ONLY = BITCOIN_ONLY$:BITCOIN_ONLY = %s:g" %s > %s && $MPY_CROSS -o %s -s %s %s' % (btc_only, source, interim, target, source_name, interim)
else:
return '$MPY_CROSS -o %s -s %s %s' % (target, source_name, source)
# replace "utils.BITCOIN_ONLY" with literal constant (True/False)
# so the compiler can optimize out the things we don't want
btc_only = 'True' if env['bitcoin_only'] == '1' else 'False'
interim = "%s.i" % target[:-4] # replace .mpy with .i
return '$SED "s:utils\.BITCOIN_ONLY:%s:g" %s > %s && $MPY_CROSS -o %s -s %s %s' % (btc_only, source, interim, target, source_name, interim)
env['BUILDERS']['FrozenModule'] = SCons.Builder.Builder(
generator=generate_frozen_module,

View File

@ -14,9 +14,6 @@ from trezorutils import ( # noqa: F401
set_mode_unprivileged,
)
# Don't remove! This line will be modified when freezing the module
BITCOIN_ONLY = BITCOIN_ONLY
if __debug__:
if EMULATOR:
import uos