diff options
author | yury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-07-23 09:36:07 +0000 |
---|---|---|
committer | yury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-07-23 09:36:07 +0000 |
commit | 914709ca124eb77a7db1877b7a9b26233bbcbed6 (patch) | |
tree | ca46f2a4fea2508b558de0d7591c5dd785ccfb33 | |
parent | e388ca752f5943f74d78a2c7f58fd65076b43c57 (diff) | |
download | fpc-914709ca124eb77a7db1877b7a9b26233bbcbed6.tar.gz |
* Fixed 'mixed signed/unsigned' and pointer conversion warnings.
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@11439 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | compiler/ncgset.pas | 4 | ||||
-rw-r--r-- | compiler/rgobj.pas | 4 | ||||
-rw-r--r-- | compiler/symdef.pas | 6 | ||||
-rw-r--r-- | compiler/x86/nx86set.pas | 4 | ||||
-rw-r--r-- | compiler/x86/rax86att.pas | 2 | ||||
-rw-r--r-- | compiler/x86/rax86int.pas | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/compiler/ncgset.pas b/compiler/ncgset.pas index 568c9c1bf3..b7bde39aaf 100644 --- a/compiler/ncgset.pas +++ b/compiler/ncgset.pas @@ -428,8 +428,8 @@ implementation ((torddef(left.resultdef).low < int64(tsetdef(right.resultdef).setbase)) or (torddef(left.resultdef).high > int64(tsetdef(right.resultdef).setmax)))) or ((left.resultdef.typ=enumdef) and - ((tenumdef(left.resultdef).min < tsetdef(right.resultdef).setbase) or - (tenumdef(left.resultdef).max > tsetdef(right.resultdef).setmax))) then + ((tenumdef(left.resultdef).min < aint(tsetdef(right.resultdef).setbase)) or + (tenumdef(left.resultdef).max > aint(tsetdef(right.resultdef).setmax)))) then begin current_asmdata.getjumplabel(l); current_asmdata.getjumplabel(l2); diff --git a/compiler/rgobj.pas b/compiler/rgobj.pas index bfdaf03e66..e4359d2bea 100644 --- a/compiler/rgobj.pas +++ b/compiler/rgobj.pas @@ -662,7 +662,7 @@ unit rgobj; if movelist=nil then begin { don't use sizeof(tmovelistheader), because that ignores alignment } - getmem(movelist,ptrint(@movelist^.data)-ptrint(movelist)+60*sizeof(pointer)); + getmem(movelist,ptruint(@movelist^.data)-ptruint(movelist)+60*sizeof(pointer)); movelist^.header.maxcount:=60; movelist^.header.count:=0; movelist^.header.sorted_until:=0; @@ -673,7 +673,7 @@ unit rgobj; begin movelist^.header.maxcount:=movelist^.header.maxcount*2; { don't use sizeof(tmovelistheader), because that ignores alignment } - reallocmem(movelist,ptrint(@movelist^.data)-ptrint(movelist)+movelist^.header.maxcount*sizeof(pointer)); + reallocmem(movelist,ptruint(@movelist^.data)-ptruint(movelist)+movelist^.header.maxcount*sizeof(pointer)); end; end; movelist^.data[movelist^.header.count]:=data; diff --git a/compiler/symdef.pas b/compiler/symdef.pas index 39aec07003..00e79878e9 100644 --- a/compiler/symdef.pas +++ b/compiler/symdef.pas @@ -2316,7 +2316,7 @@ implementation { prevent overflow, return -1 to indicate overflow } { also make sure we don't need 64/128 bit arithmetic to calculate offsets } if (cachedelecount > high(aint)) or - ((high(aint) div cachedelesize) < cachedelecount) or + ((high(aint) div cachedelesize) < aint(cachedelecount)) or { also lowrange*elesize must be < high(aint) to prevent overflow when accessing the array, see ncgmem (PFV) } ((high(aint) div cachedelesize) < abs(lowrange)) then @@ -2326,9 +2326,9 @@ implementation end; if (ado_IsBitPacked in arrayoptions) then - size:=(cachedelesize * cachedelecount + 7) div 8 + size:=(cachedelesize * aint(cachedelecount) + 7) div 8 else - result:=cachedelesize*cachedelecount; + result:=cachedelesize*aint(cachedelecount); end; diff --git a/compiler/x86/nx86set.pas b/compiler/x86/nx86set.pas index c4d4b80014..fa25b2b1e3 100644 --- a/compiler/x86/nx86set.pas +++ b/compiler/x86/nx86set.pas @@ -495,8 +495,8 @@ implementation ((torddef(left.resultdef).low < int64(tsetdef(right.resultdef).setbase)) or (torddef(left.resultdef).high > int64(tsetdef(right.resultdef).setmax)))) or ((left.resultdef.typ=enumdef) and - ((tenumdef(left.resultdef).min < tsetdef(right.resultdef).setbase) or - (tenumdef(left.resultdef).max > tsetdef(right.resultdef).setmax))) then + ((tenumdef(left.resultdef).min < aint(tsetdef(right.resultdef).setbase)) or + (tenumdef(left.resultdef).max > aint(tsetdef(right.resultdef).setmax)))) then begin { we have to check if the value is < 0 or > setmax } diff --git a/compiler/x86/rax86att.pas b/compiler/x86/rax86att.pas index f9ad88d957..33412d1698 100644 --- a/compiler/x86/rax86att.pas +++ b/compiler/x86/rax86att.pas @@ -780,7 +780,7 @@ Implementation { Search opcodes } if len>0 then begin - actopcode:=tasmop(PtrInt(iasmops.Find(copy(s,1,len)))); + actopcode:=tasmop(PtrUInt(iasmops.Find(copy(s,1,len)))); if actopcode<>A_NONE then begin if gas_needsuffix[actopcode]=attsufFPU then diff --git a/compiler/x86/rax86int.pas b/compiler/x86/rax86int.pas index 0034c70ec4..2b547f85eb 100644 --- a/compiler/x86/rax86int.pas +++ b/compiler/x86/rax86int.pas @@ -161,7 +161,7 @@ Unit Rax86int; actopsize:=S_NO; { Search opcodes } - actopcode:=tasmop(PtrInt(iasmops.Find(s))); + actopcode:=tasmop(PtrUInt(iasmops.Find(s))); if actopcode<>A_NONE then begin actasmtoken:=AS_OPCODE; |