paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-22 04:09:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed compilation after merge.

Browse Source 
git-svn-id: branches/fixes_3_0@33444 -
This commit is contained in:
yury 2016-04-07 15:47:17 +00:00
parent 9e4fbe1f82
commit b3e34efbf3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/i386/hlcgcpu.pas
View File

@ -29,6 +29,7 @@ unit hlcgcpu;
interface interface
uses uses
globtype,
aasmdata, aasmdata,
symtype,symdef,parabase, symtype,symdef,parabase,
cgbase,cgutils, cgbase,cgutils,
@ -40,7 +41,7 @@ interface
protected protected
procedure gen_loadfpu_loc_cgpara(list: TAsmList; size: tdef; const l: tlocation; const cgpara: tcgpara; locintsize: longint); override; procedure gen_loadfpu_loc_cgpara(list: TAsmList; size: tdef; const l: tlocation; const cgpara: tcgpara; locintsize: longint); override;
public public
function a_call_name(list: TAsmList; pd: tprocdef; const s: TSymStr; const paras: array of pcgpara; forceresdef: tdef; weak: boolean): tcgpara; override; function a_call_name(list: TAsmList; pd: tprocdef; const s: TSymStr; forceresdef: tdef; weak: boolean): tcgpara; override;
procedure g_copyvaluepara_openarray(list: TAsmList; const ref: treference; const lenloc: tlocation; arrdef: tarraydef; destreg: tregister); override; procedure g_copyvaluepara_openarray(list: TAsmList; const ref: treference; const lenloc: tlocation; arrdef: tarraydef; destreg: tregister); override;
procedure g_releasevaluepara_openarray(list: TAsmList; arrdef: tarraydef; const l: tlocation); override; procedure g_releasevaluepara_openarray(list: TAsmList; arrdef: tarraydef; const l: tlocation); override;
end; end;
@ -50,10 +51,10 @@ interface
implementation implementation
uses uses
globals, procinfo, globals, procinfo, symconst,
globtype,verbose, verbose,
fmodule,systems, fmodule,systems,
aasmbase,aasmtai, aasmbase,aasmtai,aasmcpu,
paramgr, paramgr,
cpubase,tgobj,cgobj,cgcpu; cpubase,tgobj,cgobj,cgcpu;
@ -174,7 +175,7 @@ implementation
end; end;
function thlcgcpu.a_call_name(list: TAsmList; pd: tprocdef; const s: TSymStr; const paras: array of pcgpara; forceresdef: tdef; weak: boolean): tcgpara; function thlcgcpu.a_call_name(list: TAsmList; pd: tprocdef; const s: TSymStr; forceresdef: tdef; weak: boolean): tcgpara;
var var
need_got_load: boolean; need_got_load: boolean;
begin begin
@ -191,7 +192,7 @@ implementation
getcpuregister(list, NR_PIC_OFFSET_REG); getcpuregister(list, NR_PIC_OFFSET_REG);
list.concat(taicpu.op_reg_reg(A_MOV,S_L,current_procinfo.got,NR_PIC_OFFSET_REG)); list.concat(taicpu.op_reg_reg(A_MOV,S_L,current_procinfo.got,NR_PIC_OFFSET_REG));
end; end;
Result:=inherited a_call_name(list, pd, s, paras, forceresdef, weak); Result:=inherited a_call_name(list, pd, s, forceresdef, weak);
{ Free EBX } { Free EBX }
if need_got_load then if need_got_load then
ungetcpuregister(list, NR_PIC_OFFSET_REG); ungetcpuregister(list, NR_PIC_OFFSET_REG);