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

* Fixed tMIPSELtypeconvnode.second_int_to_bool handling of C booleans, webtbs/tw10233 and webtbs/tw17180 now work.

Browse Source 
* Reused applicable code from the above mentioned method in tMIPSELnotnode.second_boolean, it is more efficient in handling 64-bit data.

git-svn-id: trunk@23531 -
This commit is contained in:
sergei 2013-01-28 21:32:21 +00:00
parent b44353777a
commit 5e13334467
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/mips/ncpucnv.pas
View File

@ -282,7 +282,7 @@ begin
cg.a_load_reg_reg(current_asmdata.CurrAsmList,opsize,opsize,left.location.register,hreg2); cg.a_load_reg_reg(current_asmdata.CurrAsmList,opsize,opsize,left.location.register,hreg2);
end; end;
hreg1 := cg.getintregister(current_asmdata.CurrAsmList, opsize); hreg1 := cg.getintregister(current_asmdata.CurrAsmList, opsize);
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_reg(A_SNE, hreg1, hreg2, NR_R0)); current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_reg(A_SLTU, hreg1, NR_R0, hreg2));
end; end;
LOC_JUMP: LOC_JUMP:
begin begin
@ -298,6 +298,10 @@ begin
else else
internalerror(10062); internalerror(10062);
end; end;
{ Now hreg1 is either 0 or 1. For C booleans it must be 0 or -1. }
if is_cbool(resultdef) then
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_NEG,OS_SINT,hreg1,hreg1);
{$ifndef cpu64bitalu} {$ifndef cpu64bitalu}
if (location.size in [OS_64,OS_S64]) then if (location.size in [OS_64,OS_S64]) then
begin begin
@ -314,10 +318,6 @@ begin
{$endif not cpu64bitalu} {$endif not cpu64bitalu}
location.Register := hreg1; location.Register := hreg1;
{zfx
if location.size in [OS_64, OS_S64] then
internalerror(200408241);
}
current_procinfo.CurrTrueLabel := oldtruelabel; current_procinfo.CurrTrueLabel := oldtruelabel;
current_procinfo.CurrFalseLabel := oldfalselabel; current_procinfo.CurrFalseLabel := oldfalselabel;

16
compiler/mips/ncpumat.pas
View File

@ -282,10 +282,6 @@ begin
begin begin
secondpass(left); secondpass(left);
case left.location.loc of case left.location.loc of
LOC_FLAGS:
begin
internalerror(2007011501);
end;
LOC_REGISTER, LOC_CREGISTER, LOC_REFERENCE, LOC_CREFERENCE: LOC_REGISTER, LOC_CREGISTER, LOC_REFERENCE, LOC_CREFERENCE:
begin begin
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);
@ -297,9 +293,13 @@ begin
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_reg(A_OR,r64.reglo,left.location.register64.reglo,left.location.register64.reghi)); current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_reg(A_OR,r64.reglo,left.location.register64.reglo,left.location.register64.reghi));
{ x=0 <=> unsigned(x)<1 } { x=0 <=> unsigned(x)<1 }
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_const(A_SLTIU,r64.reglo,r64.reglo,1)); current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_const(A_SLTIU,r64.reglo,r64.reglo,1));
cg.a_load_const_reg(current_asmdata.CurrAsmList,OS_INT,0,r64.reghi); if is_cbool(resultdef) then
if not is_pasbool(resultdef) then begin
cg64.a_op64_reg_reg(current_asmdata.CurrAsmList,OP_NEG,OS_S64,r64,r64); cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_NEG,OS_S32,r64.reglo,r64.reglo);
cg.a_load_reg_reg(current_asmdata.CurrAsmList,OS_32,OS_32,r64.reglo,r64.reghi);
end
else
cg.a_load_const_reg(current_asmdata.CurrAsmList,OS_32,0,r64.reghi);
location_reset(location,LOC_REGISTER,OS_64); location_reset(location,LOC_REGISTER,OS_64);
location.Register64:=r64; location.Register64:=r64;
end end
@ -308,7 +308,7 @@ begin
tmpreg := cg.GetIntRegister(current_asmdata.CurrAsmList, OS_INT); tmpreg := cg.GetIntRegister(current_asmdata.CurrAsmList, OS_INT);
{ x=0 <=> unsigned(x)<1 } { x=0 <=> unsigned(x)<1 }
current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_const(A_SLTIU, tmpreg, left.location.Register, 1)); current_asmdata.CurrAsmList.concat(taicpu.op_reg_reg_const(A_SLTIU, tmpreg, left.location.Register, 1));
if not is_pasbool(resultdef) then if is_cbool(resultdef) then
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_NEG,OS_S32,tmpreg,tmpreg); cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_NEG,OS_S32,tmpreg,tmpreg);
location_reset(location, LOC_REGISTER, OS_INT); location_reset(location, LOC_REGISTER, OS_INT);
location.Register := tmpreg; location.Register := tmpreg;