[Scummvm-cvs-logs] scummvm master -> 9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189
lordhoto
lordhoto at gmail.com
Sun Mar 9 16:04:40 CET 2014
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
fa2297f6b7 SCUMM: Manually specify function alignment in ARM assembly.
e499a25a00 GRAPHICS: Manually specify function alignment in ARM assembly.
0063c25805 AUDIO: Manually specify function alignment in ARM assembly.
948d4feb23 CONFIGURE: Allow iPhone backend to be build with cctools' as.
9ba4a3f0a9 Merge pull request #444 from lordhoto/iphone-clang-3.3
Commit: fa2297f6b7adb78a7d286c174d16a123a5295683
https://github.com/scummvm/scummvm/commit/fa2297f6b7adb78a7d286c174d16a123a5295683
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-03-06T20:21:47+01:00
Commit Message:
SCUMM: Manually specify function alignment in ARM assembly.
Changed paths:
engines/scumm/gfxARM.s
engines/scumm/proc3ARM.s
engines/scumm/smush/codec47ARM.s
diff --git a/engines/scumm/gfxARM.s b/engines/scumm/gfxARM.s
index 9238888..5cfe8ba 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 75dd4b4..4346f66 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 a91f932..53e9143 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
Commit: e499a25a001c8116c03400be720eac58d250619f
https://github.com/scummvm/scummvm/commit/e499a25a001c8116c03400be720eac58d250619f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-03-06T20:21:48+01:00
Commit Message:
GRAPHICS: Manually specify function alignment in ARM assembly.
Changed paths:
graphics/scaler/Normal2xARM.s
graphics/scaler/downscalerARM.s
graphics/scaler/scale2xARM.s
diff --git a/graphics/scaler/Normal2xARM.s b/graphics/scaler/Normal2xARM.s
index e359229..c5684c3 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 e466252..4c09381 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 563a22e..a56e784 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]
Commit: 0063c25805be62ff490af4a1d8aaf1490114b895
https://github.com/scummvm/scummvm/commit/0063c25805be62ff490af4a1d8aaf1490114b895
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-03-06T20:21:48+01:00
Commit Message:
AUDIO: Manually specify function alignment in ARM assembly.
Changed paths:
audio/rate_arm_asm.s
diff --git a/audio/rate_arm_asm.s b/audio/rate_arm_asm.s
index ac999f6..a727209 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
Commit: 948d4feb234b7f9fa8b4951921c593cabf7dafea
https://github.com/scummvm/scummvm/commit/948d4feb234b7f9fa8b4951921c593cabf7dafea
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-03-06T21:13:57+01:00
Commit Message:
CONFIGURE: Allow iPhone backend to be build with cctools' as.
Changed paths:
configure
diff --git a/configure b/configure
index 5499cec..5f50135 100755
--- a/configure
+++ b/configure
@@ -2497,6 +2497,7 @@ if test -n "$_host"; then
;;
iphone)
DEFINES="$DEFINES -DIPHONE"
+ ASFLAGS="$ASFLAGS -arch armv6"
_backend="iphone"
_build_scalers=no
_mt32emu=no
Commit: 9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189
https://github.com/scummvm/scummvm/commit/9ba4a3f0a92a69d580b8a1d76a05ef2d4a8cc189
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2014-03-09T16:04:13+01:00
Commit Message:
Merge pull request #444 from lordhoto/iphone-clang-3.3
IPHONE: Support clang based toolchain
Changed paths:
audio/rate_arm_asm.s
configure
engines/scumm/gfxARM.s
engines/scumm/proc3ARM.s
engines/scumm/smush/codec47ARM.s
graphics/scaler/Normal2xARM.s
graphics/scaler/downscalerARM.s
graphics/scaler/scale2xARM.s
More information about the Scummvm-git-logs
mailing list