fix unaligned read
authornotaz <notaz@pixelinis>
Mon, 5 Sep 2011 17:04:52 +0000 (20:04 +0300)
committernotaz <notaz@pixelinis>
Mon, 5 Sep 2011 21:18:06 +0000 (00:18 +0300)
it's causing a fault on Linux

arm/video_blend.S

index 63a5480..ed70839 100644 (file)
@@ -24,7 +24,7 @@ expand_blend:
   add r1, r1, r2, lsl #1          @ screen_dest_ptr += start\r
   sub r2, r3, r2                  @ r2 = end - start\r
   ldr r3, 6b                      @ r3 = io_registers\r
-  ldr r3, [r3, #0x52]             @ r3 = bldalpha\r
+  ldrh r3, [r3, #0x52]            @ r3 = bldalpha\r
   mov r4, r3, lsr #8              @ r4 = bldalpha >> 8\r
   and r3, r3, #0x1F               @ r3 = blend_a\r
   and r4, r4, #0x1F               @ r4 = blend_b\r