peter 27 лет назад
Родитель
Сommit
19c63e360f
7 измененных файлов с 86 добавлено и 33 удалено
  1. 6 1
      compiler/cg386cnv.pas
  2. 36 7
      compiler/cg386con.pas
  3. 10 4
      compiler/cg386flw.pas
  4. 12 6
      compiler/daopt386.pas
  5. 9 4
      compiler/pdecl.pas
  6. 5 9
      compiler/popt386.pas
  7. 8 2
      compiler/tpexcept.pas

+ 6 - 1
compiler/cg386cnv.pas

@@ -390,8 +390,10 @@ implementation
 
     procedure second_string_string(p,hp : ptree;convtyp : tconverttype);
 
+{$ifdef UseAnsiString}
       var
          pushed : tpushed;
+{$endif UseAnsiString}
 
       begin
 {$ifdef UseAnsiString}
@@ -1205,7 +1207,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.12  1998-08-14 18:18:38  peter
+  Revision 1.13  1998-08-28 10:56:56  peter
+    * removed warnings
+
+  Revision 1.12  1998/08/14 18:18:38  peter
     + dynamic set contruction
     * smallsets are now working (always longint size)
 

+ 36 - 7
compiler/cg386con.pas

@@ -26,6 +26,9 @@ interface
     uses
       tree;
 
+{.$define SMALLSETORD}
+
+
     procedure secondrealconst(var p : ptree);
     procedure secondfixconst(var p : ptree);
     procedure secondordconst(var p : ptree);
@@ -136,7 +139,11 @@ implementation
     procedure secondstringconst(var p : ptree);
       var
          hp1 : pai;
-         lastlabel,l1 : plabel;
+{$ifdef UseAnsiString}
+         l1,
+{$endif}        
+
+         lastlabel : plabel;
          pc : pchar;
          same_string : boolean;
          i : word;
@@ -263,11 +270,29 @@ implementation
 
     procedure secondsetcons(var p : ptree);
       var
-         l : plabel;
-         i : longint;
-         hp : ptree;
-         href,sref : treference;
+         l    : plabel;
+         i    : longint;
+         href : treference;
       begin
+{$ifdef SMALLSETORD}
+        if psetdef(p^.resulttype)^.settype=smallset then
+         begin
+           p^.location.loc:=LOC_MEM;
+           p^.location.reference.isintvalue:=true;
+           p^.location.reference.offset:=p^.constset^[0];
+         end
+        else
+         begin
+           reset_reference(href);
+           getlabel(l);
+           stringdispose(p^.location.reference.symbol);
+           href.symbol:=stringdup(constlabel2str(l,constseta));
+           concat_constlabel(l,constseta);
+           for i:=0 to 31 do
+             consts^.concat(new(pai_const,init_8bit(p^.constset^[i])));
+           p^.location.reference:=href;
+         end;
+{$else}
         reset_reference(href);
         getlabel(l);
         stringdispose(p^.location.reference.symbol);
@@ -284,6 +309,7 @@ implementation
              consts^.concat(new(pai_const,init_8bit(p^.constset^[i])));
          end;
         p^.location.reference:=href;
+{$endif SMALLSETORD}
       end;
 
 
@@ -302,7 +328,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.11  1998-08-14 18:18:39  peter
+  Revision 1.12  1998-08-28 10:56:57  peter
+    * removed warnings
+
+  Revision 1.11  1998/08/14 18:18:39  peter
     + dynamic set contruction
     * smallsets are now working (always longint size)
 
@@ -352,4 +381,4 @@ end.
     * splitted cgi386 a bit (codeseg to large for bp7)
     * nasm, tasm works again. nasm moved to ag386nsm.pas
 
-}
+}

+ 10 - 4
compiler/cg386flw.pas

@@ -560,7 +560,7 @@ do_jmp:
 
       var
          exceptlabel,doexceptlabel,oldendexceptlabel,
-         nextonlabel,lastonlabel : plabel;
+         lastonlabel : plabel;
 
       begin
          { this can be called recursivly }
@@ -621,7 +621,7 @@ do_jmp:
     procedure secondon(var p : ptree);
 
       var
-         nextonlabel,myendexceptlabel : plabel;
+         nextonlabel : plabel;
          ref : treference;
 
       begin
@@ -737,9 +737,15 @@ do_jmp:
 end.
 {
   $Log$
-  Revision 1.11  1998-08-05 16:00:10  florian
+  Revision 1.12  1998-08-28 10:56:58  peter
+    * removed warnings
+
+  Revision 1.11  1998/08/05 16:00:10  florian
     * some fixes for ansi strings
-    * $log$ to $Log$ changed
+    * $log$ to $Log$
+    * $log$ to Revision 1.12  1998-08-28 10:56:58  peter
+    * $log$ to   * removed warnings
+    * $log$ to changed
 
   Revision 1.10  1998/08/04 16:26:26  jonas
     * converted // comment to TP comment

+ 12 - 6
compiler/daopt386.pas

@@ -993,7 +993,10 @@ Function DoDFAPass2(First: Pai): Pai;
  been processed}
 Var
     CurProp: PPaiProp;
