Skip to content

Commit 672c5e9

Browse files
TiejunZhou-CNTiejunZhou-CN
authored
Release ARMv7-A architecture ports and add tx_user.h to GNU port assembly files (#250)
* Release ARMv7-A architecture ports * Add tx_user.h to GNU port assembly files * Update GitHub action to perform check for Cortex-A ports
1 parent 23680f5 commit 672c5e9

File tree

416 files changed

+43000
-463
lines changed

Some content is hidden

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

416 files changed

+43000
-463
lines changed

‎.github/workflows/ports_arch_check.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ on:
1515
- 'ports/**'
1616
- 'ports_modules/**'
1717
- 'ports_smp/**'
18+
- 'ports_arch/**'
1819

1920
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2021
jobs:
21-
# This workflow contains a single job called "build"
22-
build:
22+
# Check ports for cortex-m
23+
cortex-m:
2324
# The type of runner that the job will run on
2425
runs-on: ubuntu-latest
2526

@@ -38,8 +39,33 @@ jobs:
3839
scripts/copy_armv7_m.sh && scripts/copy_armv8_m.sh && scripts/copy_module_armv7_m.sh
3940
if [[ -n $(git status --porcelain) ]]; then
4041
echo "Ports for ARM architecture is not updated"
42+
git status
4143
exit 1
4244
fi
4345
46+
cortex-a:
47+
# Check ports for cortex-a
48+
runs-on: windows-latest
49+
50+
# Steps represent a sequence of tasks that will be executed as part of the job
51+
steps:
52+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
53+
- name: Checkout sources recursively
54+
uses: actions/checkout@v2
55+
with:
56+
token: ${{ secrets.REPO_SCOPED_TOKEN }}
57+
submodules: true
58+
59+
# Copy ports arch
60+
- name: Copy ports arch
61+
run: |
62+
cd ports_arch/ARMv7-A
63+
pwsh -Command ./update.ps1 -PortSets tx -CopyCommonFiles -CopyPortFiles -CopyExample -PatchFiles
64+
if ((git status --porcelain) -ne $null) {
65+
Write-Host "Ports for ARM architecture is not updated"
66+
git status
67+
Exit 1
68+
}
69+
4470
4571

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2225

2326
.arm
2427

@@ -50,7 +53,7 @@ IRQ_MODE = 0x92 // Disable IRQ, IRQ mode
5053
/* FUNCTION RELEASE */
5154
/* */
5255
/* _tx_thread_context_restore ARMv7-A */
53-
/* 6.1.11 */
56+
/* 6.x */
5457
/* AUTHOR */
5558
/* */
5659
/* William E. Lamie, Microsoft Corporation */
@@ -88,6 +91,9 @@ IRQ_MODE = 0x92 // Disable IRQ, IRQ mode
8891
/* resulting in version 6.1.9 */
8992
/* 04-25-2022 Zhen Kong Updated comments, */
9093
/* resulting in version 6.1.11 */
94+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
95+
/* #include tx_user.h, */
96+
/* resulting in version 6.x */
9197
/* */
9298
/**************************************************************************/
9399
.global _tx_thread_context_restore

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2225

2326
.global _tx_thread_system_state
2427
.global _tx_thread_current_ptr
@@ -36,7 +39,7 @@
3639
/* FUNCTION RELEASE */
3740
/* */
3841
/* _tx_thread_context_save ARMv7-A */
39-
/* 6.1.11 */
42+
/* 6.x */
4043
/* AUTHOR */
4144
/* */
4245
/* William E. Lamie, Microsoft Corporation */
@@ -73,6 +76,9 @@
7376
/* resulting in version 6.1.9 */
7477
/* 04-25-2022 Zhen Kong Updated comments, */
7578
/* resulting in version 6.1.11 */
79+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
80+
/* #include tx_user.h, */
81+
/* resulting in version 6.x */
7682
/* */
7783
/**************************************************************************/
7884
.global _tx_thread_context_save

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2225

2326
SVC_MODE = 0xD3 // SVC mode
2427
FIQ_MODE = 0xD1 // FIQ mode
@@ -48,7 +51,7 @@ IRQ_MODE_BITS = 0x12 // IRQ mode bits
4851
/* FUNCTION RELEASE */
4952
/* */
5053
/* _tx_thread_fiq_context_restore ARMv7-A */
51-
/* 6.1.11 */
54+
/* 6.x */
5255
/* AUTHOR */
5356
/* */
5457
/* William E. Lamie, Microsoft Corporation */
@@ -86,6 +89,9 @@ IRQ_MODE_BITS = 0x12 // IRQ mode bits
8689
/* resulting in version 6.1.9 */
8790
/* 04-25-2022 Zhen Kong Updated comments, */
8891
/* resulting in version 6.1.11 */
92+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
93+
/* #include tx_user.h, */
94+
/* resulting in version 6.x */
8995
/* */
9096
/**************************************************************************/
9197
.global _tx_thread_fiq_context_restore

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2225

2326
.global _tx_thread_system_state
2427
.global _tx_thread_current_ptr
@@ -37,7 +40,7 @@
3740
/* FUNCTION RELEASE */
3841
/* */
3942
/* _tx_thread_fiq_context_save ARMv7-A */
40-
/* 6.1.11 */
43+
/* 6.x */
4144
/* AUTHOR */
4245
/* */
4346
/* William E. Lamie, Microsoft Corporation */
@@ -74,6 +77,9 @@
7477
/* resulting in version 6.1.9 */
7578
/* 04-25-2022 Zhen Kong Updated comments, */
7679
/* resulting in version 6.1.11 */
80+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
81+
/* #include tx_user.h, */
82+
/* resulting in version 6.x */
7783
/* */
7884
/**************************************************************************/
7985
.global _tx_thread_fiq_context_save

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2225

2326
#ifdef TX_ENABLE_FIQ_SUPPORT
2427
DISABLE_INTS = 0xC0 // Disable IRQ/FIQ interrupts
@@ -40,7 +43,7 @@ FIQ_MODE_BITS = 0x11 // FIQ mode bits
4043
/* FUNCTION RELEASE */
4144
/* */
4245
/* _tx_thread_fiq_nesting_end ARMv7-A */
43-
/* 6.1.11 */
46+
/* 6.x */
4447
/* AUTHOR */
4548
/* */
4649
/* William E. Lamie, Microsoft Corporation */
@@ -82,6 +85,9 @@ FIQ_MODE_BITS = 0x11 // FIQ mode bits
8285
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
8386
/* 04-25-2022 Zhen Kong Updated comments, */
8487
/* resulting in version 6.1.11 */
88+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
89+
/* #include tx_user.h, */
90+
/* resulting in version 6.x */
8591
/* */
8692
/**************************************************************************/
8793
.global _tx_thread_fiq_nesting_end

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2225

2326
FIQ_DISABLE = 0x40 // FIQ disable bit
2427
MODE_MASK = 0x1F // Mode mask
@@ -36,7 +39,7 @@ SYS_MODE_BITS = 0x1F // System mode bits
3639
/* FUNCTION RELEASE */
3740
/* */
3841
/* _tx_thread_fiq_nesting_start ARMv7-A */
39-
/* 6.1.11 */
42+
/* 6.x */
4043
/* AUTHOR */
4144
/* */
4245
/* William E. Lamie, Microsoft Corporation */
@@ -75,6 +78,9 @@ SYS_MODE_BITS = 0x1F // System mode bits
7578
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
7679
/* 04-25-2022 Zhen Kong Updated comments, */
7780
/* resulting in version 6.1.11 */
81+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
82+
/* #include tx_user.h, */
83+
/* resulting in version 6.x */
7884
/* */
7985
/**************************************************************************/
8086
.global _tx_thread_fiq_nesting_start

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2225

2326
INT_MASK = 0x03F
2427

@@ -47,7 +50,7 @@ $_tx_thread_interrupt_control:
4750
/* FUNCTION RELEASE */
4851
/* */
4952
/* _tx_thread_interrupt_control ARMv7-A */
50-
/* 6.1.11 */
53+
/* 6.x */
5154
/* AUTHOR */
5255
/* */
5356
/* William E. Lamie, Microsoft Corporation */
@@ -80,6 +83,9 @@ $_tx_thread_interrupt_control:
8083
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
8184
/* 04-25-2022 Zhen Kong Updated comments, */
8285
/* resulting in version 6.1.11 */
86+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
87+
/* #include tx_user.h, */
88+
/* resulting in version 6.x */
8389
/* */
8490
/**************************************************************************/
8591
.global _tx_thread_interrupt_control

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2225

2326
/* Define the 16-bit Thumb mode veneer for _tx_thread_interrupt_disable for
2427
applications calling this function from to 16-bit Thumb mode. */
@@ -44,7 +47,7 @@ $_tx_thread_interrupt_disable:
4447
/* FUNCTION RELEASE */
4548
/* */
4649
/* _tx_thread_interrupt_disable ARMv7-A */
47-
/* 6.1.11 */
50+
/* 6.x */
4851
/* AUTHOR */
4952
/* */
5053
/* William E. Lamie, Microsoft Corporation */
@@ -76,6 +79,9 @@ $_tx_thread_interrupt_disable:
7679
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
7780
/* 04-25-2022 Zhen Kong Updated comments, */
7881
/* resulting in version 6.1.11 */
82+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
83+
/* #include tx_user.h, */
84+
/* resulting in version 6.x */
7985
/* */
8086
/**************************************************************************/
8187
.global _tx_thread_interrupt_disable

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2225

2326
/* Define the 16-bit Thumb mode veneer for _tx_thread_interrupt_restore for
2427
applications calling this function from to 16-bit Thumb mode. */
@@ -44,7 +47,7 @@ $_tx_thread_interrupt_restore:
4447
/* FUNCTION RELEASE */
4548
/* */
4649
/* _tx_thread_interrupt_restore ARMv7-A */
47-
/* 6.1.11 */
50+
/* 6.x */
4851
/* AUTHOR */
4952
/* */
5053
/* William E. Lamie, Microsoft Corporation */
@@ -77,6 +80,9 @@ $_tx_thread_interrupt_restore:
7780
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
7881
/* 04-25-2022 Zhen Kong Updated comments, */
7982
/* resulting in version 6.1.11 */
83+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
84+
/* #include tx_user.h, */
85+
/* resulting in version 6.x */
8086
/* */
8187
/**************************************************************************/
8288
.global _tx_thread_interrupt_restore

0 commit comments

Comments
 (0)