Skip to content

GitLab

Commit edea5c12 authored by Dimitris Papastamos's avatar Dimitris Papastamos
Browse files

aarch32: Fix multiple bugs in amu_helpers.S 



AArch32 uses odd-even pairs when passing 64-bit arguments to
functions.  For example in `amu_group0_cnt_write_internal()` the
second argument is a uint64_t which is passed in r2 and r3.

In `amu_group1_set_evtype_internal()` the value that needs to be
written to the system register is in r1 not in r0.

Change-Id: I20196268fdb1dc9ef6c4ebe61e761fba9623b3f2
Signed-off-by: default avatarDimitris Papastamos <dimitris.papastamos@arm.com>
parent e6e17ee8
Hide whitespace changes
Inline Side-by-side
lib/extensions/amu/aarch32/amu_helpers.S
View file @ edea5c12
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* uint64_t amu_group0_cnt_read_internal(int idx); * uint64_t amu_group0_cnt_read_internal(int idx);
* *
* Given `idx`, read the corresponding AMU counter * Given `idx`, read the corresponding AMU counter
* and return it in `r0`. * and return it in `r0` and `r1`.
*/ */
func amu_group0_cnt_read_internal func amu_group0_cnt_read_internal
#if ENABLE_ASSERTIONS #if ENABLE_ASSERTIONS
...@@ -52,13 +52,15 @@ endfunc amu_group0_cnt_read_internal ...@@ -52,13 +52,15 @@ endfunc amu_group0_cnt_read_internal
* void amu_group0_cnt_write_internal(int idx, uint64_t val); * void amu_group0_cnt_write_internal(int idx, uint64_t val);
* *
* Given `idx`, write `val` to the corresponding AMU counter. * Given `idx`, write `val` to the corresponding AMU counter.
* `idx` is passed in `r0` and `val` is passed in `r2` and `r3`.
* `r1` is used as a scratch register.
*/ */
func amu_group0_cnt_write_internal func amu_group0_cnt_write_internal
#if ENABLE_ASSERTIONS #if ENABLE_ASSERTIONS
/* `idx` should be between [0, 3] */ /* `idx` should be between [0, 3] */
mov r2, r0 mov r1, r0
lsr r2, r2, #2 lsr r1, r1, #2
cmp r2, #0 cmp r1, #0
ASM_ASSERT(eq) ASM_ASSERT(eq)
#endif #endif
...@@ -66,19 +68,19 @@ func amu_group0_cnt_write_internal ...@@ -66,19 +68,19 @@ func amu_group0_cnt_write_internal
* Given `idx` calculate address of stcopr16/bx lr instruction pair * Given `idx` calculate address of stcopr16/bx lr instruction pair
* in the table below. * in the table below.
*/ */
adr r2, 1f adr r1, 1f
lsl r0, r0, #3 /* each stcopr16/bx lr sequence is 8 bytes */ lsl r0, r0, #3 /* each stcopr16/bx lr sequence is 8 bytes */
add r2, r2, r0 add r1, r1, r0
bx r2 bx r1
1: 1:
stcopr16 r0,r1, AMEVCNTR00 /* index 0 */ stcopr16 r2, r3, AMEVCNTR00 /* index 0 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR01 /* index 1 */ stcopr16 r2, r3, AMEVCNTR01 /* index 1 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR02 /* index 2 */ stcopr16 r2, r3, AMEVCNTR02 /* index 2 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR03 /* index 3 */ stcopr16 r2, r3, AMEVCNTR03 /* index 3 */
bx lr bx lr
endfunc amu_group0_cnt_write_internal endfunc amu_group0_cnt_write_internal
...@@ -86,14 +88,14 @@ endfunc amu_group0_cnt_write_internal ...@@ -86,14 +88,14 @@ endfunc amu_group0_cnt_write_internal
* uint64_t amu_group1_cnt_read_internal(int idx); * uint64_t amu_group1_cnt_read_internal(int idx);
* *
* Given `idx`, read the corresponding AMU counter * Given `idx`, read the corresponding AMU counter
* and return it in `r0`. * and return it in `r0` and `r1`.
*/ */
func amu_group1_cnt_read_internal func amu_group1_cnt_read_internal
#if ENABLE_ASSERTIONS #if ENABLE_ASSERTIONS
/* `idx` should be between [0, 15] */ /* `idx` should be between [0, 15] */
mov r2, r0 mov r1, r0
lsr r2, r2, #4 lsr r1, r1, #4
cmp r2, #0 cmp r1, #0
ASM_ASSERT(eq) ASM_ASSERT(eq)
#endif #endif
...@@ -107,51 +109,53 @@ func amu_group1_cnt_read_internal ...@@ -107,51 +109,53 @@ func amu_group1_cnt_read_internal
bx r1 bx r1
1: 1:
ldcopr16 r0,r1, AMEVCNTR10 /* index 0 */ ldcopr16 r0, r1, AMEVCNTR10 /* index 0 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR11 /* index 1 */ ldcopr16 r0, r1, AMEVCNTR11 /* index 1 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR12 /* index 2 */ ldcopr16 r0, r1, AMEVCNTR12 /* index 2 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR13 /* index 3 */ ldcopr16 r0, r1, AMEVCNTR13 /* index 3 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR14 /* index 4 */ ldcopr16 r0, r1, AMEVCNTR14 /* index 4 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR15 /* index 5 */ ldcopr16 r0, r1, AMEVCNTR15 /* index 5 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR16 /* index 6 */ ldcopr16 r0, r1, AMEVCNTR16 /* index 6 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR17 /* index 7 */ ldcopr16 r0, r1, AMEVCNTR17 /* index 7 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR18 /* index 8 */ ldcopr16 r0, r1, AMEVCNTR18 /* index 8 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR19 /* index 9 */ ldcopr16 r0, r1, AMEVCNTR19 /* index 9 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR1A /* index 10 */ ldcopr16 r0, r1, AMEVCNTR1A /* index 10 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR1B /* index 11 */ ldcopr16 r0, r1, AMEVCNTR1B /* index 11 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR1C /* index 12 */ ldcopr16 r0, r1, AMEVCNTR1C /* index 12 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR1D /* index 13 */ ldcopr16 r0, r1, AMEVCNTR1D /* index 13 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR1E /* index 14 */ ldcopr16 r0, r1, AMEVCNTR1E /* index 14 */
bx lr bx lr
ldcopr16 r0,r1, AMEVCNTR1F /* index 15 */ ldcopr16 r0, r1, AMEVCNTR1F /* index 15 */
bx lr bx lr
endfunc amu_group1_cnt_read_internal endfunc amu_group1_cnt_read_internal
/* /*
* void amu_group1_cnt_write_internal(int idx, uint64_t val); * void amu_group1_cnt_write_internal(int idx, uint64_t val);
* *
* Given `idx`, write `val` to the corresponding AMU counter. * Given `idx`, write `val` to the corresponding AMU counter.
* `idx` is passed in `r0` and `val` is passed in `r2` and `r3`.
* `r1` is used as a scratch register.
*/ */
func amu_group1_cnt_write_internal func amu_group1_cnt_write_internal
#if ENABLE_ASSERTIONS #if ENABLE_ASSERTIONS
/* `idx` should be between [0, 15] */ /* `idx` should be between [0, 15] */
mov r2, r0 mov r1, r0
lsr r2, r2, #4 lsr r1, r1, #4
cmp r2, #0 cmp r1, #0
ASM_ASSERT(eq) ASM_ASSERT(eq)
#endif #endif
...@@ -159,43 +163,43 @@ func amu_group1_cnt_write_internal ...@@ -159,43 +163,43 @@ func amu_group1_cnt_write_internal
* Given `idx` calculate address of ldcopr16/bx lr instruction pair * Given `idx` calculate address of ldcopr16/bx lr instruction pair
* in the table below. * in the table below.
*/ */
adr r2, 1f adr r1, 1f
lsl r0, r0, #3 /* each stcopr16/bx lr sequence is 8 bytes */ lsl r0, r0, #3 /* each stcopr16/bx lr sequence is 8 bytes */
add r2, r2, r0 add r1, r1, r0
bx r2 bx r1
1: 1:
stcopr16 r0,r1, AMEVCNTR10 /* index 0 */ stcopr16 r2, r3, AMEVCNTR10 /* index 0 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR11 /* index 1 */ stcopr16 r2, r3, AMEVCNTR11 /* index 1 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR12 /* index 2 */ stcopr16 r2, r3, AMEVCNTR12 /* index 2 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR13 /* index 3 */ stcopr16 r2, r3, AMEVCNTR13 /* index 3 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR14 /* index 4 */ stcopr16 r2, r3, AMEVCNTR14 /* index 4 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR15 /* index 5 */ stcopr16 r2, r3, AMEVCNTR15 /* index 5 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR16 /* index 6 */ stcopr16 r2, r3, AMEVCNTR16 /* index 6 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR17 /* index 7 */ stcopr16 r2, r3, AMEVCNTR17 /* index 7 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR18 /* index 8 */ stcopr16 r2, r3, AMEVCNTR18 /* index 8 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR19 /* index 9 */ stcopr16 r2, r3, AMEVCNTR19 /* index 9 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR1A /* index 10 */ stcopr16 r2, r3, AMEVCNTR1A /* index 10 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR1B /* index 11 */ stcopr16 r2, r3, AMEVCNTR1B /* index 11 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR1C /* index 12 */ stcopr16 r2, r3, AMEVCNTR1C /* index 12 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR1D /* index 13 */ stcopr16 r2, r3, AMEVCNTR1D /* index 13 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR1E /* index 14 */ stcopr16 r2, r3, AMEVCNTR1E /* index 14 */
bx lr bx lr
stcopr16 r0,r1, AMEVCNTR1F /* index 15 */ stcopr16 r2, r3, AMEVCNTR1F /* index 15 */
bx lr bx lr
endfunc amu_group1_cnt_write_internal endfunc amu_group1_cnt_write_internal
...@@ -230,36 +234,36 @@ func amu_group1_set_evtype_internal ...@@ -230,36 +234,36 @@ func amu_group1_set_evtype_internal
bx r2 bx r2
1: 1:
stcopr r0, AMEVTYPER10 /* index 0 */ stcopr r1, AMEVTYPER10 /* index 0 */
bx lr bx lr
stcopr r0, AMEVTYPER11 /* index 1 */ stcopr r1, AMEVTYPER11 /* index 1 */
bx lr bx lr
stcopr r0, AMEVTYPER12 /* index 2 */ stcopr r1, AMEVTYPER12 /* index 2 */
bx lr bx lr
stcopr r0, AMEVTYPER13 /* index 3 */ stcopr r1, AMEVTYPER13 /* index 3 */
bx lr bx lr
stcopr r0, AMEVTYPER14 /* index 4 */ stcopr r1, AMEVTYPER14 /* index 4 */
bx lr bx lr
stcopr r0, AMEVTYPER15 /* index 5 */ stcopr r1, AMEVTYPER15 /* index 5 */
bx lr bx lr
stcopr r0, AMEVTYPER16 /* index 6 */ stcopr r1, AMEVTYPER16 /* index 6 */
bx lr bx lr
stcopr r0, AMEVTYPER17 /* index 7 */ stcopr r1, AMEVTYPER17 /* index 7 */
bx lr bx lr
stcopr r0, AMEVTYPER18 /* index 8 */ stcopr r1, AMEVTYPER18 /* index 8 */
bx lr bx lr
stcopr r0, AMEVTYPER19 /* index 9 */ stcopr r1, AMEVTYPER19 /* index 9 */
bx lr bx lr
stcopr r0, AMEVTYPER1A /* index 10 */ stcopr r1, AMEVTYPER1A /* index 10 */
bx lr bx lr
stcopr r0, AMEVTYPER1B /* index 11 */ stcopr r1, AMEVTYPER1B /* index 11 */
bx lr bx lr
stcopr r0, AMEVTYPER1C /* index 12 */ stcopr r1, AMEVTYPER1C /* index 12 */
bx lr bx lr
stcopr r0, AMEVTYPER1D /* index 13 */ stcopr r1, AMEVTYPER1D /* index 13 */
bx lr bx lr
stcopr r0, AMEVTYPER1E /* index 14 */ stcopr r1, AMEVTYPER1E /* index 14 */
bx lr bx lr
stcopr r0, AMEVTYPER1F /* index 15 */ stcopr r1, AMEVTYPER1F /* index 15 */
bx lr bx lr
endfunc amu_group1_set_evtype_internal endfunc amu_group1_set_evtype_internal
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment