Skip to content

Commit 54b1356

Browse files
SkptakSoren Ptakaggarg
authored
Fix the comments in the CM3 and CM4 MPU Ports about the MPU Region numbers being loaded (#707)
Co-authored-by: Soren Ptak <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]>
1 parent 6f6f656 commit 54b1356

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎portable/GCC/ARM_CM3/port.c

100755100644
File mode changed.

‎portable/GCC/ARM_CM3_MPU/port.c

100755100644
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -736,8 +736,8 @@ static void prvRestoreContextOfFirstTask( void )
736736
" str r3, [r0] \n" /* Disable MPU. */
737737
" \n"
738738
" ldr r0, =0xe000ed9c \n" /* Region Base Address register. */
739-
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
740-
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers [MPU Region # 4 - 7]. */
739+
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 0 - 3]. */
740+
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers [MPU Region # 0 - 3]. */
741741
" \n"
742742
" ldr r0, =0xe000ed94 \n" /* MPU_CTRL register. */
743743
" ldr r3, [r0] \n" /* Read the value of MPU_CTRL. */
@@ -1011,8 +1011,8 @@ void xPortPendSVHandler( void )
10111011
" str r3, [r0] \n" /* Disable MPU. */
10121012
" \n"
10131013
" ldr r0, =0xe000ed9c \n" /* Region Base Address register. */
1014-
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
1015-
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers [MPU Region # 4 - 7]. */
1014+
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 0 - 3]. */
1015+
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers [MPU Region # 0 - 3]. */
10161016
" \n"
10171017
" ldr r0, =0xe000ed94 \n" /* MPU_CTRL register. */
10181018
" ldr r3, [r0] \n" /* Read the value of MPU_CTRL. */

‎portable/GCC/ARM_CM4F/port.c

100755100644
File mode changed.

‎portable/GCC/ARM_CM4_MPU/port.c

100755100644
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -818,14 +818,14 @@ static void prvRestoreContextOfFirstTask( void )
818818
" str r3, [r0] \n" /* Disable MPU. */
819819
" \n"
820820
" ldr r0, =0xe000ed9c \n" /* Region Base Address register. */
821-
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
822-
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers [MPU Region # 4 - 7]. */
821+
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 0 - 3]. */
822+
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers [MPU Region # 0 - 3]. */
823823
" \n"
824824
#if ( configTOTAL_MPU_REGIONS == 16 )
825-
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 8 - 11]. */
826-
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers. [MPU Region # 8 - 11]. */
827-
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 12 - 15]. */
828-
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers. [MPU Region # 12 - 15]. */
825+
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 4 - 8]. */
826+
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers. [MPU Region # 4 - 8]. */
827+
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 9 - 12]. */
828+
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers. [MPU Region # 9 - 12]. */
829829
#endif /* configTOTAL_MPU_REGIONS == 16. */
830830
" \n"
831831
" ldr r0, =0xe000ed94 \n" /* MPU_CTRL register. */
@@ -1137,14 +1137,14 @@ void xPortPendSVHandler( void )
11371137
" str r3, [r0] \n" /* Disable MPU. */
11381138
" \n"
11391139
" ldr r0, =0xe000ed9c \n" /* Region Base Address register. */
1140-
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
1141-
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers [MPU Region # 4 - 7]. */
1140+
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 0 - 3]. */
1141+
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers [MPU Region # 0 - 3]. */
11421142
" \n"
11431143
#if ( configTOTAL_MPU_REGIONS == 16 )
1144+
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
1145+
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers. [MPU Region # 4 - 7]. */
11441146
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 8 - 11]. */
11451147
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers. [MPU Region # 8 - 11]. */
1146-
" ldmia r2!, {r4-r11} \n" /* Read 4 sets of MPU registers [MPU Region # 12 - 15]. */
1147-
" stmia r0, {r4-r11} \n" /* Write 4 sets of MPU registers. [MPU Region # 12 - 15]. */
11481148
#endif /* configTOTAL_MPU_REGIONS == 16. */
11491149
" \n"
11501150
" ldr r0, =0xe000ed94 \n" /* MPU_CTRL register. */

‎portable/IAR/ARM_CM4F_MPU/portasm.s

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,15 @@ xPortPendSVHandler:
114114
str r3, [r0] /* Disable MPU. */
115115

116116
ldr r0, =0xe000ed9c /* Region Base Address register. */
117-
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
118-
stmia r0, {r4-r11} /* Write 4 sets of MPU registers [MPU Region # 4 - 7]. */
117+
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 0 - 3]. */
118+
stmia r0, {r4-r11} /* Write 4 sets of MPU registers [MPU Region # 0 - 3]. */
119119

120120
#ifdef configTOTAL_MPU_REGIONS
121121
#if ( configTOTAL_MPU_REGIONS == 16 )
122+
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
123+
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 4 - 7]. */
122124
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 8 - 11]. */
123125
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 8 - 11]. */
124-
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 12 - 15]. */
125-
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 12 - 15]. */
126126
#endif /* configTOTAL_MPU_REGIONS == 16. */
127127
#endif
128128

