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

* fixed conflict marks

Browse Source
This commit is contained in:
daniel 2003-06-03 15:06:37 +00:00
parent bb651017e8
commit fc90d8ab4b
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compiler/ncgutil.pas
View File

@ -1343,11 +1343,7 @@ implementation
r2.enum:=R_INTREGISTER; r2.enum:=R_INTREGISTER;
r2.number:=NR_FUNCTION_RETURN64_HIGH_REG; r2.number:=NR_FUNCTION_RETURN64_HIGH_REG;
cg.a_reg_alloc(list,r2); cg.a_reg_alloc(list,r2);
<<<<<<< ncgutil.pas cg64.a_load64_ref_reg(list,resloc,joinreg64(r,r2){$ifdef newra},false{$endif});
cg64.a_load64_ref_reg(list,href,joinreg64(r,r2){$ifdef newra},false{$endif});
=======
cg64.a_load64_loc_reg(list,resloc,joinreg64(r,r2));
>>>>>>> 1.117
end end
else else
{$endif cpu64bit} {$endif cpu64bit}
@ -1871,11 +1867,7 @@ implementation
begin begin
r:=rg.getregisterint(list,OS_INT); r:=rg.getregisterint(list,OS_INT);
r2:=rg.getregisterint(list,OS_INT); r2:=rg.getregisterint(list,OS_INT);
<<<<<<< ncgutil.pas cg64.a_load64_ref_reg(list,resloc,joinreg64(r,r2){$ifdef newra},false{$endif});
cg64.a_load64_ref_reg(list,href,joinreg64(r,r2){$ifdef newra},false{$endif});
=======
cg64.a_load64_loc_reg(list,resloc,joinreg64(r,r2));
>>>>>>> 1.117
end end
else else
{$endif cpu64bit} {$endif cpu64bit}
@ -1904,11 +1896,7 @@ implementation
begin begin
r:=rg.getregisterint(list,OS_INT); r:=rg.getregisterint(list,OS_INT);
r2:=rg.getregisterint(list,OS_INT); r2:=rg.getregisterint(list,OS_INT);
<<<<<<< ncgutil.pas cg64.a_load64_ref_reg(list,resloc,joinreg64(r,r2){$ifdef newra},false{$endif});
cg64.a_load64_ref_reg(list,href,joinreg64(r,r2){$ifdef newra},false{$endif});
=======
cg64.a_load64_loc_reg(list,resloc,joinreg64(r,r2));
>>>>>>> 1.117
end end
else else
{$endif cpu64bit} {$endif cpu64bit}
@ -1983,7 +1971,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.118 2003-06-03 13:01:59 daniel Revision 1.119 2003-06-03 15:06:37 daniel
* fixed conflict marks
Revision 1.118 2003/06/03 13:01:59 daniel
* Register allocator finished * Register allocator finished
Revision 1.117 2003/06/02 21:42:05 jonas Revision 1.117 2003/06/02 21:42:05 jonas