diff options
| author | Johannes Schickel | 2014-03-09 16:04:13 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2014-03-09 16:04:13 +0100 |
| commit | 9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189 (patch) | |
| tree | 5b241fe05aabeabf338446cd8f5399867333187c /graphics | |
| parent | 3c76acf4451bdfcc15a940b32a1e86b517f43f46 (diff) | |
| parent | 948d4feb234b7f9fa8b4951921c593cabf7dafea (diff) | |
| download | scummvm-rg350-9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189.tar.gz scummvm-rg350-9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189.tar.bz2 scummvm-rg350-9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189.zip | |
Merge pull request #444 from lordhoto/iphone-clang-3.3
IPHONE: Support clang based toolchain
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/scaler/Normal2xARM.s | 2 | ||||
| -rw-r--r-- | graphics/scaler/downscalerARM.s | 1 | ||||
| -rw-r--r-- | graphics/scaler/scale2xARM.s | 3 |
3 files changed, 6 insertions, 0 deletions
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] |