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

* unified the 8-bit and 16-bit alu handling in tshlshrnode.pass_typecheck

Browse Source 
git-svn-id: trunk@27642 -
This commit is contained in:
nickysn 2014-04-23 12:53:31 +00:00
parent 7d8fb1833f
commit a47ab44ec8
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/nmat.pas
View File

@ -641,9 +641,6 @@ implementation
function tshlshrnode.pass_typecheck:tnode;
var
t : tnode;
{$ifdef cpunodefaultint}
nd : tdef;
{$endif cpunodefaultint}
begin
result:=nil;
typecheckpass(left);
@ -673,14 +670,6 @@ implementation
exit;
end;
{$ifdef cpunodefaultint}
{ for small cpus we use the smallest common type }
if (left.resultdef.typ=orddef) and (right.resultdef.typ=orddef) then
nd:=get_common_intdef(torddef(left.resultdef),torddef(right.resultdef),false)
else
nd:=s32inttype;
{$endif cpunodefaultint}
{ calculations for ordinals < 32 bit have to be done in
32 bit for backwards compatibility. That way 'shl 33' is
the same as 'shl 1'. It's ugly but compatible with delphi/tp/gcc }
@ -690,11 +679,9 @@ implementation
{ keep singness of orignal type }
if is_signed(left.resultdef) then
begin
{$if defined(cpunodefaultint)}
inserttypeconv(left,nd)
{$elseif defined(cpu64bitalu) or defined(cpu32bitalu)}
{$if defined(cpu64bitalu) or defined(cpu32bitalu)}
inserttypeconv(left,s32inttype)
{$elseif defined(cpu16bitalu)}
{$elseif defined(cpu16bitalu) or defined(cpu8bitalu)}
inserttypeconv(left,get_common_intdef(torddef(left.resultdef),torddef(sinttype),true));
{$else}
internalerror(2013031301);
@ -702,11 +689,9 @@ implementation
end
else
begin
{$if defined(cpunodefaultint)}
inserttypeconv(left,nd)
{$elseif defined(cpu64bitalu) or defined(cpu32bitalu)}
{$if defined(cpu64bitalu) or defined(cpu32bitalu)}
inserttypeconv(left,u32inttype);
{$elseif defined(cpu16bitalu)}
{$elseif defined(cpu16bitalu) or defined(cpu8bitalu)}
inserttypeconv(left,get_common_intdef(torddef(left.resultdef),torddef(uinttype),true));
{$else}
internalerror(2013031301);
@ -714,11 +699,7 @@ implementation
end
end;
{$ifdef cpunodefaultint}
inserttypeconv(right,nd);
{$else cpunodefaultint}
inserttypeconv(right,sinttype);
{$endif cpunodefaultint}
resultdef:=left.resultdef;