Skip to content

Commit 0c92f48

Browse files
fdesbiensfdesbiens
authored
Merge pull request #493 from mehmetteren/dev
Fixed VFP build failure in Cortex-A tx_thread_schedule.S
2 parents 5910de8 + da5093f commit 0c92f48

File tree

51 files changed

+221
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+221
-0
lines changed

‎ports/cortex_a12/ac6/src/tx_thread_schedule.S‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************
22
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (C) 2026-present Eclipse ThreadX contributors
34
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
@@ -39,6 +40,14 @@
3940
#define IRQ_MODE 0x12 // IRQ mode
4041
#define SVC_MODE 0x13 // SVC mode
4142

43+
#ifdef TX_ENABLE_VFP_SUPPORT
44+
#define IRQ_MASK 0x80
45+
#endif
46+
47+
#ifdef TX_ENABLE_FIQ_SUPPORT
48+
#define FIQ_MASK 0x40
49+
#endif
50+
4251
/**************************************************************************/
4352
/* */
4453
/* FUNCTION RELEASE */
@@ -259,3 +268,4 @@ no_fiq:
259268
BX lr
260269

261270
#endif
271+

‎ports/cortex_a12/gnu/src/tx_thread_schedule.S‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************
22
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (C) 2026-present Eclipse ThreadX contributors
34
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
@@ -39,6 +40,14 @@
3940
#define IRQ_MODE 0x12 // IRQ mode
4041
#define SVC_MODE 0x13 // SVC mode
4142

43+
#ifdef TX_ENABLE_VFP_SUPPORT
44+
#define IRQ_MASK 0x80
45+
#endif
46+
47+
#ifdef TX_ENABLE_FIQ_SUPPORT
48+
#define FIQ_MASK 0x40
49+
#endif
50+
4251
/**************************************************************************/
4352
/* */
4453
/* FUNCTION RELEASE */
@@ -259,3 +268,4 @@ no_fiq:
259268
BX lr
260269

261270
#endif
271+

‎ports/cortex_a15/ac6/src/tx_thread_schedule.S‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************
22
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (C) 2026-present Eclipse ThreadX contributors
34
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
@@ -39,6 +40,14 @@
3940
#define IRQ_MODE 0x12 // IRQ mode
4041
#define SVC_MODE 0x13 // SVC mode
4142

43+
#ifdef TX_ENABLE_VFP_SUPPORT
44+
#define IRQ_MASK 0x80
45+
#endif
46+
47+
#ifdef TX_ENABLE_FIQ_SUPPORT
48+
#define FIQ_MASK 0x40
49+
#endif
50+
4251
/**************************************************************************/
4352
/* */
4453
/* FUNCTION RELEASE */
@@ -259,3 +268,4 @@ no_fiq:
259268
BX lr
260269

261270
#endif
271+

‎ports/cortex_a15/gnu/src/tx_thread_schedule.S‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************
22
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (C) 2026-present Eclipse ThreadX contributors
34
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
@@ -39,6 +40,14 @@
3940
#define IRQ_MODE 0x12 // IRQ mode
4041
#define SVC_MODE 0x13 // SVC mode
4142

43+
#ifdef TX_ENABLE_VFP_SUPPORT
44+
#define IRQ_MASK 0x80
45+
#endif
46+
47+
#ifdef TX_ENABLE_FIQ_SUPPORT
48+
#define FIQ_MASK 0x40
49+
#endif
50+
4251
/**************************************************************************/
4352
/* */
4453
/* FUNCTION RELEASE */
@@ -259,3 +268,4 @@ no_fiq:
259268
BX lr
260269

261270
#endif
271+

‎ports/cortex_a15/iar/src/tx_thread_schedule.s‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
;/***************************************************************************
22
; * Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (C) 2026-present Eclipse ThreadX contributors
34
; *
45
; * This program and the accompanying materials are made available under the
56
; * terms of the MIT License which is available at
@@ -239,3 +240,4 @@ __tx_no_thread_to_disable
239240

240241
END
241242

243+

‎ports/cortex_a17/ac6/src/tx_thread_schedule.S‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************
22
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (C) 2026-present Eclipse ThreadX contributors
34
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
@@ -39,6 +40,14 @@
3940
#define IRQ_MODE 0x12 // IRQ mode
4041
#define SVC_MODE 0x13 // SVC mode
4142

43+
#ifdef TX_ENABLE_VFP_SUPPORT
44+
#define IRQ_MASK 0x80
45+
#endif
46+
47+
#ifdef TX_ENABLE_FIQ_SUPPORT
48+
#define FIQ_MASK 0x40
49+
#endif
50+
4251
/**************************************************************************/
4352
/* */
4453
/* FUNCTION RELEASE */
@@ -259,3 +268,4 @@ no_fiq:
259268
BX lr
260269

261270
#endif
271+

‎ports/cortex_a17/gnu/src/tx_thread_schedule.S‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************
22
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (C) 2026-present Eclipse ThreadX contributors
34
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
@@ -39,6 +40,14 @@
3940
#define IRQ_MODE 0x12 // IRQ mode
4041
#define SVC_MODE 0x13 // SVC mode
4142

43+
#ifdef TX_ENABLE_VFP_SUPPORT
44+
#define IRQ_MASK 0x80
45+
#endif
46+
47+
#ifdef TX_ENABLE_FIQ_SUPPORT
48+
#define FIQ_MASK 0x40
49+
#endif
50+
4251
/**************************************************************************/
4352
/* */
4453
/* FUNCTION RELEASE */
@@ -259,3 +268,4 @@ no_fiq:
259268
BX lr
260269

261270
#endif
271+

‎ports/cortex_a34/ac6/src/tx_thread_schedule.S‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************
22
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (C) 2026-present Eclipse ThreadX contributors
34
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
@@ -225,3 +226,4 @@ _skip_solicited_fp_restore:
225226
MSR DAIF, x4 // Recover DAIF
226227
RET // Return to caller
227228
// }
229+

‎ports/cortex_a34/gnu/src/tx_thread_schedule.S‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************
22
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (C) 2026-present Eclipse ThreadX contributors
34
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
@@ -231,3 +232,4 @@ _skip_solicited_fp_restore:
231232
MSR DAIF, x4 // Recover DAIF
232233
RET // Return to caller
233234
// }
235+

‎ports/cortex_a35/ac6/src/tx_thread_schedule.S‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************
22
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (C) 2026-present Eclipse ThreadX contributors
34
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
@@ -230,3 +231,4 @@ _skip_solicited_fp_restore:
230231
MSR DAIF, x4 // Recover DAIF
231232
RET // Return to caller
232233
// }
234+

0 commit comments

Comments
 (0)