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

* i8086 fixes in tx86typeconvnode.second_int_to_bool; this fixes tcnvint2.pp

Browse Source 
git-svn-id: trunk@24615 -
This commit is contained in:
nickysn 2013-05-25 21:19:55 +00:00
parent 4e2962e6ae
commit f3ad9ce9ce
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
compiler/x86/nx86cnv.pas
View File

@ -89,6 +89,7 @@ implementation
hreg2, hreg2,
hregister : tregister; hregister : tregister;
href : treference; href : treference;
i : integer;
{$endif not cpu64bitalu} {$endif not cpu64bitalu}
resflags : tresflags; resflags : tresflags;
hlabel,oldTrueLabel,oldFalseLabel : tasmlabel; hlabel,oldTrueLabel,oldFalseLabel : tasmlabel;
@ -130,13 +131,16 @@ implementation
LOC_REFERENCE : LOC_REFERENCE :
begin begin
{$ifndef cpu64bitalu} {$ifndef cpu64bitalu}
if left.location.size in [OS_64,OS_S64] then if left.location.size in [OS_64,OS_S64{$ifdef cpu16bitalu},OS_32,OS_S32{$endif}] then
begin begin
hregister:=cg.getintregister(current_asmdata.CurrAsmList,OS_INT); hregister:=cg.getintregister(current_asmdata.CurrAsmList,OS_INT);
cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_32,OS_32,left.location.reference,hregister); cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_INT,OS_INT,left.location.reference,hregister);
href:=left.location.reference; href:=left.location.reference;
inc(href.offset,4); for i:=2 to tcgsize2size[left.location.size] div tcgsize2size[OS_INT] do
cg.a_op_ref_reg(current_asmdata.CurrAsmList,OP_OR,OS_32,href,hregister); begin
inc(href.offset,tcgsize2size[OS_INT]);
cg.a_op_ref_reg(current_asmdata.CurrAsmList,OP_OR,OS_INT,href,hregister);
end;
end end
else else
{$endif not cpu64bitalu} {$endif not cpu64bitalu}
@ -151,7 +155,7 @@ implementation
end; end;
LOC_REGISTER,LOC_CREGISTER : LOC_REGISTER,LOC_CREGISTER :
begin begin
{$ifndef cpu64bitalu} {$if defined(cpu32bitalu)}
if left.location.size in [OS_64,OS_S64] then if left.location.size in [OS_64,OS_S64] then
begin begin
hregister:=cg.getintregister(current_asmdata.CurrAsmList,OS_32); hregister:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
@ -159,7 +163,20 @@ implementation
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_OR,OS_32,left.location.register64.reghi,hregister); cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_OR,OS_32,left.location.register64.reghi,hregister);
end end
else else
{$endif not cpu64bitalu} {$elseif defined(cpu16bitalu)}
if left.location.size in [OS_64,OS_S64] then
begin
hregister:=cg.getintregister(current_asmdata.CurrAsmList,OS_16);
cg.a_load_reg_reg(current_asmdata.CurrAsmList,OS_16,OS_16,left.location.register64.reglo,hregister);
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_OR,OS_16,GetNextReg(left.location.register64.reglo),hregister);
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_OR,OS_16,left.location.register64.reghi,hregister);
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_OR,OS_16,GetNextReg(left.location.register64.reghi),hregister);
end
else
if left.location.size in [OS_32,OS_S32] then
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_OR,OS_16,left.location.register,GetNextReg(left.location.register))
else
{$endif}
cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_OR,left.location.size,left.location.register,left.location.register); cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_OR,left.location.size,left.location.register,left.location.register);
end; end;
LOC_JUMP : LOC_JUMP :