d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the APSR_nzcv format of mrc. The clang integrated assembler doesn't

Browse Source 
support the old usage of r15.

Sponsored by:	ABT Systems Ltd
This commit is contained in:
andrew 2014-12-02 18:35:34 +00:00
parent 42bfaca3f8
commit eb2b82c507
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arm/arm/cpufunc_asm_armv5_ec.S
View File

@ -58,7 +58,7 @@ ENTRY(armv5_ec_setttb)
* do it directly and entirely avoid the problem.
*/
mcr p15, 0, r0, c7, c5, 0 /* Invalidate ICache */
1: mrc p15, 0, r15, c7, c14, 3 /* Test, clean and invalidate DCache */
1: mrc p15, 0, APSR_nzcv, c7, c14, 3 /* Test, clean and invalidate DCache */
bne 1b /* More to do? */
mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */
@ -105,7 +105,7 @@ ENTRY_NP(armv5_ec_icache_sync_all)
.Larmv5_ec_dcache_wb:
1:
mrc p15, 0, r15, c7, c10, 3 /* Test and clean (don't invalidate) */
mrc p15, 0, APSR_nzcv, c7, c10, 3 /* Test and clean (don't invalidate) */
bne 1b /* More to do? */
mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */
RET
@ -208,7 +208,7 @@ END(armv5_ec_idcache_wbinv_all)
ENTRY(armv5_ec_dcache_wbinv_all)
.Larmv5_ec_dcache_wbinv_all:
1: mrc p15, 0, r15, c7, c14, 3 /* Test, clean and invalidate DCache */
1: mrc p15, 0, APSR_nzcv, c7, c14, 3 /* Test, clean and invalidate DCache */
bne 1b /* More to do? */
mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */
RET

2
sys/arm/arm/cpufunc_asm_sheeva.S
View File

@ -48,7 +48,7 @@ ENTRY(sheeva_setttb)
mov r1, #0
mcr p15, 0, r1, c7, c5, 0 /* Invalidate ICache */
1: mrc p15, 0, r15, c7, c14, 3 /* Test, clean and invalidate DCache */
1: mrc p15, 0, APSR_nzcv, c7, c14, 3 /* Test, clean and invalidate DCache */
bne 1b /* More to do? */
mcr p15, 1, r1, c15, c9, 0 /* Clean L2 */