Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9a5ce3c authored by Takashi Ohmasa's avatar Takashi Ohmasa Committed by Russell King
Browse files

[ARM] 4630/1: Fix the vector stride of the double vector instruction. 



The vector stride of the double-precision vector instructions must be changed
to 1-2 from even 2-4, because the double registers numbering has been
changed to 0-15 from even 0-30 by
1356c194 commit.

Signed-off-by: default avatarTakashi Ohmasa <ohmasa.takashi@jp.panasonic.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 67f18f34

arch/arm/vfp/vfpdouble.c

+4 −4
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ u32 vfp_double_cpdo(u32 inst, u32 fpscr) 
	unsigned int vecitr, veclen, vecstride;

	struct op *fop;



	vecstride = (1 + ((fpscr & FPSCR_STRIDE_MASK) == FPSCR_STRIDE_MASK)) * 2;

	vecstride = (1 + ((fpscr & FPSCR_STRIDE_MASK) == FPSCR_STRIDE_MASK));



	fop = (op == FOP_EXT) ? &fops_ext[FEXT_TO_IDX(inst)] : &fops[FOP_TO_IDX(op)];
@@ -1184,10 +1184,10 @@ u32 vfp_double_cpdo(u32 inst, u32 fpscr) 
		 * CHECK: It appears to be undefined whether we stop when

		 * we encounter an exception.  We continue.

		 */

		dest = FREG_BANK(dest) + ((FREG_IDX(dest) + vecstride) & 6);

		dn = FREG_BANK(dn) + ((FREG_IDX(dn) + vecstride) & 6);

		dest = FREG_BANK(dest) + ((FREG_IDX(dest) + vecstride) & 3);

		dn = FREG_BANK(dn) + ((FREG_IDX(dn) + vecstride) & 3);

		if (FREG_BANK(dm) != 0)

			dm = FREG_BANK(dm) + ((FREG_IDX(dm) + vecstride) & 6);

			dm = FREG_BANK(dm) + ((FREG_IDX(dm) + vecstride) & 3);

	}

	return exceptions;