@@ -240,15 +240,15 @@ vPortRestoreContextOfFirstTask:
240240
str r3, [r0] /* Disable MPU. */
241241

242242
ldr r0, =0xe000ed9c /* Region Base Address register. */
243-
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
244-
stmia r0, {r4-r11} /* Write 4 sets of MPU registers [MPU Region # 4 - 7]. */
243+
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 0 - 3]. */
244+
stmia r0, {r4-r11} /* Write 4 sets of MPU registers [MPU Region # 0 - 3]. */
245245

246246
#ifdef configTOTAL_MPU_REGIONS
247247
#if ( configTOTAL_MPU_REGIONS == 16 )
248+
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
249+
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 4 - 7]. */
248250
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 8 - 11]. */
249251
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 8 - 11]. */
250-
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 12 - 15]. */
251-
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 12 - 15]. */
252252
#endif /* configTOTAL_MPU_REGIONS == 16. */
253253
#endif
254254

‎portable/RVDS/ARM_CM4_MPU/port.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -796,14 +796,14 @@ __asm void prvRestoreContextOfFirstTask( void )
796796
str r3, [r0] /* Disable MPU. */
797797

798798
ldr r0, =0xe000ed9c /* Region Base Address register. */
799-
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
800-
stmia r0, {r4-r11} /* Write 4 sets of MPU registers [MPU Region # 4 - 7]. */
799+
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 0 - 3]. */
800+
stmia r0, {r4-r11} /* Write 4 sets of MPU registers [MPU Region # 0 - 3]. */
801801

802802
#if ( configTOTAL_MPU_REGIONS == 16 )
803+
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
804+
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 4 - 7]. */
803805
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 8 - 11]. */
804806
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 8 - 11]. */
805-
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 12 - 15]. */
806-
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 12 - 15]. */
807807
#endif /* configTOTAL_MPU_REGIONS == 16. */
808808

809809
ldr r0, =0xe000ed94 /* MPU_CTRL register. */
@@ -1132,14 +1132,14 @@ __asm void xPortPendSVHandler( void )
11321132
str r3, [r0] /* Disable MPU. */
11331133

11341134
ldr r0, =0xe000ed9c /* Region Base Address register. */
1135-
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
1136-
stmia r0, {r4-r11} /* Write 4 sets of MPU registers [MPU Region # 4 - 7]. */
1135+
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 0 - 3]. */
1136+
stmia r0, {r4-r11} /* Write 4 sets of MPU registers [MPU Region # 0 - 3]. */
11371137

11381138
#if ( configTOTAL_MPU_REGIONS == 16 )
1139+
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 4 - 7]. */
1140+
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 4 - 7]. */
11391141
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 8 - 11]. */
11401142
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 8 - 11]. */
1141-
ldmia r2!, {r4-r11} /* Read 4 sets of MPU registers [MPU Region # 12 - 15]. */
1142-
stmia r0, {r4-r11} /* Write 4 sets of MPU registers. [MPU Region # 12 - 15]. */
11431143
#endif /* configTOTAL_MPU_REGIONS == 16. */
11441144

11451145
ldr r0, =0xe000ed94 /* MPU_CTRL register. */

0 commit comments

Comments
 (0)