[Scummvm-cvs-logs] scummvm master -> e19fe1c53fb9433a188618d94cc8a3f5a15fd5d8
dhewg
dhewg at wiibrew.org
Sat Apr 23 03:42:22 CEST 2011
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b4f8a63171 ASM: Replace .equ with .set in proc3ARM.s
983b044ccb ARM: Global symbols get an underscore prefix on darwin
e19fe1c53f ASM: Defines do not get mangled
Commit: b4f8a63171967814d43a1e3883055b03f6d5b8ac
https://github.com/scummvm/scummvm/commit/b4f8a63171967814d43a1e3883055b03f6d5b8ac
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-04-22T18:39:37-07:00
Commit Message:
ASM: Replace .equ with .set in proc3ARM.s
gas from the iphone failchain doesn't know about .equ, and .set is
synonymous with .equ - which it supports
Changed paths:
engines/scumm/proc3ARM.s
diff --git a/engines/scumm/proc3ARM.s b/engines/scumm/proc3ARM.s
index 8b3e31f..646142a 100644
--- a/engines/scumm/proc3ARM.s
+++ b/engines/scumm/proc3ARM.s
@@ -28,37 +28,37 @@
.global ClassicProc3RendererShadowARM
-.equ _scaleIndexY , 112
-.equ _numStrips , 108
-.equ _palette , 104
-.equ _shadow_table , 100
-.equ _scaleIndexX , 96
-.equ _scaleX , 92
-.equ _height , 88
-.equ store_r14 , 84
-.equ store_r11 , 80
-.equ store_r10 , 76
-.equ store_r9 , 72
-.equ store_r8 , 68
-.equ store_r7 , 64
-.equ store_r6 , 60
-.equ store_r5 , 56
-.equ store_r4 , 52
-.equ src , 48
-.equ height , 44
-.equ len , 40
-.equ v1_shr , 36
-.equ v1_skip_width , 32
-.equ v1_destptr , 28
-.equ v1_scaleXstep , 24
-.equ v1_mask_ptr , 20
-.equ v1_y , 16
-.equ v1_scaletable , 12
-.equ pitch , 8
-.equ scaleIdxXPtr , 4
-.equ scaleIdxYPtr , 0
+.set _scaleIndexY , 112
+.set _numStrips , 108
+.set _palette , 104
+.set _shadow_table , 100
+.set _scaleIndexX , 96
+.set _scaleX , 92
+.set _height , 88
+.set store_r14 , 84
+.set store_r11 , 80
+.set store_r10 , 76
+.set store_r9 , 72
+.set store_r8 , 68
+.set store_r7 , 64
+.set store_r6 , 60
+.set store_r5 , 56
+.set store_r4 , 52
+.set src , 48
+.set height , 44
+.set len , 40
+.set v1_shr , 36
+.set v1_skip_width , 32
+.set v1_destptr , 28
+.set v1_scaleXstep , 24
+.set v1_mask_ptr , 20
+.set v1_y , 16
+.set v1_scaletable , 12
+.set pitch , 8
+.set scaleIdxXPtr , 4
+.set scaleIdxYPtr , 0
-.equ space , 48
+.set space , 48
@ r0 = _scaleY
@ r1 = v1
Commit: 983b044ccb9b82eabd8d3b667822c3693ddb4e6d
https://github.com/scummvm/scummvm/commit/983b044ccb9b82eabd8d3b667822c3693ddb4e6d
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-04-22T18:39:37-07:00
Commit Message:
ARM: Global symbols get an underscore prefix on darwin
apply same solution as for the sound/smush ARM asm here
Changed paths:
engines/scumm/costume.cpp
engines/scumm/gfx.cpp
engines/scumm/gfxARM.s
engines/scumm/proc3ARM.s
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index cd366fc..d0a3ec6 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -419,6 +419,11 @@ void ClassicCostumeRenderer::procC64(Codec1 &v1, int actor) {
#undef MASK_AT
#ifdef USE_ARM_COSTUME_ASM
+
+#ifndef IPHONE
+#define ClassicProc3RendererShadowARM _ClassicProc3RendererShadowARM
+#endif
+
extern "C" int ClassicProc3RendererShadowARM(int _scaleY,
ClassicCostumeRenderer::Codec1 *v1,
Graphics::Surface *_out,
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index a6a97ec..80c13d3 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -36,6 +36,12 @@
#include "scumm/util.h"
#ifdef USE_ARM_GFX_ASM
+
+#ifndef IPHONE
+#define asmDrawStripToScreen _asmDrawStripToScreen
+#define asmCopy8Col _asmCopy8Col
+#endif
+
extern "C" void asmDrawStripToScreen(int height, int width, void const* text, void const* src, byte* dst,
int vsPitch, int vmScreenWidth, int textSurfacePitch);
extern "C" void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height, uint8 bitDepth);
diff --git a/engines/scumm/gfxARM.s b/engines/scumm/gfxARM.s
index 34de954..9f7c294 100644
--- a/engines/scumm/gfxARM.s
+++ b/engines/scumm/gfxARM.s
@@ -25,8 +25,8 @@
.text
- .global asmDrawStripToScreen
- .global asmCopy8Col
+ .global _asmDrawStripToScreen
+ .global _asmCopy8Col
@ ARM implementation of asmDrawStripToScreen.
@
@@ -44,7 +44,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.
-asmDrawStripToScreen:
+_asmDrawStripToScreen:
@ r0 = height
@ r1 = width
@ r2 = text
@@ -125,7 +125,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.
-asmCopy8Col:
+_asmCopy8Col:
@ r0 = dst
@ r1 = dstPitch
@ r2 = src
diff --git a/engines/scumm/proc3ARM.s b/engines/scumm/proc3ARM.s
index 646142a..5acfa86 100644
--- a/engines/scumm/proc3ARM.s
+++ b/engines/scumm/proc3ARM.s
@@ -25,7 +25,7 @@
.text
- .global ClassicProc3RendererShadowARM
+ .global _ClassicProc3RendererShadowARM
.set _scaleIndexY , 112
@@ -71,7 +71,7 @@
@ <> = _palette
@ <> = _numstrips
@ <> = _scaleIndexY
-ClassicProc3RendererShadowARM:
+_ClassicProc3RendererShadowARM:
@ shadow20 = false
@ shadowed = true
@ unscaled = false
Commit: e19fe1c53fb9433a188618d94cc8a3f5a15fd5d8
https://github.com/scummvm/scummvm/commit/e19fe1c53fb9433a188618d94cc8a3f5a15fd5d8
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-04-22T18:39:38-07:00
Commit Message:
ASM: Defines do not get mangled
Changed paths:
audio/rate_arm.cpp
engines/scumm/smush/codec47.cpp
diff --git a/audio/rate_arm.cpp b/audio/rate_arm.cpp
index 43172f6..9c0e849 100644
--- a/audio/rate_arm.cpp
+++ b/audio/rate_arm.cpp
@@ -129,13 +129,11 @@ SimpleRateConverter<stereo, reverseStereo>::SimpleRateConverter(st_rate_t inrate
sr.inLen = 0;
}
-extern "C" {
#ifndef IPHONE
#define ARM_SimpleRate_M _ARM_SimpleRate_M
#define ARM_SimpleRate_S _ARM_SimpleRate_S
#define ARM_SimpleRate_R _ARM_SimpleRate_R
#endif
-}
extern "C" st_sample_t *ARM_SimpleRate_M(
AudioStream &input,
diff --git a/engines/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp
index 333fdab..3a1639c 100644
--- a/engines/scumm/smush/codec47.cpp
+++ b/engines/scumm/smush/codec47.cpp
@@ -342,11 +342,9 @@ void Codec47Decoder::makeTables47(int width) {
#ifdef USE_ARM_SMUSH_ASM
-extern "C" {
#ifndef IPHONE
#define ARM_Smush_decode2 _ARM_Smush_decode2
#endif
-}
extern "C" void ARM_Smush_decode2( byte *dst,
const byte *src,
More information about the Scummvm-git-logs
mailing list