[PATCH] ARM: vfp: Fix up exception location in Thumb mode

Russell King - ARM Linux linux at arm.linux.org.uk
Fri Jan 14 10:49:19 EST 2011

On Fri, Jan 14, 2011 at 02:10:31PM +0000, Catalin Marinas wrote:
> On Fri, 2011-01-14 at 12:02 +0000, Russell King - ARM Linux wrote:
> > I don't think this is correct.  On entry to the undefined instruction
> > handler, we get the uncorrected PC value, so PC points to the
> > instruction after the faulting instruction.
> > 
> > If it was an ARM instruction, that is located at PC-4.  If it was a
> > Thumb instruction, it is located at PC-2.  This PC value is passed
> > unmodified to the VFP entry code, and the passed r2 reflect the
> > value in regs->ARM_pc.
> The entry-armv.S code adds 2 to the r2 register in case of a 32-bit
> Thumb instruction, so it is no longer the same as the ARM_pc.

That's something that should be fixed - the entry conditions should be
the same irrespective of thumb or arm encoding.

> Since the VFP instructions in Thumb mode are always 32-bit, Colin's
> patch made sense to me.

I looked up the VADD instruction in the ARM ARM.  It has both a 16-bit
and 32-bit encoding.

> > I think that the undefined instruction handling needs reworking for
> > Thumb entirely as we could be dealing with a 16-bit or 32-bit thumb
> > instruction, and we have no way of knowing without repeatedly
> > decoding that instruction.
> We already handle the r2 for in __und_usr. We don't deal with ARM_pc but
> we could either do it in __und_usr or let the code handling the undef
> fix it up.

At the moment its just confusing as things stand, as some things are
changed in one place and not the other.  Let's kill the pointless
addition of 2 in the undefined instruction handler so that in every
case we enter handlers with r2 == regs->ARM_pc, and regs->ARM_pc
as per the ARM ARM undefined exception entry LR.

Undefined instruction exception handlers can then rely on the meaning
of both of these.

More information about the linux-arm-kernel mailing list