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

* when doing a pointer comparison on i8086, don't cast a far pointer to a near one (pchar), but use a far one instead

Browse Source 
git-svn-id: trunk@24866 -
This commit is contained in:
nickysn 2013-06-10 20:53:11 +00:00
parent 894d400a7b
commit d387182bd6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/nadd.pas
View File

@ -1618,12 +1618,22 @@ implementation
{ a voidpointer of 8 bytes). A conversion to voidpointer would be }
{ optimized away, since the result already was a voidpointer, so }
{ use a charpointer instead (JM) }
{$ifndef jvm}
inserttypeconv_internal(left,charpointertype);
inserttypeconv_internal(right,charpointertype);
{$else jvm}
{$if defined(jvm)}
inserttypeconv_internal(left,java_jlobject);
inserttypeconv_internal(right,java_jlobject);
{$elseif defined(i8086)}
{ we don't have a charfarpointertype yet, so for far pointers we use bytefarpointertype }
if is_farpointer(left.resultdef) then
inserttypeconv_internal(left,bytefarpointertype)
else
inserttypeconv_internal(left,charpointertype);
if is_farpointer(right.resultdef) then
inserttypeconv_internal(right,bytefarpointertype)
else
inserttypeconv_internal(right,charpointertype);
{$else}
inserttypeconv_internal(left,charpointertype);
inserttypeconv_internal(right,charpointertype);
{$endif jvm}
end;
ltn,lten,gtn,gten: