File tree Expand file tree Collapse file tree 4 files changed +30
-25
lines changed Expand file tree Collapse file tree 4 files changed +30
-25
lines changed Original file line number Diff line number Diff line change 1
1
/**************************************************************************/ /**
2
2
* @file cmsis_armcc.h
3
3
* @brief CMSIS compiler specific macros, functions, instructions
4
- * @version V1.0.2
5
- * @date 10. January 2018
4
+ * @version V1.0.3
5
+ * @date 15. May 2019
6
6
******************************************************************************/
7
7
/*
8
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
8
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
9
9
*
10
10
* SPDX-License-Identifier: Apache-2.0
11
11
*
@@ -533,10 +533,10 @@ __STATIC_INLINE __ASM void __FPU_Enable(void)
533
533
ENDIF
534
534
535
535
//Initialise FPSCR to a known state
536
- VMRS R2 ,FPSCR
537
- LDR R3 ,= 0x00086060 //Mask off all bits that do not have to be preserved. Non-preserved bits can/should be zero.
538
- AND R2 , R2 , R3
539
- VMSR FPSCR ,R2
536
+ VMRS R1 ,FPSCR
537
+ LDR R2 ,= 0x00086060 //Mask off all bits that do not have to be preserved. Non-preserved bits can/should be zero.
538
+ AND R1 , R1 , R2
539
+ VMSR FPSCR ,R1
540
540
541
541
BX LR
542
542
}
Original file line number Diff line number Diff line change 1
1
/**************************************************************************/ /**
2
2
* @file cmsis_armclang.h
3
3
* @brief CMSIS compiler specific macros, functions, instructions
4
- * @version V1.1.0
5
- * @date 18. March 2019
4
+ * @version V1.1.1
5
+ * @date 15. May 2019
6
6
******************************************************************************/
7
7
/*
8
8
* Copyright (c) 2009-2019 Arm Limited. All rights reserved.
@@ -509,10 +509,11 @@ __STATIC_INLINE void __FPU_Enable(void)
509
509
#endif
510
510
511
511
//Initialise FPSCR to a known state
512
- " VMRS R2,FPSCR \n"
513
- " LDR R3,=0x00086060 \n" //Mask off all bits that do not have to be preserved. Non-preserved bits can/should be zero.
514
- " AND R2,R2,R3 \n"
515
- " VMSR FPSCR,R2 "
512
+ " VMRS R1,FPSCR \n"
513
+ " LDR R2,=0x00086060 \n" //Mask off all bits that do not have to be preserved. Non-preserved bits can/should be zero.
514
+ " AND R1,R1,R2 \n"
515
+ " VMSR FPSCR,R1 "
516
+ : : : "cc ", "r1" , "r2"
516
517
);
517
518
}
518
519
Original file line number Diff line number Diff line change 1
1
/**************************************************************************/ /**
2
2
* @file cmsis_gcc.h
3
3
* @brief CMSIS compiler specific macros, functions, instructions
4
- * @version V1.1.0
5
- * @date 20. December 2018
4
+ * @version V1.1.1
5
+ * @date 15. May 2019
6
6
******************************************************************************/
7
7
/*
8
- * Copyright (c) 2009-2018 Arm Limited. All rights reserved.
8
+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved.
9
9
*
10
10
* SPDX-License-Identifier: Apache-2.0
11
11
*
@@ -683,10 +683,11 @@ __STATIC_INLINE void __FPU_Enable(void)
683
683
#endif
684
684
685
685
//Initialise FPSCR to a known state
686
- " VMRS R2,FPSCR \n"
687
- " LDR R3,=0x00086060 \n" //Mask off all bits that do not have to be preserved. Non-preserved bits can/should be zero.
688
- " AND R2,R2,R3 \n"
689
- " VMSR FPSCR,R2 "
686
+ " VMRS R1,FPSCR \n"
687
+ " LDR R2,=0x00086060 \n" //Mask off all bits that do not have to be preserved. Non-preserved bits can/should be zero.
688
+ " AND R1,R1,R2 \n"
689
+ " VMSR FPSCR,R1 "
690
+ : : : "cc ", "r1" , "r2"
690
691
);
691
692
}
692
693
Original file line number Diff line number Diff line change 2
2
* @file cmsis_iccarm.h
3
3
* @brief CMSIS compiler ICCARM (IAR Compiler for Arm) header file
4
4
* @version V5.0.7
5
- * @date 04. Semptember 2018
5
+ * @date 15. May 2019
6
6
******************************************************************************/
7
7
8
8
//------------------------------------------------------------------------------
9
9
//
10
10
// Copyright (c) 2017-2018 IAR Systems
11
+ // Copyright (c) 2018-2019 Arm Limited
11
12
//
12
13
// Licensed under the Apache License, Version 2.0 (the "License")
13
14
// you may not use this file except in compliance with the License.
@@ -547,10 +548,12 @@ void __FPU_Enable(void)
547
548
#endif
548
549
549
550
//Initialise FPSCR to a known state
550
- " VMRS R2,FPSCR \n"
551
- " MOV32 R3,#0x00086060 \n" //Mask off all bits that do not have to be preserved. Non-preserved bits can/should be zero.
552
- " AND R2,R2,R3 \n"
553
- " VMSR FPSCR,R2 \n" );
551
+ " VMRS R1,FPSCR \n"
552
+ " MOV32 R2,#0x00086060 \n" //Mask off all bits that do not have to be preserved. Non-preserved bits can/should be zero.
553
+ " AND R1,R1,R2 \n"
554
+ " VMSR FPSCR,R1 \n"
555
+ : : : "cc ", "r1" , "r2"
556
+ );
554
557
}
555
558
556
559
You can’t perform that action at this time.
0 commit comments