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

* m68k/n68kadd.pas, t68kaddnode.second_cmpsmallset:

Browse Source 
respect more location combinations than just LOC_CONSTANT and LOC_REGISTER
* added test

git-svn-id: trunk@22786 -
This commit is contained in:
svenbarth 2012-10-20 19:39:29 +00:00
parent 72a01f17f5
commit f746d9603a
3 changed files with 80 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -9662,6 +9662,7 @@ tests/tbs/tb0582.pp svneol=native#text/pascal
tests/tbs/tb0583.pp svneol=native#text/plain tests/tbs/tb0583.pp svneol=native#text/plain
tests/tbs/tb0583a.pp svneol=native#text/plain tests/tbs/tb0583a.pp svneol=native#text/plain
tests/tbs/tb0584.pp svneol=native#text/pascal tests/tbs/tb0584.pp svneol=native#text/pascal
tests/tbs/tb0585.pp svneol=native#text/pascal
tests/tbs/tb205.pp svneol=native#text/plain tests/tbs/tb205.pp svneol=native#text/plain
tests/tbs/ub0060.pp svneol=native#text/plain tests/tbs/ub0060.pp svneol=native#text/plain
tests/tbs/ub0069.pp svneol=native#text/plain tests/tbs/ub0069.pp svneol=native#text/plain

76
compiler/m68k/n68kadd.pas
View File

@ -217,8 +217,11 @@ implementation
procedure t68kaddnode.second_cmpsmallset; procedure t68kaddnode.second_cmpsmallset;
var var
tmpreg : tregister; leftreg,
rightreg : tregister;
begin begin
pass_left_right;
location_reset(location,LOC_FLAGS,OS_NO); location_reset(location,LOC_FLAGS,OS_NO);
case nodetype of case nodetype of
@ -229,35 +232,60 @@ implementation
end; end;
lten,gten: lten,gten:
begin begin
If (not(nf_swapped in flags) and if (not(nf_swapped in flags) and
(nodetype = lten)) or (nodetype = lten)) or
((nf_swapped in flags) and ((nf_swapped in flags) and
(nodetype = gten)) then (nodetype = gten)) then
swapleftright; swapleftright;
// now we have to check whether left >= right // now we have to check whether left >= right
tmpreg := cg.getintregister(current_asmdata.CurrAsmList,OS_INT);
if left.location.loc = LOC_CONSTANT then // first load right into a register
begin case right.location.loc of
cg.a_op_const_reg_reg(current_asmdata.CurrAsmList,OP_AND,OS_INT, LOC_CONSTANT:
not(left.location.value),right.location.register,tmpreg); begin
current_asmdata.CurrAsmList.concat(taicpu.op_reg(A_TST,S_L,tmpreg)); rightreg:=cg.getintregister(current_asmdata.CurrAsmList,OS_INT);
// the two instructions above should be folded together by cg.a_load_const_reg(current_asmdata.CurrAsmList,OS_INT,
// the peepholeoptimizer aword(right.location.value),rightreg);
end end;
else LOC_REFERENCE:
begin begin
if right.location.loc = LOC_CONSTANT then rightreg:=cg.getintregister(current_asmdata.CurrAsmList,OS_INT);
begin cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_INT,OS_INT,right.location.reference,rightreg);
cg.a_load_const_reg(current_asmdata.CurrAsmList,OS_INT, end;
aword(right.location.value),tmpreg); LOC_REGISTER:
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg(A_AND,S_L, begin
tmpreg,left.location.register)); rightreg:=right.location.register;
end end;
else else
internalerror(2012102001);
end;
// now process left
case left.location.loc of
LOC_CONSTANT:
begin
leftreg:=cg.getintregister(current_asmdata.CurrAsmList,OS_INT);
cg.a_op_const_reg_reg(current_asmdata.CurrAsmList,OP_AND,OS_INT,
not(left.location.value),rightreg,leftreg);
current_asmdata.CurrAsmList.concat(taicpu.op_reg(A_TST,S_L,leftreg));
// the two instructions above should be folded together by
// the peepholeoptimizer
end;
LOC_REFERENCE:
begin
leftreg:=cg.getintregister(current_asmdata.CurrAsmList,OS_INT);
cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_INT,OS_INT,left.location.reference,leftreg);
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg(A_AND,S_L, current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg(A_AND,S_L,
right.location.register,left.location.register)); rightreg,leftreg));
end; end;
// cg.ungetcpuregister(current_asmdata.CurrAsmList,tmpreg); LOC_REGISTER:
begin
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg(A_AND,S_L,
rightreg,left.location.register));
end;
else
internalerror(2012102002);
end;
location.resflags := getresflags(true); location.resflags := getresflags(true);
end; end;
else else

27
tests/tbs/tb0585.pp Normal file
View File

@ -0,0 +1,27 @@
{ %NORUN }
program tb0585;
{$mode objfpc}
type
tobjectoptions = set of (oo_is_external, oo_is_forward, oo_is_formal);
tobjectdef = class
objectoptions: tobjectoptions;
end;
procedure finalize_class_external_status(od: tobjectdef);
begin
if [oo_is_external,oo_is_forward] <= od.objectoptions then
begin
{ formal definition: x = objcclass external; }
exclude(od.objectoptions,oo_is_forward);
include(od.objectoptions,oo_is_formal);
end;
end;
begin
end.