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

* properly handle loading a value from a larger to a smaller subsetreg

Browse Source 
if the source value comes from a bit position > sizeof(smaller subsetreg)
    (fixes internalerror 68991 when compiling fpcompactimg.inc for ppc64)

git-svn-id: trunk@21675 -
This commit is contained in:
Jonas Maebe 2012-06-21 17:05:38 +00:00
parent 48366917f5
commit 512351043c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/hlcgobj.pas
View File

@ -1039,7 +1039,7 @@ implementation
var
fromsubsetregdef,
tosubsetregdef: torddef;
tmpreg: tregister;
tmpreg, tmpreg2: tregister;
bitmask: aword;
stopbit: byte;
begin
@ -1047,12 +1047,22 @@ implementation
begin
fromsubsetregdef:=tcgsize2orddef(fromsreg.subsetregsize);
tosubsetregdef:=tcgsize2orddef(tosreg.subsetregsize);
tmpreg:=getintregister(list,tosubsetregdef);
a_load_reg_reg(list,fromsubsetregdef,tosubsetregdef,fromsreg.subsetreg,tmpreg);
if (fromsreg.startbit<=tosreg.startbit) then
a_op_const_reg(list,OP_SHL,tosubsetregdef,tosreg.startbit-fromsreg.startbit,tmpreg)
begin
{ tosreg may be larger -> use its size to perform the shift }
tmpreg:=getintregister(list,tosubsetregdef);
a_load_reg_reg(list,fromsubsetregdef,tosubsetregdef,fromsreg.subsetreg,tmpreg);
a_op_const_reg(list,OP_SHL,tosubsetregdef,tosreg.startbit-fromsreg.startbit,tmpreg)
end
else
a_op_const_reg(list,OP_SHR,tosubsetregdef,fromsreg.startbit-tosreg.startbit,tmpreg);
begin
{ fromsreg may be larger -> use its size to perform the shift }
tmpreg:=getintregister(list,fromsubsetregdef);
a_op_const_reg_reg(list,OP_SHR,fromsubsetregdef,fromsreg.startbit-tosreg.startbit,fromsreg.subsetreg,tmpreg);
tmpreg2:=getintregister(list,tosubsetregdef);
a_load_reg_reg(list,fromsubsetregdef,tosubsetregdef,tmpreg,tmpreg2);
tmpreg:=tmpreg2;
end;
stopbit:=tosreg.startbit + tosreg.bitlen;
// on x86(64), 1 shl 32(64) = 1 instead of 0
if (stopbit<>AIntBits) then