arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 01:18:28 +00:00
Code Issues Releases Wiki Activity

unix: remove native emitters

Browse Source 
They are not being used in any trezor code.
This commit is contained in:
Jan Pochyla 2018-06-13 16:15:57 +02:00 committed by Pavol Rusnak
parent 1826f90648
commit 62111f240e
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SConscript.unix
View File

@ -133,8 +133,6 @@ SOURCE_MICROPYTHON = [
'vendor/micropython/py/emitbc.c', 'vendor/micropython/py/emitbc.c',
'vendor/micropython/py/emitcommon.c', 'vendor/micropython/py/emitcommon.c',
'vendor/micropython/py/emitglue.c', 'vendor/micropython/py/emitglue.c',
'vendor/micropython/py/emitinlinethumb.c',
'vendor/micropython/py/emitinlinextensa.c',
'vendor/micropython/py/formatfloat.c', 'vendor/micropython/py/formatfloat.c',
'vendor/micropython/py/frozenmod.c', 'vendor/micropython/py/frozenmod.c',
'vendor/micropython/py/gc.c', 'vendor/micropython/py/gc.c',
@ -231,9 +229,7 @@ SOURCE_UNIX = [
'embed/unix/usb.c', 'embed/unix/usb.c',
] ]
SOURCE_EMIT_NATIVE = ['vendor/micropython/py/emitnative.c'] SOURCE_QSTR = SOURCE_MOD + SOURCE_MICROPYTHON + SOURCE_UNIX
SOURCE_QSTR = SOURCE_MOD + SOURCE_MICROPYTHON + SOURCE_UNIX + SOURCE_EMIT_NATIVE
env = Environment(ENV=os.environ, CFLAGS=ARGUMENTS.get('CFLAGS', '')) env = Environment(ENV=os.environ, CFLAGS=ARGUMENTS.get('CFLAGS', ''))
@ -315,21 +311,6 @@ obj_program += env.Object(source=SOURCE_MOD)
obj_program += env.Object(source=SOURCE_MICROPYTHON) obj_program += env.Object(source=SOURCE_MICROPYTHON)
obj_program += env.Object(source=SOURCE_UNIX) obj_program += env.Object(source=SOURCE_UNIX)
obj_program += env.Object(
source=SOURCE_EMIT_NATIVE,
target='vendor/micropython/py/emitnx64.o',
CPPDEFINES=[env['CPPDEFINES'], 'N_X64'], )
obj_program += env.Object(
source=SOURCE_EMIT_NATIVE,
target='vendor/micropython/py/emitnx86.o',
CPPDEFINES=[env['CPPDEFINES'], 'N_X86'], )
obj_program += env.Object(
source=SOURCE_EMIT_NATIVE,
target='vendor/micropython/py/emitnthumb.o',
CPPDEFINES=[env['CPPDEFINES'], 'N_THUMB'], )
env.Depends(obj_program, qstr_generated) env.Depends(obj_program, qstr_generated)
program = env.Command( program = env.Command(

8
embed/unix/mpconfigport.h
View File

@ -29,19 +29,19 @@
#define MICROPY_ALLOC_PATH_MAX (PATH_MAX) #define MICROPY_ALLOC_PATH_MAX (PATH_MAX)
#define MICROPY_PERSISTENT_CODE_LOAD (1) #define MICROPY_PERSISTENT_CODE_LOAD (1)
#if !defined(MICROPY_EMIT_X64) && defined(__x86_64__) #if !defined(MICROPY_EMIT_X64) && defined(__x86_64__)
#define MICROPY_EMIT_X64 (1) #define MICROPY_EMIT_X64 (0)
#endif #endif
#if !defined(MICROPY_EMIT_X86) && defined(__i386__) #if !defined(MICROPY_EMIT_X86) && defined(__i386__)
#define MICROPY_EMIT_X86 (1) #define MICROPY_EMIT_X86 (0)
#endif #endif
#if !defined(MICROPY_EMIT_THUMB) && defined(__thumb2__) #if !defined(MICROPY_EMIT_THUMB) && defined(__thumb2__)
#define MICROPY_EMIT_THUMB (1) #define MICROPY_EMIT_THUMB (0)
#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1)) #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
#endif #endif
// Some compilers define __thumb2__ and __arm__ at the same time, let // Some compilers define __thumb2__ and __arm__ at the same time, let
// autodetected thumb2 emitter have priority. // autodetected thumb2 emitter have priority.
#if !defined(MICROPY_EMIT_ARM) && defined(__arm__) && !defined(__thumb2__) #if !defined(MICROPY_EMIT_ARM) && defined(__arm__) && !defined(__thumb2__)
#define MICROPY_EMIT_ARM (1) #define MICROPY_EMIT_ARM (0)
#endif #endif
#define MICROPY_COMP_MODULE_CONST (1) #define MICROPY_COMP_MODULE_CONST (1)
#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1) #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)