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

* fixed the return type of FarAddr(), so that it is assignment compatible to

Browse Source 
typed far pointers as well

git-svn-id: trunk@37629 -
This commit is contained in:
nickysn 2017-11-27 19:42:36 +00:00
parent 78e0f6c68b
commit b571f48735
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/i8086/n8086inl.pas
View File

@ -95,7 +95,10 @@ implementation
inserttypeconv_internal(addr_node,u32inttype); inserttypeconv_internal(addr_node,u32inttype);
left:=nil; left:=nil;
result:=caddnode.create(addn,seg_node,addr_node); result:=caddnode.create(addn,seg_node,addr_node);
inserttypeconv_internal(result,tcpupointerdef.getreusablex86(addr_node_resultdef,x86pt_far)); if addr_node_resultdef.typ=pointerdef then
inserttypeconv_internal(result,tcpupointerdef.getreusablex86(tpointerdef(addr_node_resultdef).pointeddef,x86pt_far))
else
inserttypeconv_internal(result,voidfarpointertype);
end; end;
end; end;

22
tests/test/cpu16/i8086/tfaradr1.pp
View File

@ -2,6 +2,9 @@
program tfaradr1; program tfaradr1;
type
PFarInteger = ^Integer; far;
var var
global_variable: Integer; global_variable: Integer;
@ -13,8 +16,16 @@ end;
procedure test_local_variable; procedure test_local_variable;
var var
pfv: FarPointer;
pfi: PFarInteger;
local_variable: Integer; local_variable: Integer;
begin begin
pfv := FarAddr(local_variable);
if pfv <> Ptr(Seg(local_variable), Ofs(local_variable)) then
Fail('local_variable');
pfi := FarAddr(local_variable);
if pfi <> Ptr(Seg(local_variable), Ofs(local_variable)) then
Fail('local_variable');
if FarAddr(local_variable) <> Ptr(Seg(local_variable), Ofs(local_variable)) then if FarAddr(local_variable) <> Ptr(Seg(local_variable), Ofs(local_variable)) then
Fail('local_variable'); Fail('local_variable');
end; end;
@ -25,13 +36,24 @@ begin
end; end;
var var
pfv: FarPointer;
pfi: PFarInteger;
proc_addr: FarPointer; proc_addr: FarPointer;
begin begin
{ test FarAddr(global_variable) }
pfv := FarAddr(global_variable);
if pfv <> Ptr(Seg(global_variable), Ofs(global_variable)) then
Fail('global_variable');
pfi := FarAddr(global_variable);
if pfi <> Ptr(Seg(global_variable), Ofs(global_variable)) then
Fail('global_variable');
if FarAddr(global_variable) <> Ptr(Seg(global_variable), Ofs(global_variable)) then if FarAddr(global_variable) <> Ptr(Seg(global_variable), Ofs(global_variable)) then
Fail('global_variable'); Fail('global_variable');
{ test FarAddr(local_variable) }
test_local_variable; test_local_variable;
{ test FarAddr(proc) }
proc_addr := FarAddr(proc); proc_addr := FarAddr(proc);
if proc_addr <> Ptr(Seg(proc), Ofs(proc)) then if proc_addr <> Ptr(Seg(proc), Ofs(proc)) then
Fail('proc'); Fail('proc');