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

+ default implementation for for the *_checkoverflow() methods in case

Browse Source 
setflags is false
  * don't call the *_checkoverflow() methods from ncgadd with setflags
    = true in case cs_check_overflow is disabled

git-svn-id: branches/jvmbackend@18314 -
This commit is contained in:
Jonas Maebe 2011-08-20 07:38:01 +00:00
parent 4ff56b2471
commit e4d322bcdb
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/hlcgobj.pas
View File

@ -293,8 +293,8 @@ unit hlcgobj;
{ are any processors that support it (JM) } { are any processors that support it (JM) }
procedure a_op_const_reg_reg(list: TAsmList; op: TOpCg; size: tdef; a: aint; src, dst: tregister); virtual; procedure a_op_const_reg_reg(list: TAsmList; op: TOpCg; size: tdef; a: aint; src, dst: tregister); virtual;
procedure a_op_reg_reg_reg(list: TAsmList; op: TOpCg; size: tdef; src1, src2, dst: tregister); virtual; procedure a_op_reg_reg_reg(list: TAsmList; op: TOpCg; size: tdef; src1, src2, dst: tregister); virtual;
procedure a_op_const_reg_reg_checkoverflow(list: TAsmList; op: TOpCg; size: tdef; a: aint; src, dst: tregister;setflags : boolean;var ovloc : tlocation); virtual; abstract; procedure a_op_const_reg_reg_checkoverflow(list: TAsmList; op: TOpCg; size: tdef; a: aint; src, dst: tregister;setflags : boolean;var ovloc : tlocation); virtual;
procedure a_op_reg_reg_reg_checkoverflow(list: TAsmList; op: TOpCg; size: tdef; src1, src2, dst: tregister;setflags : boolean;var ovloc : tlocation); virtual; abstract; procedure a_op_reg_reg_reg_checkoverflow(list: TAsmList; op: TOpCg; size: tdef; src1, src2, dst: tregister;setflags : boolean;var ovloc : tlocation); virtual;
{ comparison operations } { comparison operations }
procedure a_cmp_const_reg_label(list : TAsmList;size : tdef;cmp_op : topcmp;a : aint;reg : tregister; procedure a_cmp_const_reg_label(list : TAsmList;size : tdef;cmp_op : topcmp;a : aint;reg : tregister;
@ -1367,6 +1367,22 @@ implementation
end; end;
end; end;
procedure thlcgobj.a_op_const_reg_reg_checkoverflow(list: TAsmList; op: TOpCg; size: tdef; a: aint; src, dst: tregister; setflags: boolean; var ovloc: tlocation);
begin
if not setflags then
a_op_const_reg_reg(list,op,size,a,src,dst)
else
internalerror(2010122910);
end;
procedure thlcgobj.a_op_reg_reg_reg_checkoverflow(list: TAsmList; op: TOpCg; size: tdef; src1, src2, dst: tregister; setflags: boolean; var ovloc: tlocation);
begin
if not setflags then
a_op_reg_reg_reg(list,op,size,src1,src2,dst)
else
internalerror(2010122911);
end;
procedure thlcgobj.a_cmp_const_reg_label(list: TAsmList; size: tdef; cmp_op: topcmp; a: aint; reg: tregister; l: tasmlabel); procedure thlcgobj.a_cmp_const_reg_label(list: TAsmList; size: tdef; cmp_op: topcmp; a: aint; reg: tregister; l: tasmlabel);
var var
tmpreg: tregister; tmpreg: tregister;

32
compiler/ncgadd.pas
View File

@ -548,7 +548,8 @@ interface
checkoverflow:= checkoverflow:=
checkoverflow and checkoverflow and
(left.resultdef.typ<>pointerdef) and (left.resultdef.typ<>pointerdef) and
(right.resultdef.typ<>pointerdef); (right.resultdef.typ<>pointerdef) and
(cs_check_overflow in current_settings.localswitches);
{$ifdef cpu64bitalu} {$ifdef cpu64bitalu}
case nodetype of case nodetype of
@ -572,12 +573,12 @@ interface
// reg64 - reg64 // reg64 - reg64
hlcg.a_op_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef, hlcg.a_op_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef,
right.location.register,left.location.register,location.register, right.location.register,left.location.register,location.register,
checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc) checkoverflow,ovloc)
else else
// reg64 - const64 // reg64 - const64
hlcg.a_op_const_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef, hlcg.a_op_const_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef,
right.location.value,left.location.register,location.register, right.location.value,left.location.register,location.register,
checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc); checkoverflow,ovloc);
end end
else else
begin begin
@ -585,7 +586,7 @@ interface
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,left.resultdef,true); hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,left.resultdef,true);
hlcg.a_op_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef, hlcg.a_op_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef,
right.location.register,left.location.register,location.register, right.location.register,left.location.register,location.register,
checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc); checkoverflow,ovloc);
end; end;
end; end;
else else
@ -598,11 +599,11 @@ interface
if (right.location.loc = LOC_CONSTANT) then if (right.location.loc = LOC_CONSTANT) then
cg64.a_op64_const_reg_reg_checkoverflow(current_asmdata.CurrAsmList,op,location.size,right.location.value64, cg64.a_op64_const_reg_reg_checkoverflow(current_asmdata.CurrAsmList,op,location.size,right.location.value64,
left.location.register64,location.register64, left.location.register64,location.register64,
checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc) checkoverflow,ovloc)
else else
cg64.a_op64_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,op,location.size,right.location.register64, cg64.a_op64_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,op,location.size,right.location.register64,
left.location.register64,location.register64, left.location.register64,location.register64,
checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc); checkoverflow,ovloc);
end; end;
subn: subn:
begin begin
@ -616,13 +617,13 @@ interface
cg64.a_op64_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,location.size, cg64.a_op64_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,location.size,
right.location.register64,left.location.register64, right.location.register64,left.location.register64,
location.register64, location.register64,
checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc) checkoverflow,ovloc)
else else
// reg64 - const64 // reg64 - const64
cg64.a_op64_const_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,location.size, cg64.a_op64_const_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,location.size,
right.location.value64,left.location.register64, right.location.value64,left.location.register64,
location.register64, location.register64,
checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc) checkoverflow,ovloc)
end end
else else
begin begin
@ -631,7 +632,7 @@ interface
cg64.a_op64_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,location.size, cg64.a_op64_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,location.size,
right.location.register64,left.location.register64, right.location.register64,left.location.register64,
location.register64, location.register64,
checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc); checkoverflow,ovloc);
end; end;
end; end;
else else
@ -739,18 +740,19 @@ interface
checkoverflow:= checkoverflow:=
checkoverflow and checkoverflow and
(left.resultdef.typ<>pointerdef) and (left.resultdef.typ<>pointerdef) and
(right.resultdef.typ<>pointerdef); (right.resultdef.typ<>pointerdef) and
(cs_check_overflow in current_settings.localswitches);
if nodetype<>subn then if nodetype<>subn then
begin begin
if (right.location.loc<>LOC_CONSTANT) then if (right.location.loc<>LOC_CONSTANT) then
hlcg.a_op_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,cgop,resultdef, hlcg.a_op_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,cgop,resultdef,
left.location.register,right.location.register, left.location.register,right.location.register,
location.register,checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc) location.register,checkoverflow,ovloc)
else else
hlcg.a_op_const_reg_reg_checkoverflow(current_asmdata.CurrAsmList,cgop,resultdef, hlcg.a_op_const_reg_reg_checkoverflow(current_asmdata.CurrAsmList,cgop,resultdef,
right.location.value,left.location.register, right.location.value,left.location.register,
location.register,checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc); location.register,checkoverflow,ovloc);
end end
else { subtract is a special case since its not commutative } else { subtract is a special case since its not commutative }
begin begin
@ -761,11 +763,11 @@ interface
if right.location.loc<>LOC_CONSTANT then if right.location.loc<>LOC_CONSTANT then
hlcg.a_op_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef, hlcg.a_op_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef,
right.location.register,left.location.register, right.location.register,left.location.register,
location.register,checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc) location.register,checkoverflow,ovloc)
else else
hlcg.a_op_const_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef, hlcg.a_op_const_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef,
right.location.value,left.location.register, right.location.value,left.location.register,
location.register,checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc); location.register,checkoverflow,ovloc);
end end
else else
begin begin
@ -773,7 +775,7 @@ interface
hlcg.a_load_const_reg(current_asmdata.CurrAsmList,resultdef, hlcg.a_load_const_reg(current_asmdata.CurrAsmList,resultdef,
left.location.value,tmpreg); left.location.value,tmpreg);
hlcg.a_op_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef, hlcg.a_op_reg_reg_reg_checkoverflow(current_asmdata.CurrAsmList,OP_SUB,resultdef,
right.location.register,tmpreg,location.register,checkoverflow and (cs_check_overflow in current_settings.localswitches),ovloc); right.location.register,tmpreg,location.register,checkoverflow,ovloc);
end; end;
end; end;