# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1265974595 0
# Node ID 3034dfa79906999fad34a1cb6c2a4de8db827634
# Parent  c52dc72e02c58e71b894e3b07028fdbe6b8960ec
Fix for Bug 1807 - replace ARMCC assembler file stackpointer.s with portable stackpointer.cia

diff -r c52dc72e02c5 -r 3034dfa79906 ncdengine/engine/group/catalogsdebug.mmp
--- a/ncdengine/engine/group/catalogsdebug.mmp	Wed Feb 10 14:50:38 2010 +0000
+++ b/ncdengine/engine/group/catalogsdebug.mmp	Fri Feb 12 11:36:35 2010 +0000
@@ -51,7 +51,7 @@
 SOURCEPATH    ../../engine/src
 SOURCE 	      catalogsdebug.cpp
 #ifndef WINSCW
-SOURCE		  stackpointer.s
+SOURCE		  stackpointer.cia
 #endif
 
 // System include paths
diff -r c52dc72e02c5 -r 3034dfa79906 ncdengine/engine/src/catalogsdebug.cpp
--- a/ncdengine/engine/src/catalogsdebug.cpp	Wed Feb 10 14:50:38 2010 +0000
+++ b/ncdengine/engine/src/catalogsdebug.cpp	Fri Feb 12 11:36:35 2010 +0000
@@ -49,7 +49,7 @@
 #include "e32debug.h"
 
 #ifndef __WINS__
-extern "C" TUint32 GetStackPointer();
+extern TUint32 GetStackPointer();
 #endif
 
 //#define _DDPRINT( x ) RDebug::Printf x
diff -r c52dc72e02c5 -r 3034dfa79906 ncdengine/engine/src/stackpointer.cia
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ncdengine/engine/src/stackpointer.cia	Fri Feb 12 11:36:35 2010 +0000
@@ -0,0 +1,23 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   
+*/
+#include <e32def.h>
+
+__NAKED__ TUint32 GetStackPointer(void)
+		{
+		asm("mov r0,sp");
+		asm("bx lr");
+		}
+
diff -r c52dc72e02c5 -r 3034dfa79906 ncdengine/engine/src/stackpointer.s
--- a/ncdengine/engine/src/stackpointer.s	Wed Feb 10 14:50:38 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: 
-;
-
-
-;.text
-;.global GetStackPointer
-;
-;GetStackPointer:
-;	mov r0,r13
-;	mov pc,r14
-
-	AREA |.text|, CODE, READONLY
-	EXPORT GetStackPointer
-
-GetStackPointer
-	mov	r0,sp
-	bx lr
-	END