py: Fix compilation of persistentcode with uncommon configs #4753
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dpgeorge
reviewed
May 6, 2019
There are a lot of places testing MICROPY_EMIT_NATIVE || MICROPY_EMIT_INLINE_ASM. Define a new macro for it.
With the following configuration:
#define MICROPY_PERSISTENT_CODE_SAVE (1)
#define MICROPY_PERSISTENT_CODE_LOAD (1)
The code fails to compile:
persistentcode.c: In function 'load_raw_code':
persistentcode.c:457:13: error: 'n_obj' undeclared
n_obj, n_raw_code,
If MICROPY_EMIT_NATIVE disabled, there are more errors due to the use of
undefined fields in mp_raw_code_t.
This patch fixes compilation by avoiding undefined fields.
MICROPY_EMIT_NATIVE was changed to MICROPY_EMIT_ANY_ASM in this file to
match mp_raw_code_t definition.
dpgeorge
reviewed
May 6, 2019
| @@ -329,6 +329,9 @@ | |||
| // Convenience definition for whether any inline assembler emitter is enabled | |||
| #define MICROPY_EMIT_INLINE_ASM (MICROPY_EMIT_INLINE_THUMB || MICROPY_EMIT_INLINE_XTENSA) | |||
|
|
|||
| // Convenience definition for whether any native or inline assembler emitter is enabled | |||
| #define MICROPY_EMIT_ANY_ASM (MICROPY_EMIT_NATIVE || MICROPY_EMIT_INLINE_ASM) | |||
There was a problem hiding this comment.
Yes, it's probably a good idea to make this define. But, I'm just thinking if there's a better name for it, because "any asm" could be mistaken for meaning "any inline asm" (which is already what MICROPY_EMIT_INLINE_ASM is for).
Maybe MICROPY_EMIT_MACHINE_CODE?
|
@quark-zju I'm happy to make the final changes (rename to |
|
MICROPY_EMIT_MACHINE_CODE options seems a very good way to open doors to the new WASM inlining possibility javascript port can offer and its name is generic enough for future use. it would also help to formulate PR for javascript port more early. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With the following configuration:
The code fails to compile:
If MICROPY_EMIT_NATIVE disabled, there are more errors due to the use of
undefined fields in mp_raw_code_t.
This patch fixes compilation by avoiding undefined fields.