From 8ad5e6fb26c91d54742b1fae7699dbb107f74298 Mon Sep 17 00:00:00 2001 From: sergei Date: Sun, 23 Mar 2014 02:11:38 +0000 Subject: [PATCH] - RTL: cleaned out FPC_FREEMEM_X. We now have a dedicated compilerproc 'fpc_freemem' for this purpose. git-svn-id: trunk@27232 - --- rtl/arm/arm.inc | 4 +--- rtl/i386/i386.inc | 4 +--- rtl/inc/heap.inc | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/rtl/arm/arm.inc b/rtl/arm/arm.inc index 7f80bec811..f6eeff5251 100644 --- a/rtl/arm/arm.inc +++ b/rtl/arm/arm.inc @@ -505,8 +505,6 @@ end; {$ifndef darwin} {$define FPC_SYSTEM_HAS_ANSISTR_DECR_REF} -function fpc_freemem_x(p:pointer):ptrint; [external name 'FPC_FREEMEM_X']; - Procedure fpc_ansistr_decr_ref (Var S : Pointer); [Public,Alias:'FPC_ANSISTR_DECR_REF'];assembler;nostackframe; compilerproc; asm ldr r1, [r0] @@ -545,7 +543,7 @@ asm // but we need to stay backward compatible with 2.6 sub r0, r0, #12 // Jump without a link, so freemem directly returns to our caller - b FPC_FREEMEM_X + b FPC_FREEMEM end; {$endif not darwin} diff --git a/rtl/i386/i386.inc b/rtl/i386/i386.inc index fd6c840e9d..dacb0d99ff 100644 --- a/rtl/i386/i386.inc +++ b/rtl/i386/i386.inc @@ -1446,8 +1446,6 @@ procedure fpc_cpucodeinit; {$ifdef FPC_HAS_FEATURE_ANSISTRINGS} {$define FPC_SYSTEM_HAS_ANSISTR_DECR_REF} -function fpc_freemem_x(p:pointer):ptrint; [external name 'FPC_FREEMEM_X']; - Procedure fpc_AnsiStr_Decr_Ref (Var S : Pointer); [Public,Alias:'FPC_ANSISTR_DECR_REF']; compilerproc; nostackframe; assembler; asm cmpl $0,(%eax) @@ -1480,7 +1478,7 @@ asm je .Lj3596 .Lj3620: movl %esi,%eax - call FPC_FREEMEM_X + call FPC_FREEMEM .Lj3596: popl %esi .Lquit: diff --git a/rtl/inc/heap.inc b/rtl/inc/heap.inc index 8d816ef074..d9ccb69752 100644 --- a/rtl/inc/heap.inc +++ b/rtl/inc/heap.inc @@ -311,7 +311,7 @@ end; { Delphi style } -function FreeMem(p:pointer):ptruint;[Public,Alias:'FPC_FREEMEM_X']; +function FreeMem(p:pointer):ptruint; begin FreeMem := MemoryManager.FreeMem(p); end;