From 451a290caf8b0e83639953236c3129d0c319accf Mon Sep 17 00:00:00 2001 From: yury Date: Wed, 23 Jul 2008 11:17:27 +0000 Subject: [PATCH] * Fixed 'mixed signed/unsigned' and pointer conversion warnings. git-svn-id: trunk@11444 - --- compiler/aopt.pas | 6 +++--- compiler/aoptobj.pas | 4 ++-- compiler/arm/cpupi.pas | 2 +- compiler/arm/raarmgas.pas | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/aopt.pas b/compiler/aopt.pas index 2208875857..9deccda9d5 100644 --- a/compiler/aopt.pas +++ b/compiler/aopt.pas @@ -90,9 +90,9 @@ Unit aopt; (tai_Label(p).labsym.is_used) Then Begin LabelFound := True; - If (tai_Label(p).labsym.labelnr < LowLabel) Then + If (tai_Label(p).labsym.labelnr < aint(LowLabel)) Then LowLabel := tai_Label(p).labsym.labelnr; - If (tai_Label(p).labsym.labelnr > HighLabel) Then + If (tai_Label(p).labsym.labelnr > aint(HighLabel)) Then HighLabel := tai_Label(p).labsym.labelnr End; GetNextInstruction(p, p) @@ -127,7 +127,7 @@ Unit aopt; (tai_Label(p).labsym.labeltype=alt_jump) then begin LabelIdx:=tai_label(p).labsym.labelnr-LowLabel; - if LabelIdx>LabelDif then + if LabelIdx>aint(LabelDif) then internalerror(200604202); LabelTable^[LabelIdx].PaiObj := p; end; diff --git a/compiler/aoptobj.pas b/compiler/aoptobj.pas index fd3e08e4ce..33ca522e55 100644 --- a/compiler/aoptobj.pas +++ b/compiler/aoptobj.pas @@ -884,8 +884,8 @@ Unit AoptObj; {$endif} function tAOptObj.getlabelwithsym(sym: tasmlabel): tai; begin - if (sym.labelnr >= labelinfo^.lowlabel) and - (sym.labelnr <= labelinfo^.highlabel) then { range check, a jump can go past an assembler block! } + if (sym.labelnr >= aint(labelinfo^.lowlabel)) and + (sym.labelnr <= aint(labelinfo^.highlabel)) then { range check, a jump can go past an assembler block! } getlabelwithsym := labelinfo^.labeltable^[sym.labelnr-labelinfo^.lowlabel].paiobj else getlabelwithsym := nil; diff --git a/compiler/arm/cpupi.pas b/compiler/arm/cpupi.pas index ef02d5063a..ff9e569e6b 100644 --- a/compiler/arm/cpupi.pas +++ b/compiler/arm/cpupi.pas @@ -90,7 +90,7 @@ unit cpupi; else floatsavesize:=0; floatsavesize:=align(floatsavesize,max(current_settings.alignment.localalignmin,4)); - result:=Align(tg.direction*tg.lasttemp,max(current_settings.alignment.localalignmin,4))+maxpushedparasize+floatsavesize; + result:=Align(tg.direction*tg.lasttemp,max(current_settings.alignment.localalignmin,4))+maxpushedparasize+aint(floatsavesize); floatregstart:=tg.direction*result+maxpushedparasize; if tg.direction=1 then dec(floatregstart,floatsavesize); diff --git a/compiler/arm/raarmgas.pas b/compiler/arm/raarmgas.pas index 010f818a65..81309382bd 100644 --- a/compiler/arm/raarmgas.pas +++ b/compiler/arm/raarmgas.pas @@ -959,7 +959,7 @@ Unit raarmgas; actopcode:=A_NONE; for j:=maxlen downto 1 do begin - actopcode:=tasmop(PtrInt(iasmops.Find(copy(hs,1,j)))); + actopcode:=tasmop(PtrUInt(iasmops.Find(copy(hs,1,j)))); if actopcode<>A_NONE then begin actasmtoken:=AS_OPCODE;