Browse Source

* some range check bugs fixed (still not working !)
+ added DLL writing support for win32 (also accepts variables)
+ TempAnsi for code that could be used for Temporary ansi strings
handling

pierre 27 years ago
parent
commit
a1f1003555

+ 8 - 2
compiler/aasm.pas

@@ -167,7 +167,7 @@ unit aasm;
        end;
 
 
-       tsection=(sec_none,sec_code,sec_data,sec_bss,sec_idata);
+       tsection=(sec_none,sec_code,sec_data,sec_bss,sec_idata,sec_edata);
 
        { Insert a section/segment directive }
        pai_section = ^tai_section;
@@ -913,7 +913,13 @@ uses
 end.
 {
   $Log$
-  Revision 1.24  1998-11-12 11:19:30  pierre
+  Revision 1.25  1998-11-30 09:42:52  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.24  1998/11/12 11:19:30  pierre
    * fix for first line of function break
 
   Revision 1.23  1998/10/14 15:56:37  pierre

+ 8 - 2
compiler/ag386int.pas

@@ -244,7 +244,7 @@ unit ag386int;
         (#9'DD'#9,#9'DW'#9,#9'DB'#9);
 
       ait_section2masmstr : array[tsection] of string[6]=
-       ('','CODE','DATA','BSS','');
+       ('','CODE','DATA','BSS','','');
 
 
     Function PadTabs(p:pchar;addch:char):string;
@@ -592,7 +592,13 @@ ait_stab_function_name : ;
 end.
 {
   $Log$
-  Revision 1.20  1998-11-17 00:26:09  peter
+  Revision 1.21  1998-11-30 09:42:55  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.20  1998/11/17 00:26:09  peter
     * fixed for $H+
 
   Revision 1.19  1998/11/16 12:38:05  jonas

+ 8 - 2
compiler/ag386nsm.pas

@@ -250,7 +250,7 @@ unit ag386nsm;
         (#9'DD'#9,#9'DW'#9,#9'DB'#9);
 
       ait_section2nasmstr : array[tsection] of string[6]=
-       ('','.text','.data','.bss','.idata');
+       ('','.text','.data','.bss','.idata','.edata');
 
     Function PadTabs(p:pchar;addch:char):string;
     var
@@ -582,7 +582,13 @@ ait_stab_function_name : ;
 end.
 {
   $Log$
-  Revision 1.13  1998-11-17 00:26:10  peter
+  Revision 1.14  1998-11-30 09:42:56  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.13  1998/11/17 00:26:10  peter
     * fixed for $H+
 
   Revision 1.12  1998/11/12 11:19:34  pierre

+ 8 - 2
compiler/ag68kmit.pas

@@ -255,7 +255,7 @@ unit ag68kmit;
         (#9'.long'#9,#9'.short'#9,#9'.byte'#9);
 
       ait_section2str : array[tsection] of string[6]=
-       ('','.text','.data','.bss','.idata');
+       ('','.text','.data','.bss','.idata','.edata');
 
     procedure tm68kmitasmlist.WriteTree(p:paasmoutput);
     var
@@ -661,7 +661,13 @@ ait_stab_function_name : funcname:=pai_stab_function_name(hp)^.str;
 end.
 {
   $Log$
-  Revision 1.16  1998-11-12 11:19:36  pierre
+  Revision 1.17  1998-11-30 09:42:57  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.16  1998/11/12 11:19:36  pierre
    * fix for first line of function break
 
   Revision 1.15  1998/10/29 11:35:37  florian

+ 8 - 2
compiler/ag68kmot.pas

@@ -246,7 +246,7 @@ unit ag68kmot;
 
     const
       section2str : array[tsection] of string[6]=
-       ('','CODE','DATA','BSS','');
+       ('','CODE','DATA','BSS','','');
 
     procedure tm68kmotasmlist.WriteTree(p:paasmoutput);
     var
@@ -541,7 +541,13 @@ ait_labeled_instruction :
 end.
 {
   $Log$
-  Revision 1.14  1998-11-12 11:19:38  pierre
+  Revision 1.15  1998-11-30 09:42:58  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.14  1998/11/12 11:19:38  pierre
    * fix for first line of function break
 
   Revision 1.13  1998/10/29 11:35:38  florian

+ 9 - 3
compiler/cg386add.pas

@@ -167,8 +167,8 @@ implementation
                         ungetiftemp(p^.left^.location.reference);
                         ungetiftemp(p^.right^.location.reference);
                         reset_reference(hr);
-                        gettempofsizereference(4,hr);
-                        temptoremove^.concat(new(ptemptodestroy,init(hr,p^.resulttype)));
+                        gettempansistringreference(hr);
+                        {temptoremove^.concat(new(ptemptodestroy,init(hr,p^.resulttype)));}
                         exprasmlist^.concat(new(pai386,op_reg_ref(A_MOV,S_L,p^.location.register,
                           newreference(hr))));
                      end;
@@ -1387,7 +1387,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.30  1998-11-24 12:52:40  peter
+  Revision 1.31  1998-11-30 09:42:59  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.30  1998/11/24 12:52:40  peter
     * sets are not written twice anymore
     * optimize for emptyset+single element which uses a new routine from
       set.inc FPC_SET_CREATE_ELEMENT

+ 9 - 3
compiler/cg386cal.pas

@@ -1421,8 +1421,8 @@ implementation
                        if is_ansistring(p^.resulttype) or
                          is_widestring(p^.resulttype) then
                          begin
-                            gettempofsizereference(4,hr);
-                            temptoremove^.concat(new(ptemptodestroy,init(hr,p^.resulttype)));
+                            gettempansistringreference(hr);
+                            {temptoremove^.concat(new(ptemptodestroy,init(hr,p^.resulttype)));}
                             exprasmlist^.concat(new(pai386,op_reg_ref(A_MOV,S_L,p^.location.register,
                               newreference(hr))));
                          end;
@@ -1590,7 +1590,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.48  1998-11-27 14:50:30  peter
+  Revision 1.49  1998-11-30 09:43:00  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.48  1998/11/27 14:50:30  peter
     + open strings, $P switch support
 
   Revision 1.47  1998/11/26 21:30:03  peter

+ 33 - 3
compiler/cg386cnv.pas

@@ -222,6 +222,8 @@ implementation
                 begin
                    hp:=new_reference(R_NO,0);
                    hp^.symbol:=stringdup(porddef(p1)^.getrangecheckstring);
+                   { second part here !! }
+                   hp^.offset:=8;
                    emitl(A_JMP,poslabel);
                    emitl(A_LABEL,neglabel);
                    exprasmlist^.concat(new(pai386,op_reg_ref(A_BOUND,S_L,hregister,hp)));
@@ -475,7 +477,7 @@ implementation
            clear_location(pto^.location);
            pto^.location.loc:=LOC_REGISTER;
            pto^.location.register:=hregister;
-           maybe_rangechecking(pto,pfrom^.resulttype,pto^.resulttype);
+           maybe_rangechecking(pfrom,pfrom^.resulttype,pto^.resulttype);
        end;
 
 {$endif}
@@ -493,7 +495,11 @@ implementation
                  st_shortstring:
                    begin
                       stringdispose(pto^.location.reference.symbol);
+{$ifdef TempAnsi}
+                      gettempansistringreference(pto^.location.reference);
+{$else : not TempAnsi}
                       gettempofsizereference(pto^.resulttype^.size,pto^.location.reference);
+{$endif : not TempAnsi}
                       del_reference(pfrom^.location.reference);
                       copyshortstring(pto^.location.reference,pfrom^.location.reference,
                         pstringdef(pto^.resulttype)^.len,false);
@@ -506,8 +512,14 @@ implementation
                    end;
                  st_ansistring:
                    begin
+{$ifdef TempAnsi}
+                      clear_reference(pto^.location.reference);
+                      gettempansistringreference(pto^.location.reference);
+                      loadansi2short(pfrom,pto);
+{$else : not TempAnsi}
                       gettempofsizereference(pto^.resulttype^.size,pto^.location.reference);
                       loadansi2short(pfrom,pto);
+{$endif : not TempAnsi}
                    end;
                  st_widestring:
                    begin
@@ -539,7 +551,14 @@ implementation
               case pstringdef(pfrom^.resulttype)^.string_typ of
                  st_shortstring:
                    begin
+                      clear_location(pto^.location);
+                      pto^.location.loc:=LOC_REFERENCE;
+                      clear_reference(pto^.location.reference);
+{$ifdef TempAnsi}
+                      gettempansistringreference(pto^.location.reference);
+{$else : not TempAnsi}
                       gettempofsizereference(pto^.resulttype^.size,pto^.location.reference);
+{$endif : not TempAnsi}
                       exprasmlist^.concat(new(pai386,op_const_ref(A_MOV,S_L,0,newreference(pto^.location.reference))));
                       pushusedregisters(pushed,$ff);
                       emit_push_lea_loc(pfrom^.location);
@@ -547,6 +566,7 @@ implementation
                       emitcall('FPC_SHORTSTR_TO_ANSISTR',true);
                       maybe_loadesi;
                       popusedregisters(pushed);
+                      ungetiftemp(pfrom^.location.reference);
                    end;
                  st_longstring:
                    begin
@@ -736,7 +756,11 @@ implementation
              end;
            st_ansistring :
              begin
+{$ifdef TempAnsi}
+               gettempansistringreference(p^.location.reference);
+{$else not TempAnsi}
                gettempofsizereference(4,pto^.location.reference);
+{$endif not TempAnsi}
                {temptoremove^.concat(new(ptemptodestroy,init(pto^.location.reference,pto^.resulttype)));}
                exprasmlist^.concat(new(pai386,op_const_ref(A_MOV,S_L,0,newreference(pto^.location.reference))));
                pushusedregisters(pushed,$ff);
@@ -914,7 +938,7 @@ implementation
          exprasmlist^.concat(new(pai386,op_const_reg(A_ADD,S_W,1007,R_DX)));
          exprasmlist^.concat(new(pai386,op_const_reg(A_SHL,S_W,5,R_DX)));
          exprasmlist^.concat(new(pai386,op_const_reg_reg(A_SHLD,S_W,11,R_DX,R_BX)));
-         exprasmlist^.concat(new(pai386,op_const_reg_reg(A_SHLD,S_W,20,R_EAX,R_EBX)));
+         exprasmlist^.concat(new(pai386,op_const_reg_reg(A_SHLD,S_L,20,R_EAX,R_EBX)));
 
          exprasmlist^.concat(new(pai386,op_const_reg(A_SHL,S_L,20,R_EAX)));
          emitl(A_LABEL,hl);
@@ -1449,7 +1473,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.39  1998-11-29 22:37:30  peter
+  Revision 1.40  1998-11-30 09:43:02  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.39  1998/11/29 22:37:30  peter
     * fixed constant ansistring -> pchar
 
   Revision 1.38  1998/11/29 12:40:19  peter

+ 40 - 1
compiler/cg386flw.pas

@@ -203,14 +203,45 @@ implementation
          { only calculate reference }
          cleartempgen;
          secondpass(p^.t2);
+{$ifdef TEST_FORBUG}
+         hs:=p^.t2^.resulttype^.size;
+         (*
+{$endif TEST_FORBUG}
          if not(simple_loadn) then
           CGMessage(cg_e_illegal_count_var);
+{$ifdef TEST_FORBUG}
+         already done in firstfor !! *)
+         
+         { first set the to value
+           because the count var can be in the expression !! }
+         cleartempgen;
+         secondpass(p^.right);
+         { calculate pointer value and check if changeable and if so }
+         { load into temporary variable                              }
+         if p^.right^.treetype<>ordconstn then
+           begin
+              temp1.symbol:=nil;
+              gettempofsizereference(hs,temp1);
+              temptovalue:=true;
+              if (p^.right^.location.loc=LOC_REGISTER) or
+                 (p^.right^.location.loc=LOC_CREGISTER) then
+                begin
+                   exprasmlist^.concat(new(pai386,op_reg_ref(A_MOV,opsize,p^.right^.location.register,
+                      newreference(temp1))));
+                 end
+              else
+                 concatcopy(p^.right^.location.reference,temp1,hs,false,false);
+           end
+         else temptovalue:=false;
+{$endif TEST_FORBUG}
 
          { produce start assignment }
          cleartempgen;
          secondpass(p^.left);
          count_var_is_signed:=is_signed(porddef(p^.t2^.resulttype));
+{$ifndef TEST_FORBUG}
              hs:=p^.t2^.resulttype^.size;
+{$endif not TEST_FORBUG}
          cmp32:=getregister32;
              case hs of
             1 : begin
@@ -226,6 +257,7 @@ implementation
                    cmpreg:=cmp32;
                 end;
          end;
+{$ifndef TEST_FORBUG}
          cleartempgen;
              secondpass(p^.right);
          { calculate pointer value and check if changeable and if so }
@@ -246,6 +278,7 @@ implementation
            end
          else temptovalue:=false;
 
+{$endif not TEST_FORBUG}
          if temptovalue then
              begin
               if p^.t2^.location.loc=LOC_CREGISTER then
@@ -754,7 +787,13 @@ do_jmp:
 end.
 {
   $Log$
-  Revision 1.24  1998-11-18 15:44:09  peter
+  Revision 1.25  1998-11-30 09:43:03  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.24  1998/11/18 15:44:09  peter
     * VALUEPARA for tp7 compatible value parameters
 
   Revision 1.23  1998/11/12 16:43:32  florian

+ 8 - 2
compiler/cg386ld.pas

@@ -360,7 +360,7 @@ implementation
                   if is_ansistring(p^.right^.resulttype) then
                     begin
                       if (p^.right^.treetype=stringconstn) and
-                         (p^.length=0) then
+                         (p^.right^.length=0) then
                         exprasmlist^.concat(new(pai386,op_const_ref(A_MOV,S_B,
                           0,newreference(p^.left^.location.reference))))
                       else
@@ -692,7 +692,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.34  1998-11-28 16:20:48  peter
+  Revision 1.35  1998-11-30 09:43:04  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.34  1998/11/28 16:20:48  peter
     + support for dll variables
 
   Revision 1.33  1998/11/27 14:50:33  peter

+ 13 - 1
compiler/cga68k.pas

@@ -129,6 +129,12 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
       end;
 
 
+    procedure decransiref(const ref : treference);
+      begin
+         emitpushreferenceaddr(exprasmlist,ref);
+         emitcall('FPC_ANSISTR_DECR_REF',true);
+      end;
+      
     procedure loadstring(p:ptree);
       begin
         case p^.right^.resulttype^.deftype of
@@ -1351,7 +1357,13 @@ end;
 end.
 {
   $Log$
-  Revision 1.29  1998-11-13 15:40:16  pierre
+  Revision 1.30  1998-11-30 09:43:05  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.29  1998/11/13 15:40:16  pierre
     + added -Se in Makefile cvstest target
     + lexlevel cleanup
       normal_function_level main_program_level and unit_init_level defined

+ 25 - 9
compiler/export.pas

@@ -26,9 +26,15 @@ interface
 uses
   cobjects,symtable;
 
+const
+       { export options }
+       eo_resident = $1;
+       eo_index    = $2;
+       eo_name     = $4;
+   
 type
-   pexported_procedure = ^texported_procedure;
-   texported_procedure = object(tlinkedlist_item)
+   pexported_item = ^texported_item;
+   texported_item = object(tlinkedlist_item)
       sym : psym;
       index : longint;
       name : pstring;
@@ -42,7 +48,8 @@ type
       constructor Init;
       destructor Done;
       procedure preparelib(const s : string);virtual;
-      procedure exportprocedure(hp : pexported_procedure);virtual;
+      procedure exportprocedure(hp : pexported_item);virtual;
+      procedure exportvar(hp : pexported_item);virtual;
       procedure generatelib;virtual;
    end;
 
@@ -67,7 +74,7 @@ uses
                            TImported_procedure
 ****************************************************************************}
 
-constructor texported_procedure.init;
+constructor texported_item.init;
 begin
   inherited init;
   sym:=nil;
@@ -77,7 +84,7 @@ begin
 end;
 
 
-destructor texported_procedure.done;
+destructor texported_item.done;
 begin
   stringdispose(name);
   inherited done;
@@ -103,12 +110,15 @@ begin
   Message(exec_e_dll_not_supported);
 end;
 
-
-procedure texportlib.exportprocedure(hp : pexported_procedure);
+procedure texportlib.exportprocedure(hp : pexported_item);
 begin
-    current_module^._exports^.concat(hp);
+  Message(exec_e_dll_not_supported);
 end;
 
+procedure texportlib.exportvar(hp : pexported_item);
+begin
+  Message(exec_e_dll_not_supported);
+end;
 
 procedure texportlib.generatelib;
 begin
@@ -150,7 +160,13 @@ end;
 end.
 {
   $Log$
-  Revision 1.3  1998-11-16 11:28:57  pierre
+  Revision 1.4  1998-11-30 09:43:09  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.3  1998/11/16 11:28:57  pierre
     * stackcheck removed for i386_win32
     * exportlist does not crash at least !!
       (was need for tests dir !)z

+ 40 - 13
compiler/link.pas

@@ -281,11 +281,14 @@ begin
   prtobj:='prt0';
   case target_info.target of
    target_m68k_Palmos,
-   target_i386_Win32 :
-     begin
-       prtobj:='';
-     end;
-
+{* Changes made by Ozerski 27.10.1998}
+   target_i386_Win32 :begin
+                       if DLLsource then
+                        prtobj:='wdllprt0'
+                       else
+                        prtobj:='wprt0';
+                      end;
+{* End changes}
    target_m68k_linux,
    target_i386_linux :
      begin
@@ -388,6 +391,9 @@ var
   bindfound  : boolean;
   s          : string;
   success    : boolean;
+{* Changes made by Ozerski 27.10.1998}
+  ii:longint;
+{* end changes}
 begin
 {$ifdef linux}
   if LinkToC then
@@ -406,15 +412,28 @@ begin
   if not(cs_link_extern in aktglobalswitches) then
    Message1(exec_i_linking,current_module^.exefilename^);
   s:=target_link.linkcmd;
-  Replace(s,'$EXE',current_module^.exefilename^);
+{* Changes made by Ozerski 27.10.1998}
+  if DLLsource then
+   Replace(s,'$EXE',current_module^.sharedlibfilename^)
+  else
+   Replace(s,'$EXE',current_module^.exefilename^);
+{* end changes}
   Replace(s,'$OPT',LinkOptions);
   Replace(s,'$RES',inputdir+LinkResName);
   success:=DoExec(FindLinker,s,true,false);
 {Bind}
-  if target_link.bindbin<>'' then
+{* Changes made by Ozerski 27.10.1998}
+  if target_link.bindbin[1]<>'' then
+   for ii:=1 to target_link.binders do
    begin
-     s:=target_link.bindcmd;
-     Replace(s,'$EXE',current_module^.exefilename^);
+     s:=target_link.bindcmd[ii];
+     Replace(s,'$OPT',LinkOptions);
+     Replace(s,'$RES',inputdir+LinkResName);
+     if DLLsource then
+      Replace(s,'$EXE',current_module^.sharedlibfilename^)
+     else
+      Replace(s,'$EXE',current_module^.exefilename^);
+{* end changes}
      {Size of the heap when an EMX program runs in OS/2.}
      Replace(s,'$HEAPMB',tostr((maxheapsize+1048575) shr 20));
      {Size of the stack when an EMX program runs in OS/2.}
@@ -422,13 +441,15 @@ begin
      {When an EMX program runs in DOS, the heap and stack share the
       same memory pool. The heap grows upwards, the stack grows downwards.}
      Replace(s,'$DOSHEAPKB',tostr((stacksize+maxheapsize+1023) shr 10));
+{* Changes made by Ozerski 27.10.1998}
      if utilsdirectory<>'' then
        begin
-          bindbin:=Search(target_link.bindbin+source_os.exeext,
-            utilsdirectory,bindfound)+target_link.bindbin+source_os.exeext;
+          bindbin:=Search(target_link.bindbin[ii]+source_os.exeext,
+            utilsdirectory,bindfound)+target_link.bindbin[ii]+source_os.exeext;
        end
      else
-       bindbin:=FindExe(target_link.bindbin,bindfound);
+       bindbin:=FindExe(target_link.bindbin[ii],bindfound);
+{* end changes}
      if (not bindfound) and not (cs_link_extern in aktglobalswitches) then
       begin
         Message1(exec_w_binder_not_found,bindbin);
@@ -514,7 +535,13 @@ end;
 end.
 {
   $Log$
-  Revision 1.37  1998-10-26 22:23:31  peter
+  Revision 1.38  1998-11-30 09:43:13  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.37  1998/10/26 22:23:31  peter
     + fixpath() has an extra option to allow a ./ as path
 
   Revision 1.36  1998/10/22 15:18:44  florian

+ 3 - 0
compiler/msgidx.inc

@@ -62,6 +62,9 @@ type tmsgconst=(
   parser_w_proc_near_ignored,
   parser_w_proc_register_ignored,
   parser_e_no_dll_file_specified,
+  parser_e_export_name_double,
+  parser_e_export_ordinal_double,
+  parser_e_export_invalid_index,
   parser_e_constructorname_must_be_init,
   parser_e_destructorname_must_be_done,
   parser_e_illegal_open_parameter,

+ 186 - 184
compiler/msgtxt.inc

@@ -1,4 +1,4 @@
-const msgtxt : array[0..00094,1..240] of char=(
+const msgtxt : array[0..00095,1..240] of char=(
   'T_Compiler: $1'#000+
   'D_Source OS: $1'#000+
   'I_Target OS: $1'#000+
@@ -62,385 +62,387 @@ const msgtxt : array[0..00094,1..240] of char=(
   'W_Procedure type NEAR ignored'#000+
   'W_Procedure type REGISTER ignored'#000+
   'E_No DLL File specified'#000+
+  'E_DLL exported function names cannot be double $1'#000+
+  'E_DL','L exported function indexes cannot be double $1'#000+
+  'E_Invalid index for DLL exported function'#000+
   'E_Constructor name must be INIT'#000+
-  'E_Destructor name must',' be DONE'#000+
+  'E_Destructor name must be DONE'#000+
   'E_Illegal open parameter'#000+
   'E_Procedure type INLINE not supported'#000+
-  'W_Private methods shouldn'#039't be VIRTUAL'#000+
+  'W_Private methods should','n'#039't be VIRTUAL'#000+
   'W_Constructor should be public'#000+
   'W_Destructor should be public'#000+
   'N_Class should have one destructor only'#000+
-  'E_Local class definitions ar','e not allowed'#000+
+  'E_Local class definitions are not allowed'#000+
   'F_Anonym class definitions are not allowed'#000+
   'E_Illegal parameter list'#000+
-  'E_Wrong parameter type specified'#000+
+  'E_Wrong parame','ter type specified'#000+
   'E_Wrong amount of parameters specified'#000+
   'E_overloaded identifier $1 isn'#039't a function'#000+
-  'E_overloaded functions have the same param','eter list'#000+
+  'E_overloaded functions have the same parameter list'#000+
   'E_function header doesn'#039't match the forward declaration $1'#000+
-  'E_function header $1 doesn'#039't match forward : var name changes $2 ='+
-  '> $3'#000+
+  'E_function header $1 doesn'#039,'t match forward : var name changes $2 '+
+  '=> $3'#000+
   'N_only values can be jumped over in enumeration types'#000+
-  'N_Interface and implementation names are diffe','rent !'#000+
+  'N_Interface and implementation names are different !'#000+
   'E_With can not be used for variables in a different segment'#000+
   'E_function nesting > 31'#000+
-  'E_range check error while evaluating constants'#000+
+  'E_ran','ge check error while evaluating constants'#000+
   'W_range check error while evaluating constants'#000+
   'E_duplicate case label'#000+
-  'E_typed constants of classes are',' not allowed'#000+
+  'E_typed constants of classes are not allowed'#000+
   'E_functions variables of overloaded functions are not allowed'#000+
-  'E_string length must be a value from 1 to 255'#000+
+  'E_string length must ','be a value from 1 to 255'#000+
   'W_use extended syntax of DISPOSE and NEW to generate instances of obje'+
   'cts'#000+
   'E_class identifier expected'#000+
-  'E_type identifier',' not allowed here'#000+
+  'E_type identifier not allowed here'#000+
   'E_method identifier expected'#000+
-  'E_function header doesn'#039't match any method of this class'#000+
+  'E_function header doesn'#039't match any method of thi','s class'#000+
   'P_procedure/function $1'#000+
   'E_Illegal floating point constant'#000+
   'E_FAIL can be used in constructors only'#000+
   'E_Destructors can'#039't have parameters'#000+
-  'E_','Only class methods can be referred with class references'#000+
-  'E_Only class methods can be accessed in class methods'#000+
+  'E_Only class methods can be referred with class references'#000+
+  'E_Only class methods can be accessed in',' class methods'#000+
   'E_Constant and CASE types do not match'#000+
   'E_The symbol can'#039't be exported from a library'#000+
   'W_A inherited method is hidden by $1'#000+
-  'E_There',' is no method in an ancestor class to be overridden: $1'#000+
-  'E_No member is provided to access property'#000+
+  'E_There is no method in an ancestor class to be overridden: $1'#000+
+  'E_No member is provided to access proper','ty'#000+
   'W_Stored prorperty directive is not yet implemented'#000+
   'E_Illegal symbol for property access'#000+
-  'E_Cannot access a protected field of an object here'#000,+
+  'E_Cannot access a protected field of an object here'#000+
   'E_Cannot access a private field of an object here'#000+
-  'W_overloaded of virtual method must be virtual: $1'#000+
+  'W_overloaded of virtual method must be virtual',': $1'#000+
   'E_overloaded methods which are virtual must have the same return type:'+
   ' $1'#000+
   'E_EXPORT declared functions can'#039't be nested'#000+
-  'E_methods can'#039't be EX','PORTed'#000+
+  'E_methods can'#039't be EXPORTed'#000+
   'E_call by var parameters have to match exactly'#000+
-  'E_Class isn'#039't a parent class of the current class'#000+
+  'E_Class isn'#039't a parent class of the curren','t class'#000+
   'E_SELF is only allowed in methods'#000+
   'E_methods can be only in other methods called direct with type identif'+
   'ier of the class'#000+
-  'E_Illegal use o','f '#039':'#039#000+
+  'E_Illegal use of '#039':'#039#000+
   'E_range check error in set constructor or duplicate set element'#000+
-  'E_Pointer to object expected'#000+
+  'E_Pointer to object expect','ed'#000+
   'E_Expression must be constructor call'#000+
   'E_Expression must be destructor call'#000+
   'E_Illegal order of record elements'#000+
-  'E_Expression type must be class',' or record type'#000+
+  'E_Expression type must be class or record type'#000+
   'E_Functions with void return value can'#039't return any value'#000+
-  'E_constructors and destructors must be methods'#000+
+  'E_constructors and des','tructors must be methods'#000+
   'E_Operator is not overloaded'#000+
   'E_Re-raise isn'#039't possible there'#000+
-  'E_The extended syntax of new or dispose isn'#039't allowed for ','a clas'+
-  's'#000+
+  'E_The extended syntax of new or dispose isn'#039't allowed for a class'#000+
   'E_Assembler incompatible with function return value'#000+
-  'E_Procedure overloading is switched off'#000+
+  'E_Procedure overloading is switched ','off'#000+
   'E_It is not possible to overload this operator (overload = instead)'#000+
   'E_Comparative operator must return a boolean value'#000+
-  'E_Only virtual method','s can be abstract'#000+
+  'E_Only virtual methods can be abstract'#000+
   'F_Use of unsupported feature!'#000+
   'E_The mix of CLASSES and OBJECTS isn'#039't allowed'#000+
-  'W_Unknown procedure directive had to be ignored: $1'#000+
+  'W','_Unknown procedure directive had to be ignored: $1'#000+
   'E_absolute can only be associated to ONE variable'#000+
-  'E_absolute can only be associated a var or ','const'#000+
+  'E_absolute can only be associated a var or const'#000+
   'E_Abtract methods shouldn'#039't have any definition (with function bod'+
   'y)'#000+
-  'E_This overloaded function can'#039't be local (must be exported)'#000+
+  'E_This overloaded fun','ction can'#039't be local (must be exported)'#000+
   'W_Virtual methods are used without a constructor in $1'#000+
   'M_Macro defined: $1'#000+
   'M_Macro undefined: $1'#000+
-  'M_Macro',' $1 set to $2'#000+
+  'M_Macro $1 set to $2'#000+
   'I_Compiling $1'#000+
   'D_Compiling $1 for the second time'#000+
-  'E_Array properties aren'#039't allowed at this point'#000+
+  'E_Array properties aren'#039't allowe','d at this point'#000+
   'E_No property found to override'#000+
   'E_Only one default property is allowed, found inherited default proper'+
   'ty in class $1'#000+
-  'E_The defau','lt property must be an array property'#000+
-  'E_Virtual constructors are only supported in class object model'#000+
+  'E_The default property must be an array property'#000+
+  'E_Virtual constructors are only supported in class object ','model'#000+
   'E_No default property available'#000+
   'E_The class can'#039't have a published section, use the {$M+} switch'#000+
-  'E_Forward declaration of class $1 must be',' resolved here to use the c'+
-  'lass as ancestor'#000+
+  'E_Forward declaration of class $1 must be resolved here to use the cla'+
+  'ss as ancestor'#000+
   'E_Local operators not supported'#000+
-  'E_Procedure directive $1 not allowed in interface section'#000+
+  'E_Procedure directiv','e $1 not allowed in interface section'#000+
   'E_Procedure directive $1 not allowed in implementation section'#000+
-  'E_Procedure directive $1 not allowed in pro','cvar declaration'#000+
+  'E_Procedure directive $1 not allowed in procvar declaration'#000+
   'E_Function is already declared Public/Forward $1'#000+
-  'E_Can'#039't use both EXPORT and EXTERNAL'#000+
+  'E_Can'#039't use both EXPORT and EX','TERNAL'#000+
   'E_NAME keyword expected'#000+
   'W_$1 not yet supported inside inline procedure/function'#000+
   'W_Inlining disabled'#000+
   'I_Writing Browser log $1'#000+
-  'H_may be poi','nter dereference is missing'#000+
+  'H_may be pointer dereference is missing'#000+
   'F_Selected assembler reader not supported'#000+
-  'E_Procedure directive $1 has conflicts with other directives'#000+
+  'E_Procedure directive $1 h','as conflicts with other directives'#000+
   'E_Calling convention doesn'#039't match forward'#000+
   'E_Register calling (fastcall) not supported'#000+
-  'E_Property can'#039't have ','a default value'#000+
+  'E_Property can'#039't have a default value'#000+
   'E_The default value of a property must be constant'#000+
-  'E_Symbol can'#039't be published, can be only a class'#000+
+  'E_Symbol can'#039't be published, ','can be only a class'#000+
   'E_That kind of property can'#039't be published'#000+
   'W_Empty import name specified'#000+
   'E_Division by zero'#000+
-  'E_Invalid floating point operati','on'#000+
+  'E_Invalid floating point operation'#000+
   'E_Type mismatch'#000+
   'E_Integer expression expected'#000+
   'E_Ordinal expression expected'#000+
-  'E_Type identifier expected'#000+
+  'E_Type identifier',' expected'#000+
   'E_Variable identifier expected'#000+
   'E_pointer type expected'#000+
   'E_class type expected'#000+
   'E_Variable or type indentifier expected'#000+
-  'E_Can'#039't evaluate ','constant expression'#000+
+  'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'E_Operation not implemented for sets'#000+
-  'W_Automatic type conversion from floating type to COMP which is an int'+
-  'eger type'#000+
+  'W_Aut','omatic type conversion from floating type to COMP which is an i'+
+  'nteger type'#000+
   'W_Using / will give a floating point result'#000+
-  'H_use DIV instead to get ','an integer result'#000+
+  'H_use DIV instead to get an integer result'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
-  'E_succ or pred on enums with assignments not possible'#000+
+  'E_succ or pred on enums with',' assignments not possible'#000+
   'E_Can'#039't read or write variables of this type'#000+
   'E_Type conflict between set elements'#000+
-  'E_Integer or real expression expecte','d'#000+
+  'E_Integer or real expression expected'#000+
   'E_Identifier not found $1'#000+
   'F_Internal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#000+
-  'E_Unknown identifier $1'#000+
+  'E_Unkn','own identifier $1'#000+
   'E_Forward declaration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
   'E_Error in type definition'#000+
-  'E_Type identifier not',' defined'#000+
+  'E_Type identifier not defined'#000+
   'E_Forward type not resolved $1'#000+
-  'E_Only static variables can be used in static methods or outside metho'+
-  'ds'#000+
+  'E_Only static variables can be used in static methods or',' outside met'+
+  'hods'#000+
   'E_Invalid call to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
-  'E_Instances of classes or objects with an abtsract meth','od are not al'+
-  'lowed'#000+
+  'E_Instances of classes or objects with an abtsract method are not allo'+
+  'wed'#000+
   'W_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
-  'E_GOTO und LABEL are not supported (use command line switch -Sg)'#000+
+  'E_GOTO und LABEL are not s','upported (use command line switch -Sg)'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
-  'E_illegal type declaration of set el','ements'#000+
+  'E_illegal type declaration of set elements'#000+
   'E_Forward class definition not resolved $1'#000+
   'H_Parameter not used $1'#000+
-  'N_Local variable not used $1'#000+
+  'N_Local variable not u','sed $1'#000+
   'E_Set type expected'#000+
   'W_Function result does not seem to be set'#000+
   'E_Unknown record field identifier $1'#000+
-  'W_Local variable $1 does not seem to b','e initialized'#000+
+  'W_Local variable $1 does not seem to be initialized'#000+
   'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
-  'E_CONTINUE not allowed'#000+
+  'E_CON','TINUE not allowed'#000+
   'E_Expression too complicated - FPU stack overflow'#000+
   'E_Illegal expression'#000+
   'E_Invalid integer'#000+
   'E_Illegal qualifier'#000+
-  'E_High range limi','t < low range limit'#000+
+  'E_High range limit < low range limit'#000+
   'E_Illegal counter variable'#000+
-  'E_Can'#039't determine which overloaded function to call'#000+
+  'E_Can'#039't determine which overloaded function to ca','ll'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
   'E_File types must be var parameters'#000+
-  'E_The use of a far pointer isn'#039't allo','wed there'#000+
+  'E_The use of a far pointer isn'#039't allowed there'#000+
   'E_illegal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
-  'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
-  'h to this context)'#000+
+  'W_P','ossible illegal call of constructor or destructor (doesn'#039't ma'+
+  'tch to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
-  'E_procedure call with st','ackframe ESP/SP'#000+
+  'E_procedure call with stackframe ESP/SP'#000+
   'E_Abstract methods can'#039't be called directly'#000+
-  'F_Internal Error in getfloatreg(), allocation failure'#000+
+  'F_Internal Error in getfloatreg(), a','llocation failure'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
-  'F_32-bit unsigned not supported in MC680','00 mode'#000+
+  'F_32-bit unsigned not supported in MC68000 mode'#000+
   'F_Internal Error in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
-  'E_Stack limit excedeed in local routine'#000+
+  'E_Stack limit excedeed in ','local routine'#000+
   'D_Stack frame is omited'#000+
   'E_Unable to inline object methods'#000+
   'E_Unable to inline procvar calls'#000+
   'E_No code for inline procedure stored'#000+
-  'E','_Element zero of an ansi/wide- or longstring can'#039't be accessed,'+
-  ' use (set)length instead'#000+
-  'E_Include or exclude not implemented in this case'#000+
+  'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
+  'se (set)length instead'#000+
+  'E_Includ','e or exclude not implemented in this case'#000+
   'F_Divide by zero in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
-  'F_Invalid num','eric format in asm evaluator'#000+
+  'F_Invalid numeric format in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
-  'F_Unknown error in asm evaluator'#000+
+  'F_Unknown error in asm evaluato','r'#000+
   'W_Invalid numeric value'#000+
   'E_escape sequence ignored: $1'#000+
   'E_Asm syntax error - Prefix not found'#000+
-  'E_Asm syntax error - Trying to add more than one p','refix'#000+
+  'E_Asm syntax error - Trying to add more than one prefix'#000+
   'E_Asm syntax error - Opcode not found'#000+
   'E_Invalid symbol reference'#000+
-  'W_Calling an overload function in an asm'#000+
+  'W_Calling an overload fun','ction in an asm'#000+
   'E_Constant value out of bounds'#000+
   'E_Non-label pattern contains @'#000+
   'E_Invalid Operand: $1'#000+
   'W_Override operator not supported'#000+
-  'E_Error in',' binary constant: $1'#000+
+  'E_Error in binary constant: $1'#000+
   'E_Error in octal constant: $1'#000+
   'E_Error in hexadecimal constant: $1'#000+
-  'E_Error in integer constant: $1'#000+
+  'E_Error i','n integer constant: $1'#000+
   'E_Invalid labeled opcode'#000+
   'F_Internal error in Findtype()'#000+
   'E_Invalid size for MOVSX/MOVZX'#000+
   'E_16-bit base in 32-bit segment'#000+
-  'E_','16-bit index in 32-bit segment'#000+
+  'E_16-bit index in 32-bit segment'#000+
   'E_Invalid Opcode'#000+
   'E_Constant reference not allowed'#000+
-  'W_Fwait can cause emulation problems with emu387'#000+
+  'W_Fwait can cau','se emulation problems with emu387'#000+
   'E_Invalid combination of opcode and operands'#000+
   'W_Opcode $1 not in table, operands not checked'#000+
-  'F_Internal Error i','n ConcatOpcode()'#000+
+  'F_Internal Error in ConcatOpcode()'#000+
   'E_Invalid size in reference'#000+
   'E_Invalid middle sized operand'#000+
-  'E_Invalid three operand opcode'#000+
+  'E_Invalid three oper','and opcode'#000+
   'E_Assembler syntax error'#000+
   'E_Invalid operand type'#000+
   'E_Segment overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
-  'F_Internal Errror conv','erting binary'#000+
+  'F_Internal Errror converting binary'#000+
   'F_Internal Errror converting hexadecimal'#000+
   'F_Internal Errror converting octal'#000+
-  'E_Invalid constant expression'#000+
+  'E_Inva','lid constant expression'#000+
   'E_Unknown identifier: $1'#000+
   'E_Trying to define an index register more than once'#000+
   'E_Invalid field specifier'#000+
-  'F_Internal Error ','in BuildScaling()'#000+
+  'F_Internal Error in BuildScaling()'#000+
   'E_Invalid scaling factor'#000+
   'E_Invalid scaling value'#000+
-  'E_Scaling value only allowed with index'#000+
+  'E_Scaling value only allowed ','with index'#000+
   'E_Invalid assembler syntax. No ref with brackets)'#000+
   'E_Expressions of the form [sreg:reg...] are currently not supported'#000+
-  'E_Trying to def','ine a segment register twice'#000+
+  'E_Trying to define a segment register twice'#000+
   'E_Trying to define a base register twice'#000+
-  'E_Trying to use a negative index register'#000+
+  'E_Trying to use a negative',' index register'#000+
   'E_Asm syntax error - error in reference'#000+
   'E_Local symbols not allowed as references'#000+
   'E_Invalid operand in bracket expression'#000+
-  'E_Inva','lid symbol name: $1'#000+
+  'E_Invalid symbol name: $1'#000+
   'E_Invalid Reference syntax'#000+
   'E_Invalid string as opcode operand: $1'#000+
-  'W_@CODE and @DATA not supported'#000+
+  'W_@CODE an','d @DATA not supported'#000+
   'E_Null label references are not allowed'#000+
   'W_Calling of an overloaded function in direct assembler'#000+
-  'E_Cannot use SELF outside ','a method'#000+
+  'E_Cannot use SELF outside a method'#000+
   'E_Asm syntax error - Should start with bracket'#000+
   'E_Asm syntax error - register: $1'#000+
-  'E_SEG and OFFSET not supported'#000+
+  'E_SEG ','and OFFSET not supported'#000+
   'E_Asm syntax error - in opcode operand'#000+
   'E_Invalid String expression'#000+
   'E_Constant expression out of bounds'#000+
-  'F_Internal Error',' in BuildConstant()'#000+
+  'F_Internal Error in BuildConstant()'#000+
   'W_A repeat prefix and a segment override on <= i386 may result in erro'+
-  'rs if an interrupt occurs'#000+
+  'rs if ','an interrupt occurs'#000+
   'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
-  'E_Invalid combination of override and opcode: $1'#000,+
+  'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
   'E_Duplicate local symbol: $1'#000+
   'E_Unknown label identifer: $1'#000+
-  'E_Assemble node syntax error'#000+
+  'E_Assembl','e node syntax error'#000+
   'E_Undefined local symbol: $1'#000+
   'D_Starting intel styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
-  'E_Not',' a directive or local symbol: $1'#000+
+  'E_Not a directive or local symbol: $1'#000+
   'E_/ at beginning of line not allowed'#000+
   'E_NOR not supported'#000+
-  'E_Invalid floating point register name'#000+
+  'E_Inva','lid floating point register name'#000+
   'W_Modulo not supported'#000+
   'E_Invalid floating point constant: $1'#000+
-  'E_Size suffix and destination register do not matc','h'#000+
+  'E_Size suffix and destination register do not match'#000+
   'E_Internal error in ConcatLabeledInstr()'#000+
   'W_Floating point binary representation ignored'#000+
-  'W_Floating point hexadecimal representation ignored'#000+
+  'W_Floa','ting point hexadecimal representation ignored'#000+
   'W_Floating point octal representation ignored'#000+
   'E_Invalid real constant expression'#000+
-  'E_Parenthesis are',' not allowed'#000+
+  'E_Parenthesis are not allowed'#000+
   'E_Invalid Reference'#000+
   'E_Cannot use __SELF outside a method'#000+
-  'E_Cannot use __OLDEBP outside a nested procedure'#000+
+  'E_Cannot use __OLDEBP outs','ide a nested procedure'#000+
   'W_Identifier $1 supposed external'#000+
   'E_Invalid segment override expression'#000+
   'E_Strings not allowed as constants'#000+
-  'D_Starting AT&','T styled assembler parsing...'#000+
+  'D_Starting AT&T styled assembler parsing...'#000+
   'D_Finished AT&T styled assembler parsing...'#000+
-  'E_Switching sections is not allowed in an assembler block'#000+
+  'E_Switching sections i','s not allowed in an assembler block'#000+
   'E_Invalid global definition'#000+
   'E_Line separator expected'#000+
   'W_globl not supported'#000+
   'W_align not supported'#000+
-  'W_lcomm no','t supported'#000+
+  'W_lcomm not supported'#000+
   'W_comm not supported'#000+
   'E_Invalid local common definition'#000+
-  'E_Invalid global common definition'#000+
+  'E_Invalid global common defin','ition'#000+
   'E_local symbol: $1 not found inside asm statement'#000+
   'E_assembler code not returned to text'#000+
   'F_internal error in BuildReference()'#000+
-  'E_invalid opc','ode size'#000+
+  'E_invalid opcode size'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
   'D_Creating inline asm lookup tables'#000+
-  'E_Using a defined name as a local label'#000+
+  'E_Using a defined name',' as a local label'#000+
   'F_internal error in HandleExtend()'#000+
   'E_Invalid character: <'#000+
   'E_Invalid character: >'#000+
   'E_Unsupported opcode'#000+
-  'E_Increment and Decremen','t mode not allowed together'#000+
+  'E_Increment and Decrement mode not allowed together'#000+
   'E_Invalid Register list in movem/fmovem'#000+
-  'E_Invalid Register list for opcode'#000+
+  'E_Invalid Register list for ','opcode'#000+
   'E_68020+ mode required to assemble'#000+
   'D_Starting Motorola styled assembler parsing...'#000+
   'D_Finished Motorola styled assembler parsing...'#000+
-  'W_XDEF',' not supported'#000+
+  'W_XDEF not supported'#000+
   'W_Functions with void return value can'#039't return any value in asm c'+
   'ode'#000+
-  'E_Invalid suffix for intel assembler'#000+
+  'E_Invalid s','uffix for intel assembler'#000+
   'E_Extended not supported in this mode'#000+
   'E_Comp not supported in this mode'#000+
-  'W_You need GNU as version >= 2.81 to compile t','his MMX code'#000+
+  'W_You need GNU as version >= 2.81 to compile this MMX code'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
-  'E_Unsupported symbol type for operand'#000+
+  'E_Unsupported ','symbol type for operand'#000+
   'E_Cannot index a local var or parameter with a register'#000+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $1'#000+
-  'E_Can',#039't create assember file $1'#000+
+  'E_Can'#039't create assember file $1'#000+
   'W_Assembler $1 not found, switching to external assembling'#000+
-  'T_Using assembler: $1'#000+
+  'T_Using as','sembler: $1'#000+
   'W_Error while assembling exitcode $1'#000+
   'W_Can'#039't call the assembler, error $1 switching to external assembl'+
   'ing'#000+
   'I_Assembling $1'#000+
-  'W_Linker ','$1 not found, switching to external linking'#000+
+  'W_Linker $1 not found, switching to external linking'#000+
   'T_Using linker: $1'#000+
-  'W_Object $1 not found, Linking may fail !'#000+
+  'W_Object $1 not found, Linking ma','y fail !'#000+
   'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
-  'W_','binder not found, switching to external binding'#000+
+  'W_binder not found, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
-  'E_Dynamic Libraries not supported'#000+
+  'E_Dynam','ic Libraries not supported'#000+
   'I_Closing script $1'#000+
   'F_Can'#039't post process executable $1'#000+
   'F_Can'#039't open executable $1'#000+
   'X_Size of Code: $1 bytes'#000+
-  'X_Size of ','initialized data: $1 bytes'#000+
+  'X_Size of initialized data: $1 bytes'#000+
   'X_Size of uninitialized data: $1 bytes'#000+
-  'X_Stack space reserved: $1 bytes'#000+
+  'X_Stack space reserved: $1 byt','es'#000+
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
   'T_PPU Loading $1'#000+
@@ -448,192 +450,192 @@ const msgtxt : array[0..00094,1..240] of char=(
   'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
-  'U_PPU File too',' short'#000+
+  'U_PPU File too short'#000+
   'U_PPU Invalid Header (no PPU at the begin)'#000+
   'U_PPU Invalid Version $1'#000+
-  'U_PPU is compiled for an other processor'#000+
+  'U_PPU is compiled for',' an other processor'#000+
   'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
   'F_reading PPU-File'#000+
-  'F_unexpected e','nd of PPU-File'#000+
+  'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
-  'F_Too much units'#000+
+  'F_To','o much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
   'F_Can'#039't compile unit $1, no sources available'#000+
-  'W_Compiling the system unit requires the ','-Us switch'#000+
+  'W_Compiling the system unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
   'U_Load from $1 ($2) unit $3'#000+
-  'U_Recompiling $1, checksum changed for $2'#000+
+  'U_Recom','piling $1, checksum changed for $2'#000+
   'U_Recompiling unit, static lib is older than ppufile'#000+
   'U_Recompiling unit, shared lib is older than ppufile'#000+
-  'U_R','ecompiling unit, obj and asm are older than ppufile'#000+
+  'U_Recompiling unit, obj and asm are older than ppufile'#000+
   'U_Recompiling unit, obj is older than asm'#000+
-  'U_Parsing interface of $1'#000+
+  'U_','Parsing interface of $1'#000+
   'U_Parsing implementation of $1'#000+
   'U_Second load for unit $1'#000+
   'U_PPU Check file $1 time $2'#000+
-  '$1 [options] <inputfile> [options]'#000,+
+  '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
   'W_DEF file can be created only for OS/2'#000+
-  'E_nested response files are not supported'#000+
+  'E_nested response files',' are not supported'#000+
   'F_No source file name in command line'#000+
   'E_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
-  'F_Unable ','to open file $1'#000+
+  'F_Unable to open file $1'#000+
   'N_Reading further options from $1'#000+
   'W_Target is already set to: $1'#000+
-  'W_Shared libs not supported on DOS platform, reverting to static'#000+
+  'W_Shared libs n','ot supported on DOS platform, reverting to static'#000+
   'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
   'F_open conditional at the end of the file'#000+
-  'W_Debug infor','mation generation is not supported by this executable'#000+
+  'W_Debug information generation is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
-  'W_You are using the obsolete switch $1'#000+
+  'W_You are usi','ng the obsolete switch $1'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-98 by Florian Klaempfl'#000+
-  'Free Pascal C','ompiler version $FPCVER'#000+
+  'Free Pascal Compiler version $FPCVER'#000+
   #000+
   'Compiler Date  : $FPCDATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
-  'This program comes under the GNU General Public Licence'#000+
+  'This program com','es under the GNU General Public Licence'#000+
   'For more information read COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
-  '                [email protected]','lna.hungary.net'#000+
+  '                [email protected]'#000+
   '**0*_put + after a boolean switch option to enable it, - to disable it'+
   #000+
-  '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
+  '**1a_the ','compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
   '*t1b_use EMS'#000+
   '**1B_build all modules'#000+
-  '**1C_code',' generation options'#000+
+  '**1C_code generation options'#000+
   '3*2CD_create dynamic library'#000+
-  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
+  '**2Ch<n>_<n> bytes heap (between 1023 and 67107','840)'#000+
   '**2Ci_IO-checking'#000+
   '**2Cn_omit linking stage'#000+
   '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
-  '*','*2Ct_stack checking'#000+
+  '**2Ct_stack checking'#000+
   '3*2CS_create static library'#000+
   '3*2Cx_use smartlinking'#000+
-  '**1d<x>_defines the symbol <x>'#000+
+  '**1d<x>_defines the symbo','l <x>'#000+
   '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
-  '**1F_set fil','e names and paths'#000+
+  '**1F_set file names and paths'#000+
   '**2FD<x>_sets the directory where to search for compiler utilities'#000+
-  '**2Fe<x>_redirect error output to <x>'#000+
+  '**2Fe<x>_re','direct error output to <x>'#000+
   '**2FE<x>_set exe/unit output path to <x>'#000+
   '*L2Fg<x>_same as -Fl'#000+
   '**2Fi<x>_adds <x> to include path'#000+
-  '**2Fl<x>_adds <x> to ','library path'#000+
+  '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
   '**2Fo<x>_adds <x> to object path'#000+
-  '**2Fr<x>_load error message file <x>'#000+
+  '**2Fr<x>_load ','error message file <x>'#000+
   '**2Fu<x>_adds <x> to unit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g_generate debugger information'#000+
-  '*g2','gg_use gsym'#000+
+  '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
   '**1i_information'#000+
   '**1I<x>_adds <x> to include path'#000+
-  '**1k<x>_Pass <x> to the linker'#000+
+  '**1k<x>_Pass <x> to ','the linker'#000+
   '**1l_write logo'#000+
   '**1n_don'#039't read the default config file'#000+
   '**1o<x>_change the name of the executable produced to <x>'#000+
-  '**1pg_generate prof','ile code for gprof'#000+
+  '**1pg_generate profile code for gprof'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
-  '**1S_syntax options'#000+
+  '**1S_syntax opti','ons'#000+
   '**2S2_switch some Delphi 2 extensions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
-  '**2Se_compile','r stops after the first error'#000+
+  '**2Se_compiler stops after the first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Si_support C++ stlyed INLINE'#000+
-  '**2Sm_support macros like C (global)'#000+
+  '**2Sm_s','upport macros like C (global)'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
-  '**2Ss_constructor name must be init (destr','uctor must be done)'#000+
+  '**2Ss_constructor name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
-  '**1s_don'#039't call assembler and linker (only with -a)'#000+
+  '**1s_don'#039't call assembler and linker (','only with -a)'#000+
   '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options'#000+
   '**2Un_don'#039't check the unit name'#000+
   '**2Up<x>_same as -Fu<x>'#000+
-  '**2Us_compile a system ','unit'#000+
+  '**2Us_compile a system unit'#000+
   '**1v<x>_Be verbose. <x> is a combination of the following letters :'#000+
-  '**2*_e : Show errors (default)       d : Show debug info'#000+
+  '**2*_e : Show errors (d','efault)       d : Show debug info'#000+
   '**2*_w : Show warnings               u : Show unit info'#000+
-  '**2*_n : Show notes                  t : Show tried/us','ed files'#000+
+  '**2*_n : Show notes                  t : Show tried/used files'#000+
   '**2*_h : Show hints                  m : Show defined macros'#000+
-  '**2*_i : Show general info           p : Show compiled procedures'#000+
+  '**2*_i : Show general info','           p : Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
-  '**2*_a : Show everything             0 : Show',' nothing (except errors'+
-  ')'#000+
+  '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
-  '**2*_    declarations if an error    x : Executable info (Win32 only)'#000+
+  '*','*2*_    declarations if an error    x : Executable info (Win32 only'+
+  ')'#000+
   '**2*_    occurs'#000+
   '**1X_executable options'#000+
   '*L2Xc_link with the c library'#000+
-  '**2XD','_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
-  '**2Xs_strip all symbols from executable'#000+
+  '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
+  '**2Xs_strip all symbols from executable'#000,+
   '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
   '**0*_Processor specific options:'#000+
   '3*1A<x>_output format'#000+
   '3*2Ao_coff file using GNU AS'#000+
-  '3','*2Anasmcoff_coff file using Nasm'#000+
+  '3*2Anasmcoff_coff file using Nasm'#000+
   '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
-  '3*2Anasmobj_obj file using Nasm'#000+
+  '3*2Anasmobj_obj file ','using Nasm'#000+
   '3*2Amasm_obj using Masm (Mircosoft)'#000+
   '3*2Atasm_obj using Tasm (Borland)'#000+
   '3*1R<x>_assembler reading style'#000+
-  '3*2Ratt_read AT&T style assembl','er'#000+
+  '3*2Ratt_read AT&T style assembler'#000+
   '3*2Rintel_read Intel style assembler'#000+
-  '3*2Rdirect_copy assembler text directly to assembler file'#000+
+  '3*2Rdirect_copy assembler text directly to assembler fil','e'#000+
   '3*1O<x>_optimizations'#000+
   '3*2Og_generate smaller code'#000+
   '3*2OG_generate faster code (default)'#000+
-  '3*2Or_keep certain variables in registers (still BUGGY!','!!)'#000+
+  '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
   '3*2Ou_enable uncertain optimizations (see docs)'#000+
-  '3*2O1_level 1 optimizations (quick optimizations)'#000+
+  '3*2O1_level 1 optimizations (quick optimizat','ions)'#000+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
   '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op_target processor'#000+
-  '3*3Op1_set targ','et processor to 386/486'#000+
+  '3*3Op1_set target processor to 386/486'#000+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
-  '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
+  '3*3Op3_set target',' processor to PPro/PII/c6x86/K6 (tm)'#000+
   '3*1T<x>_Target operating system'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
-  '3*2TGO32V2_version 2 of DJ ','Delorie DOS extender'#000+
+  '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
-  '6*1A<x>_output format'#000+
+  '6*1A<x>_output fo','rmat'#000+
   '6*2Ao_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
   '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
-  '6*1O_optimiz','ations'#000+
+  '6*1O_optimizations'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
-  '6*2OG_generate faster code (default)'#000+
+  '6*2OG_generate faster code (defau','lt)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
   '6*2O2_set target processor to a MC68020+'#000+
   '6*1R<x>_assembler reading style'#000+
-  '6*2RMOT_read motorola style',' assembler'#000+
+  '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
-  '6*2TMACOS_Macintosh m68k'#000+
+  '6','*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+

+ 9 - 2
compiler/pdecl.pas

@@ -2086,7 +2086,8 @@ unit pdecl;
                 begin
                    Not_supported_for_inline(token);
                    { here we should be at lexlevel 1, no ? PM }
-                   if (lexlevel<>main_program_level) or not islibrary then
+                   if (lexlevel<>main_program_level) or
+                      (not islibrary and not DLLsource) then
                      begin
                         Message(parser_e_syntax_error);
                         consume_all_until(SEMICOLON);
@@ -2123,7 +2124,13 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.87  1998-11-29 12:42:24  peter
+  Revision 1.88  1998-11-30 09:43:20  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.87  1998/11/29 12:42:24  peter
     * check for constants with array decl
 
   Revision 1.86  1998/11/28 16:20:52  peter

+ 56 - 13
compiler/pexports.pas

@@ -30,23 +30,28 @@ unit pexports;
   implementation
 
     uses
-       cobjects,globals,scanner,symtable,pbase,verbose,export;
-
-    const
-       { export options }
-       eo_resident = $1;
+{* Changes made by Ozerski 23.10.1998}
+       cobjects,globals,scanner,symtable,pbase,verbose,
+       export,GenDef,Strings;
+{* End changes}
 
     procedure read_exports;
 
       var
-         hp : pexported_procedure;
+         hp : pexported_item;
          code : word;
-
+{* Changes made by Ozerski 23.10.1998}
+         DefString:string;
+         ProcName:string;
+         InternalProcName:string;
       begin
+         DefString:='';
+         InternalProcName:='';
+{* End changes}
          consume(_EXPORTS);
          while true do
            begin
-              hp:=new(pexported_procedure,init);
+              hp:=new(pexported_item,init);
               if token=ID then
                 begin
                    getsym(pattern,true);
@@ -60,26 +65,51 @@ unit pexports;
                    if assigned(srsym) then
                      begin
                         hp^.sym:=srsym;
-                        if (srsym^.typ<>procsym) or
-                          ((pprocdef(pprocsym(srsym)^.definition)^.options and poexports)=0) then
-                          Message(parser_e_illegal_symbol_exported);
+                        if ((srsym^.typ<>procsym) or
+                          ((pprocdef(pprocsym(srsym)^.definition)^.options and poexports)=0)) and
+                          (srsym^.typ<>varsym) and (srsym^.typ<>typedconstsym) then
+{* Changes made by Ozerski 23.10.1998}
+                          Message(parser_e_illegal_symbol_exported)
+                        else
+                         begin
+                          ProcName:=hp^.sym^.name;
+                          InternalProcName:=hp^.sym^.mangledname;
+                          delete(InternalProcName,1,1);
+                          DefString:=ProcName+'='+InternalProcName;
+                         end;
+{* End changes}
                         if (idtoken=_INDEX) then
                           begin
                              consume(_INDEX);
+                             hp^.options:=hp^.options or eo_index;
                              val(pattern,hp^.index,code);
                              consume(INTCONST);
+{* Changes made by Ozerski 23.10.1998}
+                             DefString:=ProcName+'='+InternalProcName;{Index ignored!}
+{* End changes}
                           end;
                         if (idtoken=_NAME) then
                           begin
                              consume(_NAME);
                              hp^.name:=stringdup(pattern);
-                             consume(ID);
+                             hp^.options:=hp^.options or eo_name;
+{* Changes made by Ozerski 23.10.1998}
+                             consume(CSTRING); {Bug fixed?}
+                             DefString:=hp^.name^+'='+InternalProcName;
+{* End changes}
                           end;
                         if (idtoken=_RESIDENT) then
                           begin
                              consume(_RESIDENT);
                              hp^.options:=hp^.options or eo_resident;
+{* Changes made by Ozerski 23.10.1998}
+                             DefString:=ProcName+'='+InternalProcName;{Resident ignored!}
+{* End changes}
                           end;
+{* Changes made by Ozerski 23.10.1998}
+                        if DefString<>''then
+                         DefFile.AddExport(DefString);
+{* End changes}
                      end;
                    exportlib^.exportprocedure(hp);
                 end
@@ -91,13 +121,26 @@ unit pexports;
                 break;
            end;
          consume(SEMICOLON);
+{* Changes made by Ozerski 23.10.1998}
+        if not DefFile.exportlist.empty then
+         begin
+          deffile.fname:='DEF.$$$';
+          deffile.writefile;
+         end;
+{* End changes}
       end;
 
 end.
 
 {
   $Log$
-  Revision 1.3  1998-10-29 11:35:51  florian
+  Revision 1.4  1998-11-30 09:43:21  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.3  1998/10/29 11:35:51  florian
     * some dll support for win32
     * fixed assembler writing for PalmOS
 

+ 36 - 2
compiler/pmodules.pas

@@ -163,7 +163,31 @@ unit pmodules;
               { Generate an external entry to be sure that _mainCRTStarup will be
                 linked, can't use concat_external because those aren't written for
                 asw (PFV) }
-              datasegment^.concat(new(pai_const,init_symbol(strpnew('_mainCRTStartup'))));
+{* Changed by Ozerski, 23.10.98}
+             if deffile.fname='DEF.$$$'then
+              target_link.bindcmd[1]:=target_link.bindcmd[1]+' -d DEF.$$$';
+             if DLLsource then
+              target_link.binders:=2;
+             if RelocSection then
+              begin
+               target_link.linkcmd:=target_link.linkcmd+' --base-file base.$$$';
+               target_link.bindcmd[1]:=target_link.bindcmd[1]+' --base-file base.$$$';
+               target_link.binders:=2;
+              end;
+             if apptype=at_cui then
+              datasegment^.concat(new(pai_const,init_symbol('_mainCRTStartup')))
+             else
+              begin
+               datasegment^.concat(new(pai_const,init_symbol('_WinMainCRTStartup')));
+               target_link.linkcmd:='--subsystem windows '+target_link.linkcmd;
+               target_link.bindcmd[2]:='--subsystem windows '+target_link.bindcmd[2];
+              end;
+             if DLLsource then
+              begin
+               target_link.linkcmd:='--dll '+target_link.linkcmd;
+               target_link.bindcmd[2]:='--dll '+target_link.bindcmd[2];
+              end;
+{* End changes}
             end;
 {$endif i386}
 {$ifdef m68k}
@@ -992,6 +1016,9 @@ unit pmodules;
          st    : psymtable;
          names : Tstringcontainer;
       begin
+{* Changes made by Ozerski 23.10.1998}
+         DLLsource:=islibrary;
+{* End changes}
          parse_only:=false;
          if islibrary then
            begin
@@ -999,6 +1026,7 @@ unit pmodules;
               stringdispose(current_module^.modulename);
               current_module^.modulename:=stringdup(pattern);
               current_module^.islibrary:=true;
+              exportlib^.preparelib(pattern);
               consume(ID);
               consume(SEMICOLON);
            end
@@ -1132,7 +1160,13 @@ unit pmodules;
 end.
 {
   $Log$
-  Revision 1.85  1998-11-28 16:20:54  peter
+  Revision 1.86  1998-11-30 09:43:22  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.85  1998/11/28 16:20:54  peter
     + support for dll variables
 
   Revision 1.84  1998/11/18 09:18:03  pierre

+ 44 - 16
compiler/systems.pas

@@ -139,9 +139,12 @@ unit systems;
        tlinkinfo = packed record
           id            : tlink;
           linkbin       : string[8];
-          linkcmd       : string[50];
-          bindbin       : string[8];
-          bindcmd       : string[50];
+{* Changes made by Ozerski 23.10.1998}
+          linkcmd       : string[127];
+          binders:word;
+          bindbin:array[1..2]of string[8];
+          bindcmd:array[1..2]of string[127];
+{* End changes}
           stripopt      : string[2];
           libpathprefix : string[13];
           libpathsuffix : string[2];
@@ -537,8 +540,11 @@ implementation
             id      : link_i386_ld;
             linkbin : 'ld';
             linkcmd : '$OPT -o $EXE $RES';
-            bindbin : '';
-            bindcmd : '';
+{* Changes made by Ozerski 23.10.1998}
+            binders:0;
+            bindbin : ('','');
+            bindcmd : ('','');
+{* End changes}
             stripopt   : '-s';
             libpathprefix : 'SEARCH_DIR(';
             libpathsuffix : ')';
@@ -552,8 +558,11 @@ implementation
             id      : link_i386_ldgo32v1;
             linkbin : 'ld';
             linkcmd : '-oformat coff-go32 $OPT -o $EXE @$RES';
-            bindbin : 'aout2exe';
-            bindcmd : '$EXE';
+{* Changes made by Ozerski 23.10.1998}
+            binders:1;
+            bindbin : ('aout2exe','');
+            bindcmd : ('$EXE','');
+{* End changes}
             stripopt   : '-s';
             libpathprefix : '-L';
             libpathsuffix : '';
@@ -567,8 +576,11 @@ implementation
             id      : link_i386_ldgo32v2;
             linkbin : 'ld';
             linkcmd : '-oformat coff-go32-exe $OPT -o $EXE @$RES';
-            bindbin : '';
-            bindcmd : '';
+{* Changes made by Ozerski 23.10.1998}
+            binders:0;
+            bindbin : ('','');
+            bindcmd : ('','');
+{* End changes}
             stripopt   : '-s';
             libpathprefix : '-L';
             libpathsuffix : '';
@@ -582,8 +594,12 @@ implementation
             id      : link_i386_ldw;
             linkbin : 'ldw';
             linkcmd : '$OPT -o $EXE $RES';
-            bindbin : '';
-            bindcmd : '';
+{* Changes made by Ozerski 23.10.1998}
+            binders:0;
+            bindbin : ('dlltool','ldw');
+            bindcmd : ('--as asw.exe --dllname $EXE --output-exp exp.$$$',
+                       '-s $OPT -o $EXE $RES exp.$$$');
+{* End changes}
             stripopt   : '-s';
             libpathprefix : 'SEARCH_DIR(';
             libpathsuffix : ')';
@@ -597,8 +613,11 @@ implementation
             id      : link_i386_ldos2;
             linkbin : 'ld';  { Os/2 }
             linkcmd : '-o $EXE @$RES';
-            bindbin : 'emxbind';
-            bindcmd : '-b -k$STACKKB -h$HEAPMB -o $EXE.exe $EXE -aim -s$DOSHEAPKB';
+{* Changes made by Ozerski 23.10.1998}
+            binders:1;
+            bindbin : ('emxbind','');
+            bindcmd : ('-b -k$STACKKB -h$HEAPMB -o $EXE.exe $EXE -aim -s$DOSHEAPKB','');
+{* End changes}
             stripopt   : '-s';
             libpathprefix : '-L';
             libpathsuffix : '';
@@ -614,8 +633,11 @@ implementation
             id      : link_m68k_ld;
             linkbin : 'ld';
             linkcmd : '$OPT -o $EXE $RES';
-            bindbin : '';
-            bindcmd : '';
+{* Changes made by Ozerski 23.10.1998}
+            binders:0;
+            bindbin : ('','');
+            bindcmd : ('','');
+{* End changes}
             stripopt   : '-s';
             libpathprefix : 'SEARCH_DIR(';
             libpathsuffix : ')';
@@ -1182,7 +1204,13 @@ begin
 end.
 {
   $Log$
-  Revision 1.50  1998-11-16 15:41:45  peter
+  Revision 1.51  1998-11-30 09:43:23  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.50  1998/11/16 15:41:45  peter
     * tp7 didn't like my ifopt H+ :(
 
   Revision 1.49  1998/11/16 10:17:09  peter

+ 32 - 4
compiler/temp_gen.pas

@@ -45,14 +45,22 @@ unit temp_gen;
     procedure ungettemp(pos : longint;size : longint);
     procedure ungetpersistanttemp(pos : longint;size : longint);
     procedure gettempofsizereference(l : longint;var ref : treference);
+    procedure gettempansistringreference(var ref : treference);
     function istemp(const ref : treference) : boolean;
     procedure ungetiftemp(const ref : treference);
 
 
   implementation
-{$ifdef EXTDEBUG}
-    uses scanner;
-{$endif}
+
+    uses
+       scanner
+{$ifdef i386}
+       ,cgai386
+{$endif i386}
+{$ifdef m68k}
+       ,cga68k
+{$endif m68k}
+       ;
 
     type
        pfreerecord = ^tfreerecord;
@@ -62,6 +70,7 @@ unit temp_gen;
           pos : longint;
           size : longint;
           persistant : boolean; { used for inlined procedures }
+          istempansistring : boolean;
 {$ifdef EXTDEBUG}
           line : longint;
 {$endif}
@@ -179,6 +188,7 @@ unit temp_gen;
          tl^.size:=size;
          tl^.next:=templist;
          tl^.persistant:=false;
+         tl^.istempansistring:=false;
          templist:=tl;
 {$ifdef EXTDEBUG}
          tl^.line:=aktfilepos.line;
@@ -231,6 +241,16 @@ unit temp_gen;
          ref.base:=procinfo.framepointer;
       end;
 
+    procedure gettempansistringreference(var ref : treference);
+      begin
+         { do a reset, because the reference isn't used }
+         reset_reference(ref);
+         ref.offset:=gettempofsize(4);
+         templist^.istempansistring:=true;
+         ref.base:=procinfo.framepointer;
+      end;
+
+
     function istemp(const ref : treference) : boolean;
 
       begin
@@ -418,6 +438,8 @@ unit temp_gen;
                        end;
                    if (ref.offset=tl^.pos) then
                      begin
+                        if tl^.istempansistring then
+                          decransiref(ref);
                         ungettemp(ref.offset,tl^.size);
 {$ifdef TEMPDEBUG}
                    Comment(V_Debug,'temp managment  : ungettemp()'+
@@ -449,7 +471,13 @@ begin
 end.
 {
   $Log$
-  Revision 1.4  1998-10-09 08:56:32  pierre
+  Revision 1.5  1998-11-30 09:43:24  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.4  1998/10/09 08:56:32  pierre
     * several memory leaks fixed
 
   Revision 1.3  1998/07/16 08:01:42  pierre

+ 222 - 17
compiler/win_targ.pas

@@ -39,7 +39,10 @@ unit win_targ;
 
     pexportlibwin32=^texportlibwin32;
     texportlibwin32=object(texportlib)
+      st : string;
       procedure preparelib(const s:string);virtual;
+      procedure exportprocedure(hp : pexported_item);virtual;
+      procedure exportvar(hp : pexported_item);virtual;
       procedure generatelib;virtual;
     end;
 
@@ -401,18 +404,132 @@ unit win_targ;
            exportssection:=new(paasmoutput,init);
       end;
 
+    
+    
+    procedure texportlibwin32.exportvar(hp : pexported_item);
+      begin
+         { same code used !! PM }
+         exportprocedure(hp);
+      end;
+      
+    
+    procedure texportlibwin32.exportprocedure(hp : pexported_item);
+    
+      { must be ordered at least for win32 !! }
+      var hp2 : pexported_item;
+    
+    begin
+        hp2:=pexported_item(current_module^._exports^.first);
+        { first test the index value }
+        if (hp^.options and eo_index)<>0 then
+          begin
+             if (hp^.index<=0) or (hp^.index>$ffff) then
+               message1(parser_e_export_invalid_index,tostr(hp^.index))
+             else while assigned(hp2) do
+               begin
+                  if hp^.index=hp2^.index then
+                    message1(parser_e_export_ordinal_double,tostr(hp^.index));
+                  hp2:=pexported_item(hp2^.next);
+               end;
+          end;
+        { use pascal name is none specified }
+        if (hp^.options and eo_name)=0 then
+          begin
+             hp^.name:=stringdup(hp^.sym^.name);
+             hp^.options:=hp^.options or eo_name;
+          end;
+          
+        { now place in correct order }
+        hp2:=pexported_item(current_module^._exports^.first);
+        if not assigned(hp2) or not assigned(hp^.name) then
+          current_module^._exports^.concat(hp)
+        else
+          begin
+             while assigned(hp2) and assigned(hp2^.name) and
+                (hp2^.name^<hp^.name^) do
+               hp2:=pexported_item(hp2^.next);
+             { insert hp there !! }
+             if assigned(hp2) and assigned(hp2^.name) and (hp2^.name^=hp^.name^) then
+               begin
+                  { this is not allowed !! }
+                  message1(parser_e_export_name_double,hp^.name^);
+               end;
+             if assigned(hp2) then
+               begin
+                  hp^.next:=hp2^.next;
+                  hp2^.next:=hp;
+                  hp^.previous:=hp2;
+                  if assigned(hp^.next) then
+                    hp^.next^.previous:=hp;
+               end
+             else
+               current_module^._exports^.concat(hp);
+          end;
+    end;
+    
+    
     procedure texportlibwin32.generatelib;
 
       var
-         ordinal_base,entries,named_entries : longint;
-         l1,l2,l3,l4 : plabel;
-
+         ordinal_base,ordinal_max,ordinal_min : longint;
+         current_index : longint;
+         entries,named_entries : longint;
+         name_label,dll_name_label,export_address_table : plabel;
+         export_name_table_pointers,export_ordinal_table : plabel;
+         hp,hp2,hp3 : pexported_item;
+         address_table,name_table_pointers,
+         name_table,ordinal_table : paasmoutput;
+         
       begin
-         ordinal_base:=0;
-         getlabel(l1);
-         getlabel(l2);
-         getlabel(l3);
-         getlabel(l4);
+         ordinal_max:=0;
+         ordinal_min:=$7FFFFFFF;
+         entries:=0;
+         named_entries:=0;
+         getlabel(dll_name_label);
+         getlabel(export_address_table);
+         getlabel(export_name_table_pointers);
+         getlabel(export_ordinal_table);
+
+         hp:=pexported_item(current_module^._exports^.first);
+
+         { count entries }
+         while assigned(hp) do
+           begin
+              inc(entries);
+              if (hp^.index>ordinal_max) then
+                ordinal_max:=hp^.index;
+              if (hp^.index>0) and (hp^.index<ordinal_min) then
+                ordinal_min:=hp^.index;
+              if assigned(hp^.name) then
+                inc(named_entries);
+              hp:=pexported_item(hp^.next);
+           end;
+
+         { no support for higher ordinal base yet !! }
+         ordinal_base:=1;
+         current_index:=ordinal_base;
+         { number all entries }
+         hp:=pexported_item(current_module^._exports^.first);
+         while assigned(hp) do
+           begin
+              if hp^.index=-1 then
+                hp^.index:=current_index
+              else if hp^.index<current_index then
+                begin
+                   { change the index value of the export
+                     that was given this reserved value }
+                   hp2:=pexported_item(current_module^._exports^.first);
+                   while assigned(hp2) and (hp2^.index<>hp^.index) do
+                     hp2:=pexported_item(hp2^.next);
+                   if assigned(hp2) then
+                     hp2^.index:=current_index;
+                end;
+              inc(current_index);
+              hp:=pexported_item(hp^.next);
+           end;
+
+         
+         exportssection^.concat(new(pai_section,init(sec_edata)));
          { export flags }
          exportssection^.concat(new(pai_const,init_32bit(0)));
          { date/time stamp }
@@ -422,23 +539,105 @@ unit win_targ;
          { minor version }
          exportssection^.concat(new(pai_const,init_16bit(0)));
          { pointer to dll name }
-         importssection^.concat(new(pai_const,init_rva(strpnew(lab2str(l1)))));
-         { ordinal base }
-         exportssection^.concat(new(pai_const,init_32bit(0)));
+         exportssection^.concat(new(pai_const,init_rva(strpnew(lab2str(dll_name_label)))));
+         { ordinal base normally set to 1 }
+         exportssection^.concat(new(pai_const,init_32bit(ordinal_base)));
          { number of entries }
          exportssection^.concat(new(pai_const,init_32bit(entries)));
          { number of named entries }
          exportssection^.concat(new(pai_const,init_32bit(named_entries)));
          { address of export address table }
-         importssection^.concat(new(pai_const,init_rva(strpnew(lab2str(l2)))));
+         exportssection^.concat(new(pai_const,init_rva(strpnew(lab2str(export_address_table)))));
          { address of name pointer pointers }
-         importssection^.concat(new(pai_const,init_rva(strpnew(lab2str(l3)))));
+         exportssection^.concat(new(pai_const,init_rva(strpnew(lab2str(export_name_table_pointers)))));
          { address of ordinal number pointers }
-         importssection^.concat(new(pai_const,init_rva(strpnew(lab2str(l4)))));
+         exportssection^.concat(new(pai_const,init_rva(strpnew(lab2str(export_ordinal_table)))));
          { the name }
-         importssection^.concat(new(pai_label,init(l1)));
-         importssection^.concat(new(pai_string,init(current_module^.modulename^+target_os.sharedlibext+#0)));
+         exportssection^.concat(new(pai_label,init(dll_name_label)));
+         if st='' then
+           exportssection^.concat(new(pai_string,init(current_module^.modulename^+target_os.sharedlibext+#0)))
+         else
+           exportssection^.concat(new(pai_string,init(st+target_os.sharedlibext+#0)));
+
+         {  export address table }
+         address_table:=new(paasmoutput,init);
+         address_table^.concat(new(pai_label,init(export_address_table)));
+         name_table_pointers:=new(paasmoutput,init);
+         name_table_pointers^.concat(new(pai_label,init(export_name_table_pointers)));
+         ordinal_table:=new(paasmoutput,init);
+         ordinal_table^.concat(new(pai_label,init(export_ordinal_table)));
+         name_table:=new(paasmoutput,init);
+         { write each address }
+         hp:=pexported_item(current_module^._exports^.first);
+         while assigned(hp) do
+           begin
+              if (hp^.options and eo_name)<>0 then
+                begin
+                   getlabel(name_label);
+                   name_table_pointers^.concat(new(pai_const,init_rva(strpnew(lab2str(name_label)))));
+                   ordinal_table^.concat(new(pai_const,init_16bit(hp^.index)));
+                   name_table^.concat(new(pai_align,init(2)));
+                   name_table^.concat(new(pai_label,init(name_label)));
+                   name_table^.concat(new(pai_string,init(hp^.name^+#0)));
+                end;
+              address_table^.concat(new(pai_const,init_rva(
+                strpnew(hp^.sym^.mangledname))));
+              hp:=pexported_item(hp^.next);
+           end;
+         { order in increasing ordinal values }
+         hp:=pexported_item(current_module^._exports^.first);
+         while assigned(hp) do
+           begin
+              hp3:=pexported_item(hp^.next);
+              hp2:=pexported_item(hp^.next);
+              
+              { fill missing values }
+              while assigned(hp2) and hp^.index>hp^.index do
+                begin
+                   hp2:=pexported_item(hp2^.next);
+                end;
+              if hp2<>hp3 then
+                begin
+                   current_module^._exports^.remove(hp);
+                   if assigned(hp2) then
+                     begin
+                        hp^.next:=hp2^.next;
+                        hp2^.next:=hp;
+                        hp^.previous:=hp2;
+                        if assigned(hp^.next) then
+                          hp^.next^.previous:=hp;
+                      end
+                    else
+                      current_module^._exports^.concat(hp);
+                end;
+              hp:=hp3;
+           end;
+         
 
+
+         { write the export adress table }
+         current_index:=ordinal_base;
+         hp:=pexported_item(current_module^._exports^.first);
+         while assigned(hp) do
+           begin
+              { fill missing values }
+              while current_index<hp^.index do
+                begin
+                   address_table^.concat(new(pai_const,init_32bit(0)));
+                   inc(current_index);
+                end;
+              inc(current_index);
+              hp:=pexported_item(hp^.next);
+           end;
+         
+         exportssection^.concatlist(address_table);
+         exportssection^.concatlist(name_table_pointers);
+         exportssection^.concatlist(ordinal_table);
+         exportssection^.concatlist(name_table);
+         dispose(address_table,done);
+         dispose(name_table_pointers,done);
+         dispose(ordinal_table,done);
+         dispose(name_table,done);
       end;
 
     procedure postprocessexecutable(n : string);
@@ -489,7 +688,13 @@ unit win_targ;
 end.
 {
   $Log$
-  Revision 1.14  1998-11-28 16:21:00  peter
+  Revision 1.15  1998-11-30 09:43:25  pierre
+    * some range check bugs fixed (still not working !)
+    + added DLL writing support for win32 (also accepts variables)
+    + TempAnsi for code that could be used for Temporary ansi strings
+      handling
+
+  Revision 1.14  1998/11/28 16:21:00  peter
     + support for dll variables
 
   Revision 1.13  1998/10/29 11:35:54  florian