diff options
| -rw-r--r-- | audio/rate_arm_asm.s | 9 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | engines/scumm/gfxARM.s | 2 | ||||
| -rw-r--r-- | engines/scumm/proc3ARM.s | 1 | ||||
| -rw-r--r-- | engines/scumm/smush/codec47ARM.s | 1 | ||||
| -rw-r--r-- | graphics/scaler/Normal2xARM.s | 2 | ||||
| -rw-r--r-- | graphics/scaler/downscalerARM.s | 1 | ||||
| -rw-r--r-- | graphics/scaler/scale2xARM.s | 3 |
8 files changed, 20 insertions, 0 deletions
diff --git a/audio/rate_arm_asm.s b/audio/rate_arm_asm.s index ac999f66e4..a727209d39 100644 --- a/audio/rate_arm_asm.s +++ b/audio/rate_arm_asm.s @@ -36,6 +36,7 @@ .global _ARM_LinearRate_S .global _ARM_LinearRate_R + .align 2 _ARM_CopyRate_M: @ r0 = len @ r1 = obuf @@ -73,6 +74,7 @@ CopyRate_M_loop: LDMFD r13!,{r4-r7,PC} + .align 2 _ARM_CopyRate_S: @ r0 = len @ r1 = obuf @@ -111,6 +113,7 @@ CopyRate_S_loop: LDMFD r13!,{r4-r7,PC} + .align 2 _ARM_CopyRate_R: @ r0 = len @ r1 = obuf @@ -149,6 +152,7 @@ CopyRate_R_loop: LDMFD r13!,{r4-r7,PC} + .align 2 _ARM_SimpleRate_M: @ r0 = AudioStream &input @ r1 = input.readBuffer @@ -229,6 +233,7 @@ SimpleRate_M_read: B SimpleRate_M_read_return + .align 2 _ARM_SimpleRate_S: @ r0 = AudioStream &input @ r1 = input.readBuffer @@ -308,6 +313,7 @@ SimpleRate_S_read: + .align 2 _ARM_SimpleRate_R: @ r0 = AudioStream &input @ r1 = input.readBuffer @@ -386,6 +392,7 @@ SimpleRate_R_read: B SimpleRate_R_read_return + .align 2 _ARM_LinearRate_M: @ r0 = AudioStream &input @ r1 = input.readBuffer @@ -478,6 +485,7 @@ LinearRate_M_read: BLT LinearRate_M_end B LinearRate_M_read_return + .align 2 _ARM_LinearRate_S: @ r0 = AudioStream &input @ r1 = input.readBuffer @@ -580,6 +588,7 @@ LinearRate_S_read: BLT LinearRate_S_end B LinearRate_S_read_return + .align 2 _ARM_LinearRate_R: @ r0 = AudioStream &input @ r1 = input.readBuffer @@ -2497,6 +2497,7 @@ if test -n "$_host"; then ;; iphone) DEFINES="$DEFINES -DIPHONE" + ASFLAGS="$ASFLAGS -arch armv6" _backend="iphone" _build_scalers=no _mt32emu=no diff --git a/engines/scumm/gfxARM.s b/engines/scumm/gfxARM.s index 9238888831..5cfe8ba0a4 100644 --- a/engines/scumm/gfxARM.s +++ b/engines/scumm/gfxARM.s @@ -41,6 +41,7 @@ @ In addition, we assume that text, src and dst are all word (4 byte) @ aligned. This is the same assumption that the old 'inline' version @ made. + .align 2 _asmDrawStripToScreen: @ r0 = height @ r1 = width @@ -118,6 +119,7 @@ end: @ In addition, we assume that src and dst are both word (4 byte) @ aligned. This is the same assumption that the old 'inline' version @ made. + .align 2 _asmCopy8Col: @ r0 = dst @ r1 = dstPitch diff --git a/engines/scumm/proc3ARM.s b/engines/scumm/proc3ARM.s index 75dd4b4a7f..4346f66331 100644 --- a/engines/scumm/proc3ARM.s +++ b/engines/scumm/proc3ARM.s @@ -71,6 +71,7 @@ @ <> = _palette @ <> = _numstrips @ <> = _scaleIndexY + .align 2 _ClassicProc3RendererShadowARM: @ shadow20 = false @ shadowed = true diff --git a/engines/scumm/smush/codec47ARM.s b/engines/scumm/smush/codec47ARM.s index a91f932558..53e9143f39 100644 --- a/engines/scumm/smush/codec47ARM.s +++ b/engines/scumm/smush/codec47ARM.s @@ -28,6 +28,7 @@ .global _ARM_Smush_decode2 + .align 2 _ARM_Smush_decode2: @ r0 = dst @ r1 = src 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] |