Skip to content

RTX5: Pre-processor defines used for assembly #6029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 16, 2018

Conversation

deepikabhavnani
Copy link

CMSIS repo does not support pre-processor defines, hence multiple assembly files are added for secure/non-secure and floating point tools.

Mbed OS tools support assembly file pre-processing, but the build system does not support multiple assembly files for each target, hence updating the assembly files.

@0xc0170 @bulislaw

Once this PR is merged to the master, SHA should be recorded in cmsis_importer.json script so that files are not over-written in next CMSIS update.

CMSIS repo does not support pre-processor defines, hence multiple assembly
files are added for secure/non-secure and floating point tools.

Mbed OS tools support assembly file pre-processing, but the build system
does not support multiple assembly files for each target, hence updating
the assembly files.
@@ -1,3 +0,0 @@
.equ __FPU_USED, 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do not need these removed files at all?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we don’t need them. We can add FPU and other defines from tools, based on core selected or using -D option

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not use -D if we can avoid it.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally FPU and DSP selection should be supported from tools, agree to that.

@0xc0170
Copy link
Contributor

0xc0170 commented Feb 7, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Feb 7, 2018

Build : SUCCESS

Build number : 1085
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6029/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build

@mbed-ci
Copy link

mbed-ci commented Feb 7, 2018

Copy link
Member

@bulislaw bulislaw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes need to go to CMSIS repo first.

@mbed-ci
Copy link

mbed-ci commented Feb 7, 2018

@deepikabhavnani
Copy link
Author

These changes will not be accepted by CMSIS repo as per my knowledge. Its same as cortex 4/7 processor where we have FPU defines and code is not same as CMSIS

@deepikabhavnani
Copy link
Author

@bulislaw - We need ARM-software/CMSIS_5@05fa9d3#diff-87a9bb8eedc11ec34f4697a894983dd4 changes from CMSIS for M23, do we have any plans to update CMSIS/RTX code in mbed-os

Systick handler switch to secure/nonsecure issues addressed:
1. Switch to secure/nonsecure context save/restore is based on 6th bit in
LR register, correct the bug (R7 instead of LR was used for decision)
2. Prevent R7 from being corrupted in Sys_ContextSave
3. Branch when non-secure rather than secure
@bulislaw
Copy link
Member

bulislaw commented Feb 9, 2018

These changes will not be accepted by CMSIS repo as per my knowledge. Its same as cortex 4/7 processor where we have FPU defines and code is not same as CMSIS

We will need to get rid of all changes to CMSIS/RTX soon to support cmsis-pack.
@theotherjimmy any ideas how do we make this changes while using packs?

@theotherjimmy
Copy link
Contributor

What are you asking exactly? Until the build system can build a cmsis-pack directly, we need to have some modifications to the CMSIS_5 repo to make it build with our build system.

@bulislaw
Copy link
Member

bulislaw commented Feb 9, 2018

@deepikabhavnani shall we add patches to our update script config file?

@deepikabhavnani
Copy link
Author

@bulislaw - Update the json file with SHA for this fix

@deepikabhavnani
Copy link
Author

/morph build

@mbed-ci
Copy link

mbed-ci commented Feb 13, 2018

Build : SUCCESS

Build number : 1132
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6029/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build

@mbed-ci
Copy link

mbed-ci commented Feb 14, 2018

@mbed-ci
Copy link

mbed-ci commented Feb 14, 2018

@cmonr cmonr merged commit 4145cc0 into ARMmbed:master Feb 16, 2018
@deepikabhavnani deepikabhavnani deleted the update_context_switch_files branch February 16, 2018 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants