Skip to content

Commit 1da3653

Browse files
authored
Merge pull request #1538 from martin-frbg/arm7utest
Fix handling of zero INCX, INCY in ArmV7 AXPY and ROT
2 parents 8a3b6fa + 2d0929f commit 1da3653

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

kernel/arm/axpy_vfp.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,13 +440,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
440440

441441
cmp N, #0
442442
ble axpy_kernel_L999
443-
443+
/*
444444
cmp INC_X, #0
445445
beq axpy_kernel_L999
446446

447447
cmp INC_Y, #0
448448
beq axpy_kernel_L999
449-
449+
*/
450450
cmp INC_X, #1
451451
bne axpy_kernel_S_BEGIN
452452

kernel/arm/rot_vfp.S

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,13 +483,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
483483

484484
cmp N, #0
485485
ble rot_kernel_L999
486-
486+
/*
487487
cmp INC_X, #0
488488
beq rot_kernel_L999
489489

490490
cmp INC_Y, #0
491491
beq rot_kernel_L999
492-
492+
*/
493493
cmp INC_X, #1
494494
bne rot_kernel_S_BEGIN
495495

@@ -584,6 +584,12 @@ rot_kernel_S1:
584584
rot_kernel_S10:
585585

586586
KERNEL_S1
587+
588+
cmp INC_X, #0
589+
beq rot_kernel_L999
590+
591+
cmp INC_Y, #0
592+
beq rot_kernel_L999
587593

588594
subs I, I, #1
589595
bne rot_kernel_S10

0 commit comments

Comments
 (0)