-    Cnt, InstrCnt, TmpState: Longint;
+{$ifdef AnalyzeLoops}
+    TmpState,
+{$endif AnalyzeLoops}
+    Cnt, InstrCnt : Longint;
     InstrProp: TAsmInstrucProp;
     p, hp: Pai;
     TmpRef: TReference;
@@ -1154,7 +1157,7 @@ Begin
                       End
 {$ifdef AnalyzeLoops}
                   Else
-                {backward jump, a loop for example}
+{                backward jump, a loop for example}
 {                    If (JmpsProcessed > 0) Or
                        Not(GetLastInstruction(PaiObj, hp) And
                            (hp^.typ = ait_labeled_instruction) And
@@ -1183,10 +1186,10 @@ Begin
                                     End
                                 End;
                         End
-{                      Else
+{                      Else }
 {instruction prior to label is a jmp and no jumps to the label have yet been
  processed}
-                        Begin
+{                        Begin
                           Inc(JmpsProcessed);
                           For TmpReg := R_EAX to R_EDI Do
                             Begin
@@ -1367,7 +1370,7 @@ Function InitDFAPass2(AsmL: PAasmOutput): Boolean;
  cases}
 Var p: Pai;
     Count: Longint;
-    TmpStr: String;
+{    TmpStr: String; }
 Begin
   P := Pai(AsmL^.First);
   NrOfPaiObjs := 1;
@@ -1445,7 +1448,10 @@ End.
 
 {
  $Log$
- Revision 1.7  1998-08-19 16:07:44  jonas
+ Revision 1.8  1998-08-28 10:56:59  peter
+   * removed warnings
+
+ Revision 1.7  1998/08/19 16:07:44  jonas
    * changed optimizer switches + cleanup of DestroyRefs in daopt386.pas
 
  Revision 1.6  1998/08/10 14:49:57  peter

+ 9 - 4
compiler/pdecl.pas

@@ -82,9 +82,11 @@ unit pdecl;
          sym : psym;
          ps : pconstset;
          pd : pbestreal;
-{$ifdef USEANSISTRING}  
+{$ifdef USEANSISTRING}
+
          sp : pstring;
-{$endif USEANSISTRING}  
+{$endif USEANSISTRING}
+
       begin
          consume(_CONST);
          repeat
@@ -952,7 +954,7 @@ unit pdecl;
          hp1        : pdef;
          oldprocsym : Pprocsym;
          oldparse_only : boolean;
-         classnamelabel,rttilabel : plabel;
+         classnamelabel : plabel;
 
       begin
          {Nowadays aktprocsym may already have a value, so we need to save
@@ -1970,7 +1972,10 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.43  1998-08-25 13:09:25  pierre
+  Revision 1.44  1998-08-28 10:57:01  peter
+    * removed warnings
+
+  Revision 1.43  1998/08/25 13:09:25  pierre
     * corrected mangling sheme :
       cvar add Cprefix to the mixed case name whereas
       export or public use direct name

+ 5 - 9
compiler/popt386.pas

@@ -1289,14 +1289,7 @@ end;
 Procedure PeepHoleOptPass2(AsmL: PAasmOutput);
 
 var
-  p,hp1,hp2 : pai;
-  TmpBool1, TmpBool2: Boolean;
-
-  TmpRef: PReference;
-
-{$IfDef RegAlloc}
-  RegsUsed: Set of TRegister;
-{$EndIf RegAlloc}
+  p,hp1 : pai;
 Begin
   P := Pai(AsmL^.First);
   While Assigned(p) Do
@@ -1367,7 +1360,10 @@ End.
 
 {
  $Log$
- Revision 1.10  1998-08-27 15:17:50  florian
+ Revision 1.11  1998-08-28 10:57:02  peter
+   * removed warnings
+
+ Revision 1.10  1998/08/27 15:17:50  florian
    * reinstated Jonas' bugfix
 
  Revision 1.9  1998/08/25 16:58:59  pierre

+ 8 - 2
compiler/tpexcept.pas

@@ -23,7 +23,10 @@
 unit tpexcept;
 interface
 
-{$S-}
+{$ifndef LINUX}
+  {$S-}
+{$endif}
+
 
 type
    jmp_buf = record
@@ -328,7 +331,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.1  1998-08-10 10:18:36  peter
+  Revision 1.2  1998-08-28 10:57:03  peter
+    * removed warnings
+
+  Revision 1.1  1998/08/10 10:18:36  peter
     + Compiler,Comphook unit which are the new interface units to the
       compiler