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

M68k: Correctly handle the case of assigning a Boolean expression to a 64-bit Boolean. Fixes tw20889.

Browse Source 
* m68k/n68kcnv.pas, tm68ktypeconvnode.second_int_to_bool:
    Take an inspiration from the x86 code generator and correctly handle assignment of values with a size < 8 to 64-bit Booleans

git-svn-id: trunk@26847 -
This commit is contained in:
svenbarth 2014-02-22 21:27:19 +00:00
parent ae81e0889b
commit 908c0f7293
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
compiler/m68k/n68kcnv.pas
View File

@ -192,8 +192,9 @@ implementation
exit; exit;
end; end;
resflags:=F_NE;
newsize:=def_cgsize(resultdef); newsize:=def_cgsize(resultdef);
location_reset(location,LOC_REGISTER,newsize);
opsize := def_cgsize(left.resultdef); opsize := def_cgsize(left.resultdef);
case left.location.loc of case left.location.loc of
LOC_CREFERENCE,LOC_REFERENCE : LOC_CREFERENCE,LOC_REFERENCE :
@ -234,8 +235,6 @@ implementation
end; end;
// reference_release(current_asmdata.CurrAsmList,left.location.reference); // reference_release(current_asmdata.CurrAsmList,left.location.reference);
end; end;
resflags:=F_NE;
hreg1:=cg.getintregister(current_asmdata.CurrAsmList,newsize);
end; end;
LOC_REGISTER,LOC_CREGISTER : LOC_REGISTER,LOC_CREGISTER :
begin begin
@ -252,12 +251,9 @@ implementation
current_asmdata.CurrAsmList.concat(taicpu.op_reg(A_TST,TCGSize2OpSize[opsize],hreg2)); current_asmdata.CurrAsmList.concat(taicpu.op_reg(A_TST,TCGSize2OpSize[opsize],hreg2));
// cg.ungetcpuregister(current_asmdata.CurrAsmList,hreg2); // cg.ungetcpuregister(current_asmdata.CurrAsmList,hreg2);
end; end;
hreg1:=cg.getintregister(current_asmdata.CurrAsmList,newsize);
resflags:=F_NE;
end; end;
LOC_FLAGS : LOC_FLAGS :
begin begin
hreg1:=cg.getintregister(current_asmdata.CurrAsmList,newsize);
resflags:=left.location.resflags; resflags:=left.location.resflags;
end; end;
LOC_JUMP : LOC_JUMP :
@ -281,10 +277,29 @@ implementation
end; end;
if left.location.loc<>LOC_JUMP then if left.location.loc<>LOC_JUMP then
begin begin
cg.g_flags2reg(current_asmdata.CurrAsmList,location.size,resflags,hreg1); location_reset(location,LOC_REGISTER,newsize);
if (is_cbool(resultdef)) then if newsize in [OS_64,OS_S64] then
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_NEG,location.size,hreg1,hreg1); begin
location.register := hreg1; hreg2:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
cg.g_flags2reg(current_asmdata.CurrAsmList,OS_32,resflags,hreg2);
if (is_cbool(resultdef)) then
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_NEG,OS_32,hreg2,hreg2);
location.register64.reglo:=hreg2;
location.register64.reghi:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
if (is_cbool(resultdef)) then
{ reglo is either 0 or -1 -> reghi has to become the same }
cg.a_load_reg_reg(current_asmdata.CurrAsmList,OS_32,OS_32,location.register64.reglo,location.register64.reghi)
else
{ unsigned }
cg.a_load_const_reg(current_asmdata.CurrAsmList,OS_32,0,location.register64.reghi);
end
else
begin
location.register:=cg.getintregister(current_asmdata.CurrAsmList,newsize);
cg.g_flags2reg(current_asmdata.CurrAsmList,newsize,resflags,location.register);
if (is_cbool(resultdef)) then
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_NEG,newsize,location.register,location.register);
end
end; end;
current_procinfo.CurrTrueLabel:=oldTrueLabel; current_procinfo.CurrTrueLabel:=oldTrueLabel;
current_procinfo.CurrFalseLabel:=oldFalseLabel; current_procinfo.CurrFalseLabel:=oldFalseLabel;