+ switch -vx for win32 added

compiler/link.pas

@@ -440,7 +440,7 @@ begin
 { Post processor executable }
 {$ifdef i386}
   if target_info.target=target_i386_Win32 then
-    win_targ.postprocessexecutable;
+    win_targ.postprocessexecutable(current_module^.exefilename^);
 {$endif}
 
 {Remove ReponseFile}
@@ -514,7 +514,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.35  1998-10-19 18:06:23  peter
+  Revision 1.36  1998-10-22 15:18:44  florian
+    + switch -vx for win32 added
+
+  Revision 1.35  1998/10/19 18:06:23  peter
     * use no_double
 
   Revision 1.34  1998/10/16 13:37:18  florian

compiler/msgidx.inc

@@ -414,6 +414,11 @@ type tmsgconst=(
   exec_w_ar_not_found,
   exec_e_dll_not_supported,
   exec_i_closing_script,
+  execinfo_x_codesize,
+  execinfo_x_initdatasize,
+  execinfo_x_uninitdatasize,
+  execinfo_x_stackreserve,
+  execinfo_x_stackcommit,
   unit_t_unitsearch,
   unit_t_ppu_loading,
   unit_u_ppu_name,

compiler/msgtxt.inc

@@ -1,4 +1,4 @@
-const msgtxt : array[0..00092,1..240] of char=(
+const msgtxt : array[0..00093,1..240] of char=(
   'T_Compiler: $1'#000+
   'D_Source OS: $1'#000+
   'I_Target OS: $1'#000+
@@ -430,180 +430,185 @@ const msgtxt : array[0..00092,1..240] of char=(
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
   'I_Closing script $1'#000+
+  'X_Size of Code: $1 bytes'#000+
+  'X_Size of initialized data: $1 bytes'#000+
+  'X_Size of uninitialized data: $1 by','tes'#000+
+  'X_Stack space reserved: $1 bytes'#000+
+  'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
   'T_PPU Loading $1'#000+
   'U_PPU Name: $1'#000+
   'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
-  'U_P','PU 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 Invali','d Version $1'#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_u','nexpected end of PPU-File'#000+
+  'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
-  'F_PPU Dbx count problem'#000+
+  'F_PPU Dbx count pr','oblem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too 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 re','quires 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','_Load from $1 ($2) unit $3'#000+
   'U_Recompiling $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_Recompiling unit, shared lib is 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_Recompil','ing unit, obj is older than asm'#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+
+  'W_DEF file can be created onl','y for OS/2'#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 neste','d'#000+
+  'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
   'N_Reading further options from $1'#000+
-  'W_Target is already set to: $1'#000+
+  'W_Target is ','already set to: $1'#000+
   'W_Shared libs not 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 information generation is not supported by this executable'#000+
-  'H_Try recompiling with -dGDB'#000+
+  'W_Debug information generation is not supported by this executable'#000+
+  'H_Try re','compiling with -dGDB'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-98 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
-  'Com','piler Date  : $FPCDATE'#000+
+  'Compiler Date  : $FPCDATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
-  'This program comes under the GNU General Public Licence'#000+
+  'This program comes un','der the GNU General Public Licence'#000+
   'For more information read COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
   '                [email protected]'#000+
-  '**0*_+ switc','h option on, - off'#000+
-  '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
+  '**0*_+ switch option on, - off'#000+
+  '**1a_the compiler doesn'#039't delete the generated assembl','er file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
   '*t1b_use EMS'#000+
   '**1B_build all modules'#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 67107840)'#000+
   '**2Ci_IO-checking'#000+
-  '**2Cn_omit linking stage'#000+
+  '**2Cn_omit linking sta','ge'#000+
   '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
   '3*2CS_create static library'#000+
-  '3*2Cx_use smartlinki','ng'#000+
+  '3*2Cx_use smartlinking'#000+
   '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
-  '*O2Dd<x>_set description to <x>'#000+
+  '*O2Dd<x>_set d','escription to <x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F_set file names and paths'#000+
-  '**2FD<x>_sets the directory where to search for co','mpiler utilities'#000+
+  '**2FD<x>_sets the directory where to search for compiler utilities'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
-  '**2FE<x>_set exe/unit output path to <x>'#000+
+  '**2FE<x>_set exe/u','nit 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+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
-  '**2Fo<x>_adds <x> t','o object path'#000+
+  '**2Fo<x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
-  '**2Fu<x>_adds <x> to unit path'#000+
+  '**2Fu<x>_adds <x> to u','nit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g_generate debugger information'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
   '**1i_information'#000+
-  '**1I<x>_adds <x> to inclu','de path'#000+
+  '**1I<x>_adds <x> to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
-  '**1n_don'#039't read the default config file'#000+
+  '**1n_don'#039't read th','e default config file'#000+
   '**1o<x>_change the name of the executable produced to <x>'#000+
   '**1pg_generate profile code for gprof'#000+
-  '*L1P_use pipes instead of creating temporary asse','mbler files'#000+
+  '*L1P_use pipes instead of creating temporary assembler files'#000+
   '**1S_syntax options'#000+
-  '**2S2_switch some Delphi 2 extensions on'#000+
+  '**2S2_switch some Delphi 2 extensions on'#000,+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
   '**2Se_compiler stops after the first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
-  '**2Si_suppo','rt C++ stlyed INLINE'#000+
+  '**2Si_support C++ stlyed INLINE'#000+
   '**2Sm_support macros like C (global)'#000+
-  '**2So_tries to be TP/BP 7.0 compatible'#000+
+  '**2So_tries to ','be TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
   '**2Ss_constructor name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
-  '**2Sv_allo','w variable directives (cvar,external,public,export)'#000+
-  '**1s_don'#039't call assembler and linker (only with -a)'#000+
+  '**2Sv_allow variable directives (cvar,external,public,export)'#000+
+  '**1s_don'#039't call assem','bler 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+
-  '*','*1v<x>_Be verbose. <x> is a combination of the following letters :'#000+
-  '**2*_e : Show errors (default)       d : Show debug info'#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*_w : Show warnings               u : Show unit info'#000+
-  '**2*_n : Show notes                  t : Show tried/used fil','es'#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 nothi','ng (except errors'+
-  ')'#000+
-  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
-  '**2*_    declarations if an error'#000+
+  '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
+  '**2*_b : Show all procedure          r : Rhide/GCC com','patibility mod'+
+  'e'#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*2Anasme','lf_elf32 (linux) file using Nasm'#000+
-  '3*2Anasmobj_obj file using Nasm'#000+
+  '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
+  '3*2A','nasmobj_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 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 file'#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*2Ou_enable uncertain optimizations (','see docs)'#000+
-  '3*2O1_level 1 optimizations (quick optimizations)'#000+
+  '3*2Ou_enable uncertain optimizations (see docs)'#000+
+  '3*2O1_level 1 optimizations',' (quick optimizations)'#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 target processor to 386/486'#000+
-  '3*3Op2_set target ','processor to Pentium/PentiumMMX (tm)'#000+
+  '3*3Op2_set target processor to Pentium/PentiumMMX (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*2TLINUX_Linux'#000+
-  '3*2TO','S2_OS/2 2.x'#000+
-  '3*2TWin32_Windows 32 Bit'#000+
+  '3*2TOS2_OS/2 2.x'#000+
+  '3*2TWin32_Windows 32 Bit'#000,+
   '6*1A<x>_output format'#000+
   '6*2Ao_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
@@ -611,15 +616,15 @@ const msgtxt : array[0..00092,1..240] of char=(
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations'#000+
   '6*2Oa_turn on the optimizer'#000+
-  '6*2Og_g','enerate smaller code'#000+
-  '6*2OG_generate faster code (default)'#000+
+  '6*2Og_generate smaller code'#000+
+  '6*2OG_generate f','aster code (default)'#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*1T<x>_Target operating system',#000+
+  '6*1T<x>_Target operating system'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
-  '6*2TATARI_Atari ST/STe/TT'#000+
+  '6*2TATARI_','Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+

compiler/verbose.pas

@@ -54,6 +54,7 @@ Const
   V_Tried        = $80000;
   V_Debug        = $100000;
   V_Declarations = $200000;
+  V_Executable   = $400000;
   V_ShowFile     = $ffff;
   V_All          = $ffffffff;
   V_Default      = V_Fatal + V_Error + V_Normal;
@@ -211,6 +212,10 @@ begin
                    status.verbosity:=status.verbosity and (not V_Declarations)
                  else
                    status.verbosity:=status.verbosity or V_Declarations;
+           'X' : if inverse then
+                   status.verbosity:=status.verbosity and (not V_Executable)
+                 else
+                   status.verbosity:=status.verbosity or V_Executable;
            end;
        end;
      end;
@@ -351,6 +356,7 @@ begin
           'C' : v:=v or V_Conditional;
           'D' : v:=v or V_Debug;
           'B' : v:=v or V_Declarations;
+          'X' : v:=v or V_Executable;
           'S' : dostop:=true;
           '_' : ;
          end;
@@ -419,7 +425,10 @@ end.
 
 {
   $Log$
-  Revision 1.24  1998-10-08 17:17:39  pierre
+  Revision 1.25  1998-10-22 15:18:49  florian
+    + switch -vx for win32 added
+
+  Revision 1.24  1998/10/08 17:17:39  pierre
     * current_module old scanner tagged as invalid if unit is recompiled
     + added ppheap for better info on tracegetmem of heaptrc
       (adds line column and file index)

compiler/win_targ.pas

@@ -37,12 +37,12 @@ unit win_targ;
     end;
 
     { sets some flags of the executable }
-    procedure postprocessexecutable;
+    procedure postprocessexecutable(n : string);
 
   implementation
 
     uses
-       aasm,files,strings,globals,cobjects,systems
+       aasm,files,strings,globals,cobjects,systems,verbose
 {$ifdef GDB}
        ,gdb
 {$endif}
@@ -51,6 +51,71 @@ unit win_targ;
 {$endif}
        ;
 
+    type
+       tdosheader = packed record
+          e_magic : word;
+          e_cblp : word;
+          e_cp : word;
+          e_crlc : word;
+          e_cparhdr : word;
+          e_minalloc : word;
+          e_maxalloc : word;
+          e_ss : word;
+          e_sp : word;
+          e_csum : word;
+          e_ip : word;
+          e_cs : word;
+          e_lfarlc : word;
+          e_ovno : word;
+          e_res : array[0..3] of word;
+          e_oemid : word;
+          e_oeminfo : word;
+          e_res2 : array[0..9] of word;
+          e_lfanew : longint;
+       end;
+
+       tpeheader = packed record
+          PEMagic : array[0..3] of char;
+          Machine : word;
+          NumberOfSections : word;
+          TimeDateStamp : longint;
+          PointerToSymbolTable : longint;
+          NumberOfSymbols : longint;
+          SizeOfOptionalHeader : word;
+          Characteristics : word;
+          Magic : word;
+          MajorLinkerVersion : byte;
+          MinorLinkerVersion : byte;
+          SizeOfCode : longint;
+          SizeOfInitializedData : longint;
+          SizeOfUninitializedData : longint;
+          AddressOfEntryPoint : longint;
+          BaseOfCode : longint;
+          BaseOfData : longint;
+          ImageBase : longint;
+          SectionAlignment : longint;
+          FileAlignment : longint;
+          MajorOperatingSystemVersion : word;
+          MinorOperatingSystemVersion : word;
+          MajorImageVersion : word;
+          MinorImageVersion : word;
+          MajorSubsystemVersion : word;
+          MinorSubsystemVersion : word;
+          Reserved1 : longint;
+          SizeOfImage : longint;
+          SizeOfHeaders : longint;
+          CheckSum : longint;
+          Subsystem : word;
+          DllCharacteristics : word;
+          SizeOfStackReserve : longint;
+          SizeOfStackCommit : longint;
+          SizeOfHeapReserve : longint;
+          SizeOfHeapCommit : longint;
+          LoaderFlags : longint;
+          NumberOfRvaAndSizes : longint;
+          { DataDirectory : array[0..(IMAGE_NUMBEROF_DIRECTORY_ENTRIES)-1] of IMAGE_DATA_DIRECTORY; }
+       end;
+
     procedure timportlibwin32.preparelib(const s : string);
 
       begin
@@ -285,16 +350,38 @@ unit win_targ;
       end;
 
 
-    procedure postprocessexecutable;
+    procedure postprocessexecutable(n : string);
 
-      begin
+      var
+         f : file;
+         dosheader : tdosheader;
+         peheader : tpeheader;
+         peheaderpos : longint;
 
+      begin
+         assign(f,n);
+         reset(f,1);
+         blockread(f,dosheader,sizeof(tdosheader));
+         peheaderpos:=dosheader.e_lfanew;
+         seek(f,peheaderpos);
+         blockread(f,peheader,sizeof(tpeheader));
+
+         { write info }
+         Message1(execinfo_x_codesize,tostr(peheader.SizeOfCode));
+         Message1(execinfo_x_initdatasize,tostr(peheader.SizeOfInitializedData));
+         Message1(execinfo_x_uninitdatasize,tostr(peheader.SizeOfUninitializedData));
+         Message1(execinfo_x_stackreserve,tostr(peheader.SizeOfStackReserve));
+         Message1(execinfo_x_stackcommit,tostr(peheader.SizeOfStackCommit));
+         close(f);
       end;
 
 end.
 {
   $Log$
-  Revision 1.9  1998-10-19 15:41:03  peter
+  Revision 1.10  1998-10-22 15:18:51  florian
+    + switch -vx for win32 added
+
+  Revision 1.9  1998/10/19 15:41:03  peter
     * better splitname to support glib-1.1.dll alike names
 
   Revision 1.8  1998/09/07 18:33:35  peter