# HG changeset patch # User William Roberts # Date 1277215752 -3600 # Node ID 2afef616d2a172fff0808b97b5d90513c9692234 # Parent 8f7f130ac31a5fbbe12daabddbd59e2ff71e01be Use the CSM_* macros consistently in cdes8.cia and cdes16.cia, and fix mangled name for Mem::Compare functions (Bug 3064) diff -r 8f7f130ac31a -r 2afef616d2a1 kernel/eka/common/arm/cdes16.cia --- a/kernel/eka/common/arm/cdes16.cia Mon Jun 21 21:52:32 2010 +0100 +++ b/kernel/eka/common/arm/cdes16.cia Tue Jun 22 15:09:12 2010 +0100 @@ -183,7 +183,7 @@ asm("sub r3, r3, r1 "); // r3 = 2*length asm("mov r3, r3, lsr #1 "); // r3 = length (+EBufC) asm("cmp r3, r2 "); // check against max length - asm("bgt Des16PanicLengthOutOfRange__Fv "); + asm("bgt " CSM_Z26Des16PanicLengthOutOfRangev); asm("stmfd sp!, {r0,lr} "); // save registers for function call asm("str r3, [r0], #4 "); // save length/type field, r0->buffer asm("add r2, r3, r3 "); // size=2*length into r2 for function call @@ -230,7 +230,7 @@ asm("sub r3, r3, r1 "); // r3 = 2*length asm("mov r3, r3, lsr #1 "); // r3 = length (+EBufC) asm("cmp r3, r2 "); // check against max length - asm("bgt Des16PanicLengthOutOfRange__Fv "); + asm("bgt " CSM_Z26Des16PanicLengthOutOfRangev); asm("str r3, [r0], #4 "); // save length/type field, r0->buffer asm("add r2, r3, r3 "); // size=2*length into r2 for function call asm("b memmove "); // call memmove @@ -290,7 +290,7 @@ asm("rsb r3, r12, r1, lsr #1 "); // r3 = length + 1 asm("sub r3, r3, #1 "); // r3 = length asm("cmp r3, r2 "); // compare to max length - asm("bgt Des16PanicLengthOutOfRange__Fv "); // length too big, so panic + asm("bgt " CSM_Z26Des16PanicLengthOutOfRangev); // length too big, so panic asm("orr r1, r3, #0x30000000 "); // if length<=max, r1=EBuf + length asm("stmfd sp!, {r0, lr} "); // save registers for function call asm("stmia r0!, {r1, r2} "); // store type/length and max length fields, r0->buffer @@ -373,9 +373,9 @@ asm("mov r2, r2, lsr #1 "); // r2=length of string asm("ldmia r0, {r3,r12} "); // r3=type/length of this, r12=maxlength asm("cmp r2, r12 "); // compare new length against maxlength - asm("bgt Des16PanicDesOverflow__Fv "); + asm("bgt " CSM_Z21Des16PanicDesOverflowv); asm("cmp r3, #0x50000000 "); - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("and r3, r3, #0xF0000000 "); // r3=type of this asm("orr r3, r3, r2 "); // r3=new type/length asm("str r3, [r0], #4 "); // store it @@ -451,12 +451,12 @@ // Return TPtr8 ([r0]=length/type,[r0,#4]=maxLength,[r0,#8]=Ptr) asm("ldr r3, [r1], #4 "); // r3=this.length/type asm("cmp r2, #0 "); // check aLength>=0 - asm("blt Des16PanicPosOutOfRange__Fv "); // if not, panic + asm("blt " CSM_Z23Des16PanicPosOutOfRangev); // if not, panic asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, r12 "); // else limit aLength to Length() asm("movgt r2, r12 "); asm("cmp r3, #0x50000000 "); - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -477,12 +477,12 @@ // Return TPtr8 ([r0]=length/type,[r0,#4]=maxLength,[r0,#8]=Ptr) asm("ldr r3, [r1], #4 "); // r3=this.length/type asm("cmp r2, #0 "); // check aLength>=0 - asm("blt Des16PanicPosOutOfRange__Fv "); // if not, panic + asm("blt " CSM_Z23Des16PanicPosOutOfRangev); // if not, panic asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, r12 "); // else limit aLength to Length() asm("movgt r2, r12 "); asm("cmp r3, #0x50000000 "); - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -506,9 +506,9 @@ asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, #0 "); // check aPos>=0 asm("cmpge r12, r2 "); // if so check Length()>=aPos - asm("blt Des16PanicPosOutOfRange__Fv "); + asm("blt " CSM_Z23Des16PanicPosOutOfRangev); asm("cmp r3, #0x50000000 "); - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -532,7 +532,7 @@ asm("ldr r12, [r1], #4 "); // r12=this.length/type asm("mov r4, r1 "); asm("cmp r12, #0x50000000 "); // check valid descriptor type - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("eor r12, r12, r12, lsr #1 "); asm("msr cpsr_flg, r12 "); asm("ldr r12, [r1, #-4] "); @@ -549,7 +549,7 @@ asm("stmgeia r0, {r1-r3} "); asm("ldrge r4, [sp], #4 "); __JUMP(ge,lr); - asm("b Des16PanicPosOutOfRange__Fv "); + asm("b " CSM_Z23Des16PanicPosOutOfRangev); } __NAKED__ EXPORT_C const TUint16& TDesC16::AtC(TInt /*anIndex*/) const @@ -581,7 +581,7 @@ { asm("ldr r2, [r0], #4 "); // r2=length/type asm("cmp r2, #0x50000000 "); - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("bics r3, r2, #0xF0000000 "); // r3=length asm("mvneq r0, #0 "); // if length=0, not found __JUMP(eq,lr); @@ -611,7 +611,7 @@ { asm("ldr r2, [r0], #4 "); // r2=length/type asm("cmp r2, #0x50000000 "); - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("bics r3, r2, #0xF0000000 "); // r3=length asm("mvneq r0, #0 "); // if length=0, not found __JUMP(eq,lr); @@ -643,7 +643,7 @@ asm("ldr r12, 1f "); asm("b comparebody "); asm("1: "); - asm(".word " CSM_ZN3Mem8CompareFEPKtiS0_i); + asm(".word " CSM_ZN3Mem8CompareFEPKtiS1_i); } __NAKED__ EXPORT_C TInt TDesC16::CompareC(const TDesC16& /*aDes*/) const @@ -654,7 +654,7 @@ asm("ldr r12, 1f "); asm("b comparebody "); asm("1: "); - asm(".word " CSM_ZN3Mem8CompareCEPKtiS0_i); + asm(".word " CSM_ZN3Mem8CompareCEPKtiS1_i); } #endif @@ -695,7 +695,7 @@ #ifdef __KERNEL_MODE__ asm(".word memcompare "); #else - asm(".word " CSM_ZN3Mem7CompareEPKtiS0_i); + asm(".word " CSM_ZN3Mem7CompareEPKtiS1_i); #endif } #endif // __DES16_MACHINE_CODED__ @@ -820,12 +820,12 @@ // Return TPtr16 ([r0]=length/type,[r0,#4]=Ptr) asm("ldr r3, [r1], #4 "); // r3=this.length/type asm("cmp r2, #0 "); // check aLength>=0 - asm("blt Des16PanicPosOutOfRange__Fv "); // if not, panic + asm("blt " CSM_Z23Des16PanicPosOutOfRangev); // if not, panic asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, r12 "); // else limit aLength to Length() asm("movgt r2, r12 "); asm("cmp r3, #0x50000000 "); - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -846,12 +846,12 @@ // Return TPtr16 ([r0]=length/type,[r0,#4]=Ptr) asm("ldr r3, [r1], #4 "); // r3=this.length/type asm("cmp r2, #0 "); // check aLength>=0 - asm("blt Des16PanicPosOutOfRange__Fv "); // if not, panic + asm("blt " CSM_Z23Des16PanicPosOutOfRangev); // if not, panic asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, r12 "); // else limit aLength to Length() asm("movgt r2, r12 "); asm("cmp r3, #0x50000000 "); - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -875,9 +875,9 @@ asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, #0 "); // check aPos>=0 asm("cmpge r12, r2 "); // if so check Length()>=aPos - asm("blt Des16PanicPosOutOfRange__Fv "); + asm("blt " CSM_Z23Des16PanicPosOutOfRangev); asm("cmp r3, #0x50000000 "); - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -899,7 +899,7 @@ // Return TPtr16 ([r0]=length/type,[r0,#4]=Ptr) asm("ldr r12, [r1], #4 "); // r12=this.length/type asm("cmp r12, #0x50000000 "); // check valid descriptor type - asm("bcs Des16PanicBadDesType__Fv "); + asm("bcs " CSM_Z20Des16PanicBadDesTypev); asm("eor r12, r12, r12, lsr #1 "); asm("msr cpsr_flg, r12 "); asm("ldr r12, [r1, #-4] "); @@ -914,7 +914,7 @@ asm("orrge r1, r3, #0x10000000 "); // and r1 = aLength + EPtrC asm("stmgeia r0, {r1,r2} "); __JUMP(ge,lr); - asm("b Des16PanicPosOutOfRange__Fv "); + asm("b " CSM_Z23Des16PanicPosOutOfRangev); } #endif // __EABI__ @@ -953,9 +953,9 @@ asm("ldmia r0, {r1,r2} "); // r1=length/type, r2=maxlength asm("bic r3, r1, #0xF0000000 "); // r3=Length(); asm("cmp r3, r2 "); // check Length()=0 - asm("blt Des8PanicPosOutOfRange__Fv "); // if not panic + asm("blt " CSM_Z27Des8PanicDesIndexOutOfRangev); // if not panic asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, r12 "); // limit aLength to Length() asm("movgt r2, r12 "); asm("cmp r3, #0x50000000 "); // check type() <= 4 - asm("bcs Des8PanicBadDesType__Fv "); // if not, panic + asm("bcs " CSM_Z19Des8PanicBadDesTypev); // if not, panic asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -467,12 +467,12 @@ // Return TPtr8 ([r0]=length/type,[r0,#4]=maxLength,[r0,#8]=Ptr) asm("ldr r3, [r1], #4 "); // r3=this.length/type asm("cmp r2, #0 "); // check aLength>=0 - asm("blt Des8PanicPosOutOfRange__Fv "); // if not, panic + asm("blt " CSM_Z27Des8PanicDesIndexOutOfRangev); // if not, panic asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, r12 "); // limit aLength to Length() asm("movgt r2, r12 "); asm("cmp r3, #0x50000000 "); // check type() <= 4 - asm("bcs Des8PanicBadDesType__Fv "); + asm("bcs " CSM_Z19Des8PanicBadDesTypev); asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -496,9 +496,9 @@ asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, #0 "); // check aPos>=0 asm("cmpge r12, r2 "); // if so check Length()>=aPos - asm("blt Des8PanicPosOutOfRange__Fv "); + asm("blt " CSM_Z27Des8PanicDesIndexOutOfRangev); asm("cmp r3, #0x50000000 "); // check type() <= 4 - asm("bcs Des8PanicBadDesType__Fv "); + asm("bcs " CSM_Z19Des8PanicBadDesTypev); asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -522,7 +522,7 @@ asm("ldr r12, [r1], #4 "); // r12=this.length/type asm("mov r4, r1 "); asm("cmp r12, #0x50000000 "); // check valid descriptor type - asm("bcs Des8PanicBadDesType__Fv "); + asm("bcs " CSM_Z19Des8PanicBadDesTypev); asm("eor r12, r12, r12, lsr #1 "); asm("msr cpsr_flg, r12 "); asm("ldr r12, [r1, #-4] "); @@ -539,7 +539,7 @@ asm("stmgeia r0, {r1-r3} "); asm("ldrge r4, [sp], #4 "); __JUMP(ge,lr); - asm("b Des8PanicPosOutOfRange__Fv "); + asm("b " CSM_Z27Des8PanicDesIndexOutOfRangev); } #endif @@ -630,7 +630,7 @@ asm("ldr r12, 1f "); asm("b comparebody "); asm("1: "); - asm(".word " CSM_ZN3Mem8CompareFEPKhiS0_i); + asm(".word " CSM_ZN3Mem8CompareFEPKhiS1_i); } __NAKED__ EXPORT_C TInt TDesC8::CompareC(const TDesC8& /*aDes*/) const @@ -641,7 +641,7 @@ asm("ldr r12, 1f "); asm("b comparebody "); asm("1: "); - asm(".word " CSM_ZN3Mem8CompareCEPKhiS0_i); + asm(".word " CSM_ZN3Mem8CompareCEPKhiS1_i); } #endif @@ -798,12 +798,12 @@ // Return TPtrC8 ([r0]=length/type,[r0,#4]=Ptr) asm("ldr r3, [r1], #4 "); // r3=this.length/type asm("cmp r2, #0 "); // check aLength>=0 - asm("blt Des8PanicPosOutOfRange__Fv "); // if not panic + asm("blt " CSM_Z27Des8PanicDesIndexOutOfRangev); // if not panic asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, r12 "); // limit aLength to Length() asm("movgt r2, r12 "); asm("cmp r3, #0x50000000 "); // check type() <= 4 - asm("bcs Des8PanicBadDesType__Fv "); // if not, panic + asm("bcs " CSM_Z19Des8PanicBadDesTypev); // if not, panic asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -824,12 +824,12 @@ // Return TPtrC8 ([r0]=length/type,[r0,#4]=Ptr) asm("ldr r3, [r1], #4 "); // r3=this.length/type asm("cmp r2, #0 "); // check aLength>=0 - asm("blt Des8PanicPosOutOfRange__Fv "); // if not, panic + asm("blt " CSM_Z27Des8PanicDesIndexOutOfRangev); // if not, panic asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, r12 "); // limit aLength to Length() asm("movgt r2, r12 "); asm("cmp r3, #0x50000000 "); // check type() <= 4 - asm("bcs Des8PanicBadDesType__Fv "); + asm("bcs " CSM_Z19Des8PanicBadDesTypev); asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -853,9 +853,9 @@ asm("bic r12, r3, #0xF0000000 "); // r12=this.Length() asm("cmp r2, #0 "); // check aPos>=0 asm("cmpge r12, r2 "); // if so check Length()>=aPos - asm("blt Des8PanicPosOutOfRange__Fv "); + asm("blt " CSM_Z27Des8PanicDesIndexOutOfRangev); asm("cmp r3, #0x50000000 "); // check type() <= 4 - asm("bcs Des8PanicBadDesType__Fv "); + asm("bcs " CSM_Z19Des8PanicBadDesTypev); asm("eor r3, r3, r3, lsr #1 "); asm("msr cpsr_flg, r3 "); asm("addcs r1, r1, #4 "); @@ -877,7 +877,7 @@ // Return TPtrC8 ([r0]=length/type,[r0,#4]=Ptr) asm("ldr r12, [r1], #4 "); // r12=this.length/type asm("cmp r12, #0x50000000 "); // check valid descriptor type - asm("bcs Des8PanicBadDesType__Fv "); + asm("bcs " CSM_Z19Des8PanicBadDesTypev); asm("eor r12, r12, r12, lsr #1 "); asm("msr cpsr_flg, r12 "); asm("ldr r12, [r1, #-4] "); @@ -892,7 +892,7 @@ asm("orrge r1, r3, #0x10000000 "); // and r1=aLength + EPtrC asm("stmgeia r0, {r1,r2} "); __JUMP(ge,lr); - asm("b Des8PanicPosOutOfRange__Fv "); + asm("b " CSM_Z27Des8PanicDesIndexOutOfRangev); } #endif diff -r 8f7f130ac31a -r 2afef616d2a1 kernel/eka/include/e32cia.h --- a/kernel/eka/include/e32cia.h Mon Jun 21 21:52:32 2010 +0100 +++ b/kernel/eka/include/e32cia.h Tue Jun 22 15:09:12 2010 +0100 @@ -472,18 +472,18 @@ #define CSM_Z26Des16PanicLengthOutOfRangev " Des16PanicLengthOutOfRange__Fv" #define CSM_Z20Des8PanicDesOverflowv " Des8PanicDesOverflow__Fv" #define CSM_ZN10RArrayBase4GrowEv " Grow__10RArrayBase" -#define CSM_ZN3Mem8CompareCEPKtiS0_i " CompareC__3MemPCUsiT1i" +#define CSM_ZN3Mem8CompareCEPKtiS1_i " CompareC__3MemPCUsiT1i" #define CSM_Z20Des16PanicBadDesTypev " Des16PanicBadDesType__Fv" #define CSM_Z24Des16PanicLengthNegativev " Des16PanicLengthNegative__Fv" #define CSM_Z19Des8PanicBadDesTypev " Des8PanicBadDesType__Fv" -#define CSM_ZN3Mem7CompareEPKtiS0_i " Compare__3MemPCUsiT1i" +#define CSM_ZN3Mem7CompareEPKtiS1_i " Compare__3MemPCUsiT1i" #define CSM_Z23Des8PanicLengthNegativev " Des8PanicLengthNegative__Fv" #define CSM_ZN17RPointerArrayBase4GrowEv " Grow__17RPointerArrayBase" #define CSM_Z28Des16PanicDesIndexOutOfRangev " Des16PanicDesIndexOutOfRange__Fv" -#define CSM_ZN3Mem8CompareFEPKhiS0_i " CompareF__3MemPCUciT1i" +#define CSM_ZN3Mem8CompareFEPKhiS1_i " CompareF__3MemPCUciT1i" #define CSM_Z5Panic9TCdtPanic " Panic__F9TCdtPanic" #define CSM_Z27Des8PanicDesIndexOutOfRangev " Des8PanicDesIndexOutOfRange__Fv" -#define CSM_ZN3Mem8CompareFEPKtiS0_i " CompareF__3MemPCUsiT1i" +#define CSM_ZN3Mem8CompareFEPKtiS1_i " CompareF__3MemPCUsiT1i" #define CSM_Z26Des8PanicMaxLengthNegativev " Des8PanicMaxLengthNegative__Fv" #define CSM_Z25Des8PanicLengthOutOfRangev " Des8PanicLengthOutOfRange__Fv" #define CSM_Z21Des16PanicDesOverflowv " Des16PanicDesOverflow__Fv" @@ -491,7 +491,7 @@ #define CSM_Z18PanicBadArrayIndexv " PanicBadArrayIndex__Fv" #define CSM_Z22Des8PanicPosOutOfRangev " Des8PanicPosOutOfRange__Fv" #define CSM_Z23Des16PanicPosOutOfRangev " Des16PanicPosOutOfRange__Fv" -#define CSM_ZN3Mem8CompareCEPKhiS0_i " CompareC__3MemPCUciT1i" +#define CSM_ZN3Mem8CompareCEPKhiS1_i " CompareC__3MemPCUciT1i" #define CSM_Z22RHeap_PanicBadNextCellv " RHeap_PanicBadNextCell__Fv" #define CSM_Z30PanicEWordMoveSourceNotAlignedv " PanicEWordMoveSourceNotAligned__Fv" #define CSM_Z30PanicEWordMoveTargetNotAlignedv " PanicEWordMoveTargetNotAligned__Fv" @@ -505,18 +505,18 @@ #define CSM_Z26Des16PanicLengthOutOfRangev " __cpp(Des16PanicLengthOutOfRange)" #define CSM_Z20Des8PanicDesOverflowv " __cpp(Des8PanicDesOverflow)" #define CSM_ZN10RArrayBase4GrowEv " __cpp(RArrayBase::Grow)" -#define CSM_ZN3Mem8CompareCEPKtiS0_i " __cpp(static_cast(&Mem::CompareC))" +#define CSM_ZN3Mem8CompareCEPKtiS1_i " __cpp(static_cast(&Mem::CompareC))" #define CSM_Z20Des16PanicBadDesTypev " __cpp(Des16PanicBadDesType)" #define CSM_Z24Des16PanicLengthNegativev " __cpp(Des16PanicLengthNegative)" #define CSM_Z19Des8PanicBadDesTypev " __cpp(Des8PanicBadDesType)" -#define CSM_ZN3Mem7CompareEPKtiS0_i " __cpp(static_cast(&Mem::Compare))" +#define CSM_ZN3Mem7CompareEPKtiS1_i " __cpp(static_cast(&Mem::Compare))" #define CSM_Z23Des8PanicLengthNegativev " __cpp(Des8PanicLengthNegative)" #define CSM_ZN17RPointerArrayBase4GrowEv " __cpp(RPointerArrayBase::Grow)" #define CSM_Z28Des16PanicDesIndexOutOfRangev " __cpp(Des16PanicDesIndexOutOfRange)" -#define CSM_ZN3Mem8CompareFEPKhiS0_i " __cpp(static_cast(&Mem::CompareF))" +#define CSM_ZN3Mem8CompareFEPKhiS1_i " __cpp(static_cast(&Mem::CompareF))" #define CSM_Z5Panic9TCdtPanic " __cpp(Panic)" #define CSM_Z27Des8PanicDesIndexOutOfRangev " __cpp(Des8PanicDesIndexOutOfRange)" -#define CSM_ZN3Mem8CompareFEPKtiS0_i " __cpp(static_cast(&Mem::CompareF))" +#define CSM_ZN3Mem8CompareFEPKtiS1_i " __cpp(static_cast(&Mem::CompareF))" #define CSM_Z26Des8PanicMaxLengthNegativev " __cpp(Des8PanicMaxLengthNegative)" #define CSM_Z25Des8PanicLengthOutOfRangev " __cpp(Des8PanicLengthOutOfRange)" #define CSM_Z21Des16PanicDesOverflowv " __cpp(Des16PanicDesOverflow)" @@ -524,7 +524,7 @@ #define CSM_Z18PanicBadArrayIndexv " __cpp(PanicBadArrayIndex)" #define CSM_Z22Des8PanicPosOutOfRangev " __cpp(Des8PanicPosOutOfRange)" #define CSM_Z23Des16PanicPosOutOfRangev " __cpp(Des16PanicPosOutOfRange)" -#define CSM_ZN3Mem8CompareCEPKhiS0_i " __cpp(static_cast(&Mem::CompareC))" +#define CSM_ZN3Mem8CompareCEPKhiS1_i " __cpp(static_cast(&Mem::CompareC))" #define CSM_Z22RHeap_PanicBadNextCellv " __cpp(RHeap_PanicBadNextCell)" #define CSM_Z30PanicEWordMoveSourceNotAlignedv " __cpp(PanicEWordMoveSourceNotAligned)" #define CSM_Z30PanicEWordMoveTargetNotAlignedv " __cpp(PanicEWordMoveTargetNotAligned)" @@ -537,18 +537,18 @@ #define CSM_Z26Des16PanicLengthOutOfRangev " _Z26Des16PanicLengthOutOfRangev" #define CSM_Z20Des8PanicDesOverflowv " _Z20Des8PanicDesOverflowv" #define CSM_ZN10RArrayBase4GrowEv " _ZN10RArrayBase4GrowEv" -#define CSM_ZN3Mem8CompareCEPKtiS0_i " _ZN3Mem8CompareCEPKtiS0_i" +#define CSM_ZN3Mem8CompareCEPKtiS1_i " _ZN3Mem8CompareCEPKtiS1_i" #define CSM_Z20Des16PanicBadDesTypev " _Z20Des16PanicBadDesTypev" #define CSM_Z24Des16PanicLengthNegativev " _Z24Des16PanicLengthNegativev" #define CSM_Z19Des8PanicBadDesTypev " _Z19Des8PanicBadDesTypev" -#define CSM_ZN3Mem7CompareEPKtiS0_i " _ZN3Mem7CompareEPKtiS0_i" +#define CSM_ZN3Mem7CompareEPKtiS1_i " _ZN3Mem7CompareEPKtiS1_i" #define CSM_Z23Des8PanicLengthNegativev " _Z23Des8PanicLengthNegativev" #define CSM_ZN17RPointerArrayBase4GrowEv " _ZN17RPointerArrayBase4GrowEv" #define CSM_Z28Des16PanicDesIndexOutOfRangev " _Z28Des16PanicDesIndexOutOfRangev" -#define CSM_ZN3Mem8CompareFEPKhiS0_i " _ZN3Mem8CompareFEPKhiS0_i" +#define CSM_ZN3Mem8CompareFEPKhiS1_i " _ZN3Mem8CompareFEPKhiS1_i" #define CSM_Z5Panic9TCdtPanic " _Z5Panic9TCdtPanic" #define CSM_Z27Des8PanicDesIndexOutOfRangev " _Z27Des8PanicDesIndexOutOfRangev" -#define CSM_ZN3Mem8CompareFEPKtiS0_i " _ZN3Mem8CompareFEPKtiS0_i" +#define CSM_ZN3Mem8CompareFEPKtiS1_i " _ZN3Mem8CompareFEPKtiS1_i" #define CSM_Z26Des8PanicMaxLengthNegativev " _Z26Des8PanicMaxLengthNegativev" #define CSM_Z25Des8PanicLengthOutOfRangev " _Z25Des8PanicLengthOutOfRangev" #define CSM_Z21Des16PanicDesOverflowv " _Z21Des16PanicDesOverflowv" @@ -556,7 +556,7 @@ #define CSM_Z18PanicBadArrayIndexv " _Z18PanicBadArrayIndexv" #define CSM_Z22Des8PanicPosOutOfRangev " _Z22Des8PanicPosOutOfRangev" #define CSM_Z23Des16PanicPosOutOfRangev " _Z23Des16PanicPosOutOfRangev" -#define CSM_ZN3Mem8CompareCEPKhiS0_i " _ZN3Mem8CompareCEPKhiS0_i" +#define CSM_ZN3Mem8CompareCEPKhiS1_i " _ZN3Mem8CompareCEPKhiS1_i" #define CSM_Z22RHeap_PanicBadNextCellv " _Z22RHeap_PanicBadNextCellv" #define CSM_Z30PanicEWordMoveSourceNotAlignedv " _Z30PanicEWordMoveSourceNotAlignedv" #define CSM_Z30PanicEWordMoveTargetNotAlignedv " _Z30PanicEWordMoveTargetNotAlignedv"