From 2a233dd31d9d0694f74288edd007a01181a8e1f4 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Thu, 19 Sep 2013 14:18:18 +0300 Subject: [PATCH] thumb: Extend the regexp for handling negative register indexing Now the same regexp that previously handled cases such as "ldr r1, [r2, -r3]" also can handle the first operand being omitted as in "pld [r2, -r3]". This fixes building vp9_convolve8*neon.asm in thumb mode (and thus, for Windows Phone as well). Change-Id: I20c1c3f2bfb2587fb5fa523b863972a7fe30d8ff --- build/make/thumb.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/make/thumb.pm b/build/make/thumb.pm index f34728743..545f59f43 100644 --- a/build/make/thumb.pm +++ b/build/make/thumb.pm @@ -47,7 +47,7 @@ sub FixThumbInstructions($$) # this is used, it's used for two subsequent load instructions, # where a hand-written version of it could merge two subsequent # add and sub instructions. - s/^(\s*)((ldr|str)(ne)?)(\s+)(r\d+),\s*\[(\w+), -([^\]]+)\]/$1sub$4$5$7, $7, $8\n$1$2$5$6, [$7]\n$1add$4$5$7, $7, $8/g; + s/^(\s*)((ldr|str|pld)(ne)?)(\s+)(r\d+,)?\s*\[(\w+), -([^\]]+)\]/$1sub$4$5$7, $7, $8\n$1$2$5$6\[$7\]\n$1add$4$5$7, $7, $8/g; # Convert register post indexing to a separate add instruction. # This converts "ldrneb r9, [r0], r2" into "ldrneb r9, [r0]",