summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornotaz2011-09-05 20:04:52 +0300
committernotaz2011-09-06 00:18:06 +0300
commitfe1130691ea29cd751e975c8f09f48ac91e5216e (patch)
tree58d9a78845dc564e943bda709c42f6c325cd2176
parentbbba320911a86c0ee373f8297f80a2b82de22039 (diff)
downloadpicogpsp-fe1130691ea29cd751e975c8f09f48ac91e5216e.tar.gz
picogpsp-fe1130691ea29cd751e975c8f09f48ac91e5216e.tar.bz2
picogpsp-fe1130691ea29cd751e975c8f09f48ac91e5216e.zip
fix unaligned read
it's causing a fault on Linux
-rw-r--r--arm/video_blend.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arm/video_blend.S b/arm/video_blend.S
index 63a5480..ed70839 100644
--- a/arm/video_blend.S
+++ b/arm/video_blend.S
@@ -24,7 +24,7 @@ expand_blend:
add r1, r1, r2, lsl #1 @ screen_dest_ptr += start
sub r2, r3, r2 @ r2 = end - start
ldr r3, 6b @ r3 = io_registers
- ldr r3, [r3, #0x52] @ r3 = bldalpha
+ ldrh r3, [r3, #0x52] @ r3 = bldalpha
mov r4, r3, lsr #8 @ r4 = bldalpha >> 8
and r3, r3, #0x1F @ r3 = blend_a
and r4, r4, #0x1F @ r4 = blend_b