From e499a25a001c8116c03400be720eac58d250619f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 16 Feb 2014 01:32:46 +0100
Subject: GRAPHICS: Manually specify function alignment in ARM assembly.

---
 graphics/scaler/Normal2xARM.s   | 2 ++
 graphics/scaler/downscalerARM.s | 1 +
 graphics/scaler/scale2xARM.s    | 3 +++
 3 files changed, 6 insertions(+)

(limited to 'graphics/scaler')

diff --git a/graphics/scaler/Normal2xARM.s b/graphics/scaler/Normal2xARM.s
index e3592295e0..c5684c30e6 100644
--- a/graphics/scaler/Normal2xARM.s
+++ b/graphics/scaler/Normal2xARM.s
@@ -28,6 +28,7 @@
 
 	@ Assumes dst is aligned (so did the C)
 	@ Assumes 16bit (so did the C)
+	.align 2
 Normal2xARM:
 	@ r0 = src
 	@ r1 = srcPitch
@@ -92,6 +93,7 @@ thin:
 
 	@ Assumes dst is aligned (so did the C)
 	@ Assumes 16bit (so did the C)
+	.align 2
 Normal2xAspectMask:
 	@ r0 = src
 	@ r1 = srcPitch
diff --git a/graphics/scaler/downscalerARM.s b/graphics/scaler/downscalerARM.s
index e4662522aa..4c09381457 100644
--- a/graphics/scaler/downscalerARM.s
+++ b/graphics/scaler/downscalerARM.s
@@ -29,6 +29,7 @@
 	@ dstPtr. srcPitch and dstPitch identify how to reach subsequent
 	@ lines. redblueMask and round allow for one routine to do both
 	@ 565 and 555 formats.
+	.align 2
 DownscaleAllByHalfARM:
 	@ r0 = srcPtr
 	@ r1 = srcPitch
diff --git a/graphics/scaler/scale2xARM.s b/graphics/scaler/scale2xARM.s
index 563a22eeb1..a56e78447f 100644
--- a/graphics/scaler/scale2xARM.s
+++ b/graphics/scaler/scale2xARM.s
@@ -37,6 +37,7 @@
         @ We hold:       r10            B
         @            r8  r14 r7       D E F
         @                r12            H
+        .align 2
 scale2x_8_arm:
         STMFD   r13!,{r4-r5,r7-r8,r10-r11,r14}
         LDR     r4, [r13,#4*7]
@@ -85,6 +86,7 @@ end8:
 
         LDMFD   r13!,{r4-r5,r7-r8,r10-r11,PC}
 
+        .align 2
 scale2x_16_arm:
         STMFD   r13!,{r4-r5,r7-r8,r10-r11,r14}
         LDR     r4, [r13,#4*7]
@@ -133,6 +135,7 @@ end16:
 
         LDMFD   r13!,{r4-r5,r7-r8,r10-r11,PC}
 
+        .align 2
 scale2x_32_arm:
         STMFD   r13!,{r4-r5,r7-r8,r10-r11,r14}
         LDR     r4, [r13,#4*7]
-- 
cgit v1.2.3