* patches from strasbourg

  * objects is not used anymore in the fpc compiled version

compiler/cgi386.pas

@@ -22,7 +22,7 @@
 }
 
 {$ifdef tp}
-{$E+,F+,N+,D+,L+,Y+}
+{$E+,F+,N+,D-,L+,Y+}
 {$endif}
 unit cgi386;
 
@@ -31,7 +31,7 @@ unit cgi386;
 interface
 {***************************************************************************}
 
-uses    objects,verbose,cobjects,systems,globals,tree,
+uses    verbose,cobjects,systems,globals,tree,
         symtable,types,strings,pass_1,hcodegen,
         aasm,i386,tgeni386,files,cgai386
 {$ifdef GDB}
@@ -651,7 +651,7 @@ implementation
 {$ifndef MAKELIB}
                    consts^.insert(new(pai_label,init(lastlabel)));
 {$else MAKELIB}
-                   consts^.insert(new(pai_symbol,init_global('$'+current_module^.unitname^
+                   consts^.insert(new(pai_symbol,init_global('_$'+current_module^.unitname^
                      +'$real_const'+tostr(p^.labnumber))));
                    consts^.insert(new(pai_cut,init));
 {$endif MAKELIB}
@@ -661,7 +661,7 @@ implementation
 {$ifndef MAKELIB}
          p^.location.reference.symbol:=stringdup(lab2str(lastlabel));
 {$else MAKELIB}
-         p^.location.reference.symbol:=stringdup('$'+current_module^.unitname^
+         p^.location.reference.symbol:=stringdup('_$'+current_module^.unitname^
                      +'$real_const'+tostr(p^.labnumber));
 {$endif MAKELIB}
       end;
@@ -752,7 +752,7 @@ implementation
 {$ifndef MAKELIB}
                    consts^.insert(new(pai_label,init(lastlabel)));
 {$else MAKELIB}
-                   consts^.insert(new(pai_symbol,init_global('$'+current_module^.unitname^
+                   consts^.insert(new(pai_symbol,init_global('_$'+current_module^.unitname^
                      +'$string_const'+tostr(p^.labstrnumber))));
                    consts^.insert(new(pai_cut,init));
 {$endif MAKELIB}
@@ -762,7 +762,7 @@ implementation
 {$ifndef MAKELIB}
          p^.location.reference.symbol:=stringdup(lab2str(lastlabel));
 {$else MAKELIB}
-         p^.location.reference.symbol:=stringdup('$'+current_module^.unitname^
+         p^.location.reference.symbol:=stringdup('_$'+current_module^.unitname^
                      +'$string_const'+tostr(p^.labstrnumber));
 {$endif MAKELIB}
          p^.location.loc := LOC_MEM;
@@ -5844,7 +5844,11 @@ do_jmp:
 end.
 {
   $Log$
-  Revision 1.13  1998-04-14 23:27:02  florian
+  Revision 1.14  1998-04-21 10:16:47  peter
+    * patches from strasbourg
+    * objects is not used anymore in the fpc compiled version
+
+  Revision 1.13  1998/04/14 23:27:02  florian
     + exclude/include with constant second parameter added
 
   Revision 1.12  1998/04/13 21:15:41  florian

compiler/cgi3862.pas

@@ -28,7 +28,7 @@ unit cgi3862;
   interface
 
     uses
-       objects,verbose,cobjects,systems,globals,tree,
+       verbose,cobjects,systems,globals,tree,
        symtable,types,strings,pass_1,hcodegen,
        aasm,i386,tgeni386,files,cgai386;
 
@@ -48,12 +48,16 @@ unit cgi3862;
 end.
 {
   $Log$
-  Revision 1.1  1998-03-25 11:18:12  root
-  Initial revision
+  Revision 1.2  1998-04-21 10:16:47  peter
+    * patches from strasbourg
+    * objects is not used anymore in the fpc compiled version
+
+  Revision 1.1.1.1  1998/03/25 11:18:12  root
+  * Restored version
 
   Revision 1.9  1998/03/10 01:17:18  peter
     * all files have the same header
     * messages are fully implemented, EXTDEBUG uses Comment()
     + AG... files for the Assembler generation
 
-}
+}

compiler/files.pas

@@ -208,48 +208,50 @@ unit files;
                                    {  start of machine language      }
 
     const
-       ibloadunit = 1;
-       iborddef = 2;
-       ibpointerdef = 3;
-       ibtypesym = 4;
-       ibarraydef = 5;
-       ibprocdef = 6;
-       ibprocsym = 7;
-       iblinkofile = 8;
-       ibstringdef = 9;
-       ibvarsym = 10;
-       ibconstsym = 11;
-       ibinitunit = 12;
-       ibaufzaehlsym = 13;
+       ibloadunit      = 1;
+       iborddef        = 2;
+       ibpointerdef    = 3;
+       ibtypesym       = 4;
+       ibarraydef      = 5;
+       ibprocdef       = 6;
+       ibprocsym       = 7;
+       iblinkofile     = 8;
+       ibstringdef     = 9;
+       ibvarsym        = 10;
+       ibconstsym      = 11;
+       ibinitunit      = 12;
+       ibaufzaehlsym   = 13;
        ibtypedconstsym = 14;
-       ibrecorddef = 15;
-       ibfiledef = 16;
-       ibformaldef = 17;
-       ibobjectdef = 18;
-       ibenumdef = 19;
-       ibsetdef = 20;
-       ibprocvardef = 21;
-       ibsourcefile = 22;
-       ibdbxcount = 23;
-       ibfloatdef = 24;
-       ibref = 25;
-       ibextsymref = 26;
-       ibextdefref = 27;
-       ibabsolutesym = 28;
-       ibclassrefdef = 29;
-       ibpropertysym = 30;
-       iblibraries = 31;
+       ibrecorddef     = 15;
+       ibfiledef       = 16;
+       ibformaldef     = 17;
+       ibobjectdef     = 18;
+       ibenumdef       = 19;
+       ibsetdef        = 20;
+       ibprocvardef    = 21;
+       ibsourcefile    = 22;
+       ibdbxcount      = 23;
+       ibfloatdef      = 24;
+       ibref           = 25;
+       ibextsymref     = 26;
+       ibextdefref     = 27;
+       ibabsolutesym   = 28;
+       ibclassrefdef   = 29;
+       ibpropertysym   = 30;
+       iblibraries     = 31;
        iblongstringdef = 32;
        ibansistringdef = 33;
-       ibend = 255;
+       ibunitname      = 34;
+       ibend           = 255;
 
        { unit flags }
-       uf_init = 1;
-       uf_uses_dbx = 2;
-       uf_uses_browser = 4;
-       uf_in_library = 8;
-       uf_shared_library = 16;
-       uf_big_endian = 32;
+       uf_init           = $1;
+       uf_uses_dbx       = $2;
+       uf_uses_browser   = $4;
+       uf_in_library     = $8;
+       uf_shared_library = $10;
+       uf_big_endian     = $20;
+       uf_smartlink      = $40;
 
   implementation
 
@@ -696,8 +698,12 @@ unit files;
 end.
 {
   $Log$
-  Revision 1.1  1998-03-25 11:18:12  root
-  Initial revision
+  Revision 1.2  1998-04-21 10:16:47  peter
+    * patches from strasbourg
+    * objects is not used anymore in the fpc compiled version
+
+  Revision 1.1.1.1  1998/03/25 11:18:12  root
+  * Restored version
 
   Revision 1.37  1998/03/13 22:45:58  florian
     * small bug fixes applied

compiler/parser.pas

@@ -33,7 +33,7 @@ unit parser;
   implementation
 
     uses
-       dos,objects,cobjects,globals,scanner,systems,symtable,tree,aasm,
+       dos,cobjects,globals,scanner,systems,symtable,tree,aasm,
        types,strings,pass_1,hcodegen,files,verbose,script,import
 {$ifdef i386}
        ,i386
@@ -530,7 +530,11 @@ done:
 end.
 {
   $Log$
-  Revision 1.5  1998-04-10 14:41:43  peter
+  Revision 1.6  1998-04-21 10:16:48  peter
+    * patches from strasbourg
+    * objects is not used anymore in the fpc compiled version
+
+  Revision 1.5  1998/04/10 14:41:43  peter
     * removed some Hints
     * small speed optimization for AsmLn
 

compiler/pass_1.pas

@@ -35,7 +35,7 @@ unit pass_1;
   implementation
 
      uses
-        objects,cobjects,verbose,systems,globals,aasm,symtable,
+        cobjects,verbose,systems,globals,aasm,symtable,
         types,strings,hcodegen,files
 {$ifdef i386}
         ,i386
@@ -4597,7 +4597,11 @@ unit pass_1;
 end.
 {
   $Log$
-  Revision 1.10  1998-04-14 23:27:03  florian
+  Revision 1.11  1998-04-21 10:16:48  peter
+    * patches from strasbourg
+    * objects is not used anymore in the fpc compiled version
+
+  Revision 1.10  1998/04/14 23:27:03  florian
     + exclude/include with constant second parameter added
 
   Revision 1.9  1998/04/13 21:15:42  florian

compiler/pp.pas

@@ -131,8 +131,10 @@ uses
      ObjMemory,
      PMD, MemCheck,
 {$EndIf}
-
-  dos,objects,cobjects,
+{$ifdef TP}
+  objects,
+{$endif}  
+  dos,cobjects,
   globals,parser,systems,tree,symtable,options,link,import,files,
   verb_def,verbose;
 
@@ -371,7 +373,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.2  1998-04-07 13:19:47  pierre
+  Revision 1.3  1998-04-21 10:16:48  peter
+    * patches from strasbourg
+    * objects is not used anymore in the fpc compiled version
+
+  Revision 1.2  1998/04/07 13:19:47  pierre
     * bugfixes for reset_gdb_info
       in MEM parsing for go32v2
       better external symbol creation

compiler/tree.pas

@@ -29,7 +29,7 @@ unit tree;
   interface
 
     uses
-       objects,globals,symtable,cobjects,verbose,aasm,files
+       globals,symtable,cobjects,verbose,aasm,files
 {$ifdef i386}
        ,i386
 {$endif}
@@ -1160,7 +1160,11 @@ $endif SUPPORT_MMX
 end.
 {
   $Log$
-  Revision 1.2  1998-04-07 22:45:05  florian
+  Revision 1.3  1998-04-21 10:16:49  peter
+    * patches from strasbourg
+    * objects is not used anymore in the fpc compiled version
+
+  Revision 1.2  1998/04/07 22:45:05  florian
     * bug0092, bug0115 and bug0121 fixed
     + packed object/class/array
 

compiler/types.pas

@@ -25,7 +25,7 @@ unit types;
   interface
 
     uses
-       objects,cobjects,globals,symtable,tree,aasm;
+       cobjects,globals,symtable,tree,aasm;
 
     type
        tmmxtype = (mmxno,mmxu8bit,mmxs8bit,mmxu16bit,mmxs16bit,
@@ -925,7 +925,11 @@ unit types;
 end.
 {
   $Log$
-  Revision 1.8  1998-04-12 22:39:44  florian
+  Revision 1.9  1998-04-21 10:16:49  peter
+    * patches from strasbourg
+    * objects is not used anymore in the fpc compiled version
+
+  Revision 1.8  1998/04/12 22:39:44  florian
     * problem with read access to properties solved
     * correct handling of hidding methods via virtual (COM)
     * correct result type of constructor calls (COM), the resulttype