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

* Fix browcol.

Browse Source 
- Remove another obsolete uint64 test.

git-svn-id: trunk@7659 -
This commit is contained in:
daniel 2007-06-14 08:33:19 +00:00
parent 0a10f521f6
commit 7934961490
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/browcol.pas
View File

@ -1456,16 +1456,16 @@ end;
constord :
begin
if sym.constdef.typ=enumdef then
Name:=sym.constdef.typesym.name+'('+IntToStr(sym.value.valueord)+')'
Name:=sym.constdef.typesym.name+'('+tostr(sym.value.valueord)+')'
else
if is_boolean(sym.constdef) then
Name:='Longbool('+IntToStr(sym.value.valueord)+')'
Name:='Longbool('+tostr(sym.value.valueord)+')'
else
if is_char(sym.constdef) or
is_widechar(sym.constdef) then
Name:=''''+chr(sym.value.valueord)+''''
Name:=''''+chr(sym.value.valueord.svalue)+''''
else
Name:=IntToStr(sym.value.valueord);
Name:=tostr(sym.value.valueord);
end;
constresourcestring,
conststring :

19
compiler/nadd.pas
View File

@ -2122,18 +2122,10 @@ implementation
function taddnode.try_make_mul32to64: boolean;
function canbe32bitint(v: tconstexprint; fromdef: torddef; todefsigned: boolean): boolean;
function canbe32bitint(v: tconstexprint): boolean;
begin
if (fromdef.ordtype <> u64bit) then
result :=
((v >= 0) or
todefsigned) and
(v >= int64(low(longint))) and
(v <= int64(high(longint)))
else
result :=
(qword(v) >= low(cardinal)) and
(qword(v) <= high(cardinal))
result := ((v >= int64(low(longint))) and (v <= int64(high(longint)))) or
((v >= qword(low(cardinal))) and (v <= qword(high(cardinal))))
end;
var
@ -2142,9 +2134,8 @@ implementation
result := false;
if ((left.nodetype = typeconvn) and
is_integer(ttypeconvnode(left).left.resultdef) and
(not(torddef(ttypeconvnode(left).left.resultdef).ordtype in [u64bit,s64bit])) and
(((right.nodetype = ordconstn) and
canbe32bitint(tordconstnode(right).value,torddef(right.resultdef),is_signed(left.resultdef))) or
(not(torddef(ttypeconvnode(left).left.resultdef).ordtype in [u64bit,s64bit])) and
(((right.nodetype = ordconstn) and canbe32bitint(tordconstnode(right).value)) or
((right.nodetype = typeconvn) and
is_integer(ttypeconvnode(right).left.resultdef) and
not(torddef(ttypeconvnode(right).left.resultdef).ordtype in [u64bit,s64bit])) and