--- before.s	2015-09-03 19:46:49.915113750 +0200
+++ after.s	2015-09-03 19:45:37.714298422 +0200
@@ -25,7 +25,7 @@
 	push	{r4, r5}
-	ands	r3, r2, #1
+	tst	r2, #1
 	beq	.L2
 	adds	r5, r1, #1
-	ldrb	r1, [r1]	@ zero_extendqisi2
-	mov	r4, r1
+	ldrb	r3, [r1]	@ zero_extendqisi2
+	mov	r4, r3
 	tst	r2, #2
@@ -34,10 +34,13 @@
 .L7:
-	ldrh	r2, [r1]
-	cbnz	r3, .L4
-	mov	r3, r0
-.L8:
-	strh	r2, [r3]	@ movhi
+	ldrh	r1, [r1]
+	tst	r2, #1
+	itte	ne
+	addne	r3, r0, #1
+	strbne	r4, [r0]
+	moveq	r3, r0
+	strh	r1, [r3]	@ movhi
 	b	.L1
 .L3:
-	cbz	r3, .L1
+	tst	r2, #1
+	beq	.L1
 	b	.L5
@@ -47,8 +50,4 @@
 	b	.L1
-.L4:
-	adds	r3, r0, #1
-	strb	r4, [r0]
-	b	.L8
 .L5:
-	strb	r1, [r0]
+	strb	r3, [r0]
 .L1: