paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-07 13:47:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

* partly fix for proc of obj=nil

Browse Source
This commit is contained in:
peter 2001-08-05 13:19:51 +00:00
parent 071c6bc59a
commit 8d11d0d6bf
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/i386/n386ld.pas
View File

@ -570,7 +570,7 @@ implementation
LOC_REFERENCE,
LOC_MEM : begin
{ extra handling for ordinal constants }
if (right.nodetype=ordconstn) or
if (right.nodetype in [ordconstn,pointerconstn,niln]) or
(loc=LOC_CREGISTER) then
begin
case left.resulttype.def.size of
@ -586,7 +586,7 @@ implementation
emit_ref_reg(A_MOV,opsize,
newreference(right.location.reference),
left.location.register);
if is_64bitint(right.resulttype.def) then
if left.resulttype.def.size=8 then
begin
r:=newreference(right.location.reference);
inc(r^.offset,4);
@ -599,7 +599,7 @@ implementation
end
else
begin
if is_64bitint(right.resulttype.def) then
if left.resulttype.def.size=8 then
begin
emit_const_ref(A_MOV,opsize,
longint(lo(tordconstnode(right).value)),
@ -1086,8 +1086,8 @@ begin
end.
{
$Log$
Revision 1.16 2001-08-01 21:47:48 peter
* fixed passing of array of record or shortstring to open array
Revision 1.17 2001-08-05 13:19:51 peter
* partly fix for proc of obj=nil
Revision 1.15 2001/07/28 15:13:17 peter
* fixed opsize for assignment with LOC_JUMP

14
compiler/ncnv.pas
View File

@ -931,6 +931,15 @@ implementation
left:=hp;
end;
{ remove typeconv after niln }
if (left.nodetype=niln) then
begin
left.resulttype:=resulttype;
result:=left;
left:=nil;
exit;
end;
{ ordinal contants can be directly converted }
if (left.nodetype=ordconstn) and is_ordinal(resulttype.def) then
begin
@ -1428,7 +1437,10 @@ begin
end.
{
$Log$
Revision 1.30 2001-07-30 20:59:27 peter
Revision 1.31 2001-08-05 13:19:51 peter
* partly fix for proc of obj=nil
Revision 1.30 2001/07/30 20:59:27 peter
* m68k updates from v10 merged
Revision 1.29 2001/07/08 21:00:15 peter