Identify (and sometimes fix) remaining uses of old-style GCC name mangling in cia files - Bug 3115
Instances which don't have defined "CSM_xxx" macros are marked "// CSM needed"
--- a/kernel/eka/drivers/trace/arm/btracex_impl.cia Mon Jun 28 10:52:57 2010 +0100
+++ b/kernel/eka/drivers/trace/arm/btracex_impl.cia Mon Jun 28 11:25:30 2010 +0100
@@ -161,7 +161,7 @@
#ifdef BTRACE_INCLUDE_TIMESTAMPS
#ifdef __SMP__
- asm("bl Timestamp__5NKern ");
+ asm("bl " CSM_ZN5NKern9TimestampEv);
asm("str r0, [r5], #4 "); // store timestamp low word
#ifdef USE_TIMESTAMP2
asm("str r1, [r5], #4 "); // store timestamp high word
--- a/kernel/eka/kernel/arm/cexec.cia Mon Jun 28 10:52:57 2010 +0100
+++ b/kernel/eka/kernel/arm/cexec.cia Mon Jun 28 11:25:30 2010 +0100
@@ -838,7 +838,7 @@
asm("b " CSM_ZN1K18PanicCurrentThreadEi);
asm("__KernMsgInfo: ");
- asm(".word " CSM_ZN1K8MsgInfoE);
+ asm(".word " CSM_ZN1K7MsgInfoE);
}
--- a/kernel/eka/kernel/arm/cipc.cia Mon Jun 28 10:52:57 2010 +0100
+++ b/kernel/eka/kernel/arm/cipc.cia Mon Jun 28 11:25:30 2010 +0100
@@ -432,6 +432,6 @@
asm(".word TheScheduler ");
#endif
asm("__K_MsgInfo: ");
- asm(".word " CSM_ZN1K8MsgInfoE);
+ asm(".word " CSM_ZN1K7MsgInfoE);
}
#endif
--- a/kernel/eka/nkernsmp/arm/ncsched.cia Mon Jun 28 10:52:57 2010 +0100
+++ b/kernel/eka/nkernsmp/arm/ncsched.cia Mon Jun 28 11:25:30 2010 +0100
@@ -866,7 +866,7 @@
asm("stmfd sp!, {r0,lr} ");
asm("mov r0, r3 ");
asm("mov r1, r12 ");
- asm("bl ReschedInactiveCpus__10TSchedulerUl ");
+ asm("bl ReschedInactiveCpus__10TSchedulerUl "); // CSM needed
asm("mov r12, r0 ");
asm("ldmfd sp!, {r0,lr} ");
asm("ldr r2, [r0, #%a0]" : : "i" _FOFF(TSubScheduler, iSSX.iGicDistAddr));
@@ -1040,7 +1040,7 @@
asm("ldr r6, [r0, #%a0]" : : "i" _FOFF(TSubScheduler,iLastTimestamp.i32[0]));
asm("ldr r7, [r0, #%a0]" : : "i" _FOFF(TSubScheduler,iLastTimestamp.i32[1]));
asm("stmfd sp!, {r0-r2,lr} ");
- asm("bl Timestamp__5NKern "); // R1:R0 = current time
+ asm("bl " CSM_ZN5NKern9TimestampEv); // R1:R0 = current time
asm("mov r4, r0 ");
asm("mov r5, r1 "); // R5:R4 = current time
asm("ldmfd sp!, {r0-r2,lr} ");
--- a/kernel/eka/nkernsmp/arm/ncthrd.cia Mon Jun 28 10:52:57 2010 +0100
+++ b/kernel/eka/nkernsmp/arm/ncthrd.cia Mon Jun 28 11:25:30 2010 +0100
@@ -576,15 +576,15 @@
asm("mov r4, r0 ");
asm("mov r5, r1 ");
asm("mov r0, r1 ");
- asm("bl AcqSLock__12NSchedulable ");
+ asm("bl AcqSLock__12NSchedulable "); // CSM needed
asm("add r0, r5, #%a0" : : "i" _FOFF(NThreadBase, iWaitState));
asm("mov r1, #%a0" : : "i" ((TInt)NThreadBase::EWaitFastSemaphore));
asm("mov r2, r4 ");
asm("mov r3, #0 ");
- asm("bl UnBlockT__16NThreadWaitStateUiPvi ");
+ asm("bl UnBlockT__16NThreadWaitStateUiPvi "); // CSM needed
asm("mov r0, r5 ");
asm("ldmfd sp!, {r4-r6,lr} ");
- asm("b RelSLock__12NSchedulable ");
+ asm("b RelSLock__12NSchedulable "); // CSM needed
}
@@ -707,7 +707,7 @@
__ASM_STI();
asm("bl fs_signal_wake "); // wake up the thread
asm("ldmfd sp!, {r4,lr} ");
- asm("b Unlock__5NKern ");
+ asm("b " CSM_ZN5NKern6UnlockEv);
}
@@ -960,14 +960,14 @@
asm("bne 1b "); // no - retry
asm("mov r6, r0 ");
asm("tst r4, #%a0" : : "i" ((TInt)EWtStTimeout));
- asm("blne CancelTimerT__16NThreadWaitState ");
+ asm("blne CancelTimerT__16NThreadWaitState "); // CSM needed
asm("tst r4, #%a0" : : "i" ((TInt)EWtStWaitActive));
asm("beq 0f ");
asm("ldr r1, [r6, #%a0]" : : "i" (_FOFF(NThreadBase,iPauseCount)-_FOFF(NThreadBase,iWaitState)));
asm("sub r0, r6, #%a0" : : "i" _FOFF(NThreadBase,iWaitState)); // r0 = Thread()
asm("movs r1, r1, lsl #16 "); // check if iPauseCount=iSuspendCount=0
asm("andeq r1, r4, #%a0" : : "i" ((TInt)EWtStObstructed));
- asm("bleq ReadyT__12NSchedulableUi "); // if so, make thread ready
+ asm("bleq ReadyT__12NSchedulableUi "); // if so, make thread ready // CSM needed
asm("0: ");
asm("mov r0, #0 ");
__POPRET(" r4-r6,"); // return KErrNone
@@ -1002,7 +1002,7 @@
asm("2: ");
asm("mov r5, lr ");
- asm("bl CancelTimerT__16NThreadWaitState ");
+ asm("bl CancelTimerT__16NThreadWaitState "); // CSM needed
asm("mov r0, r4 ");
asm("mov lr, r5 ");
asm("ldmfd sp!, {r4-r5} ");
@@ -1039,7 +1039,7 @@
asm("ldr r0, btrace_hdr_fmsignal ");
asm("mov r2, #0 ");
asm("mov r3, #0 ");
- asm("bl OutX__6BTraceUlUlUlUl ");
+ asm("bl " CSM_ZN6BTrace4OutXEmmmm);
asm("ldmfd sp!, {r0,lr} ");
#endif
GET_RWNO_TID(,r3);
@@ -1069,7 +1069,7 @@
asm("orr r12, r0, #1 ");
asm("str r12, [r1, #%a0]" : : "i" _FOFF(NThreadBase,iHeldFastMutex));
__ASM_STI();
- asm("b DoSignalL__10NFastMutex ");
+ asm("b DoSignalL__10NFastMutex "); // CSM needed
}
@@ -1137,7 +1137,7 @@
asm("ldr r0, btrace_hdr_fmwait ");
asm("mov r2, #0 ");
asm("mov r3, #0 ");
- asm("b OutX__6BTraceUlUlUlUl ");
+ asm("b " CSM_ZN6BTrace4OutXEmmmm);
#endif
__JUMP(,lr); // mutex acquired without contention
@@ -1149,9 +1149,9 @@
__ASM_STI();
__DATA_MEMORY_BARRIER_Z__(r12);
asm("stmfd sp!, {r4,lr} ");
- asm("bl DoWaitL__10NFastMutex ");
+ asm("bl DoWaitL__10NFastMutex "); // CSM needed
asm("ldmfd sp!, {r4,lr} ");
- asm("b Unlock__5NKern ");
+ asm("b " CSM_ZN5NKern6UnlockEv);
asm("__SystemLock: ");
asm(".word %a0" : : "i" ((TInt)&TheScheduler.iLock));
@@ -1195,7 +1195,7 @@
asm("ldr r0, btrace_hdr_fmsignal ");
asm("mov r2, #0 ");
asm("mov r3, #0 ");
- asm("bl OutX__6BTraceUlUlUlUl ");
+ asm("bl " CSM_ZN6BTrace4OutXEmmmm);
asm("ldmfd sp!, {r0,lr} ");
#endif
__ASM_CLI();
@@ -1223,9 +1223,9 @@
asm("str r12, [r3, #%a0]" : : "i" _FOFF(TSubScheduler,iKernLockCount));
asm("str r4, [r1, #%a0]" : : "i" _FOFF(NThreadBase,iHeldFastMutex));
__ASM_STI();
- asm("bl DoSignalL__10NFastMutex ");
+ asm("bl DoSignalL__10NFastMutex "); // CSM needed
asm("ldmfd sp!, {r4,lr} ");
- asm("b Unlock__5NKern ");
+ asm("b " CSM_ZN5NKern6UnlockEv);
}
@@ -1298,7 +1298,7 @@
asm("stmfd sp!, {r4,lr} ");
asm("mov r2, #0 ");
asm("mov r3, #0 ");
- asm("bl OutX__6BTraceUlUlUlUl ");
+ asm("bl " CSM_ZN6BTrace4OutXEmmmm);
asm("ldmfd sp!, {r4,lr} ");
#endif
asm("mov r0, #0 ");
@@ -1315,11 +1315,11 @@
__ASM_STI();
asm("stmfd sp!, {r4,lr} ");
asm("mov r4, r0 ");
- asm("bl Signal__10NFastMutex ");
- asm("bl PreemptionPoint__5NKern ");
+ asm("bl " CSM_ZN10NFastMutex6SignalEv);
+ asm("bl " CSM_ZN5NKern15PreemptionPointEv);
asm("mov r0, r4 ");
- asm("bl Wait__10NFastMutex ");
- asm("bl Unlock__5NKern ");
+ asm("bl " CSM_ZN10NFastMutex4WaitEv);
+ asm("bl " CSM_ZN5NKern6UnlockEv);
asm("ldmfd sp!, {r4,lr} ");
asm("mov r0, #1 ");
__JUMP(,lr); // return TRUE
--- a/kernel/eka/nkernsmp/arm/ncutils.cia Mon Jun 28 10:52:57 2010 +0100
+++ b/kernel/eka/nkernsmp/arm/ncutils.cia Mon Jun 28 11:25:30 2010 +0100
@@ -592,7 +592,7 @@
asm("btrace_check_filter2: ");
asm("stmfd sp!, {r0,r1,r3,r4,r12,lr} ");
asm("mov r0, r12 ");
- asm("bl CheckFilter2__11SBTraceDataUl ");
+ asm("bl CheckFilter2__11SBTraceDataUl "); // CSM needed
asm("cmp r0, #0 ");
asm("beq 0f ");
asm("mrs r14, cpsr ");
--- a/kernel/eka/nkernsmp/arm/vectors.cia Mon Jun 28 10:52:57 2010 +0100
+++ b/kernel/eka/nkernsmp/arm/vectors.cia Mon Jun 28 11:25:30 2010 +0100
@@ -157,7 +157,7 @@
#ifndef __FAST_SEM_MACHINE_CODED__
asm("wait_for_any_request: ");
__ASM_STI(); // all interrupts on
- asm("b WaitForAnyRequest__5NKern ");
+ asm("b WaitForAnyRequest__5NKern "); // CSM needed
#else
asm(".global exec_wfar_wait ");
asm("exec_wfar_wait: ");
@@ -1005,7 +1005,7 @@
// CsFunction outstanding so do it
asm("5: ");
__ASM_STI(); // enable interrupts
- asm("bl ThreadLeaveCS__5NKern ");
+ asm("bl " CSM_ZN5NKern13ThreadLeaveCSEv);
__ASM_CLI(); // turn off interrupts
__DATA_MEMORY_BARRIER__(r6);
asm("ldr r1, [r8] ");