فهرست منبع

* 3% memory optimization
* changed some types
+ added type checking with different size for call node and for
parameters

carl 23 سال پیش
والد
کامیت
081a4aab35
13فایلهای تغییر یافته به همراه220 افزوده شده و 124 حذف شده
  1. 8 4
      compiler/fmodule.pas
  2. 19 6
      compiler/globals.pas
  3. 2 3
      compiler/msg/errore.msg
  4. 1 1
      compiler/msgidx.inc
  5. 76 77
      compiler/msgtxt.inc
  6. 20 2
      compiler/ncal.pas
  7. 8 2
      compiler/nld.pas
  8. 9 1
      compiler/pdecsub.pas
  9. 13 2
      compiler/psub.pas
  10. 11 5
      compiler/symbase.pas
  11. 33 13
      compiler/symdef.pas
  12. 10 4
      compiler/symsym.pas
  13. 10 4
      compiler/symtable.pas

+ 8 - 4
compiler/fmodule.pas

@@ -44,8 +44,6 @@ interface
        globals,finput,
        symbase,aasmbase;
 
-    const
-       maxunits = 1024;
 
     type
        trecompile_reason = (rr_unknown,
@@ -578,7 +576,7 @@ uses
 
     procedure tmodule.numberunits;
       var
-        counter : longint;
+        counter : word;
         hp      : tused_unit;
         hp1     : tmodule;
       begin
@@ -609,7 +607,13 @@ uses
 end.
 {
   $Log$
-  Revision 1.30  2002-11-24 18:19:56  carl
+  Revision 1.31  2002-12-07 14:27:07  carl
+    * 3% memory optimization
+    * changed some types
+    + added type checking with different size for call node and for
+       parameters
+
+  Revision 1.30  2002/11/24 18:19:56  carl
     + tos also has short filenames
 
   Revision 1.29  2002/11/20 12:36:23  mazen

+ 19 - 6
compiler/globals.pas

@@ -72,11 +72,17 @@ interface
          [m_tp7,m_all,m_tp_procvar,m_duplicate_names];
        gpcmodeswitches    : tmodeswitches=
          [m_gpc,m_all];
-
+        
+          
        { maximum number of locals in bytes before warning is emitted }
        maxlocalsize = high(smallint);
        { maximum number of paras in bytes before warning is emitted }
        maxparasize = high(word);
+       { maximum nesting of routines }
+       maxnesting = 32;
+       { maximum of units which are supported for a compilation }
+       maxunits = 1024;
+
 
 
     type
@@ -1279,12 +1285,13 @@ implementation
            ishexstr(copy(s,16,4)) and ishexstr(copy(s,21,4)) and
            ishexstr(copy(s,26,12)) then begin
           GUID.D1:=dword(hexstr2longint(copy(s,2,8)));
-          GUID.D2:=hexstr2longint(copy(s,11,4));
-          GUID.D3:=hexstr2longint(copy(s,16,4));
+          { these values are arealdy in the correct range (4 chars = word) }
+          GUID.D2:=word(hexstr2longint(copy(s,11,4)));
+          GUID.D3:=word(hexstr2longint(copy(s,16,4)));
           for i:=0 to 1 do
-            GUID.D4[i]:=hexstr2longint(copy(s,21+i*2,2));
+            GUID.D4[i]:=byte(hexstr2longint(copy(s,21+i*2,2)));
           for i:=2 to 7 do
-            GUID.D4[i]:=hexstr2longint(copy(s,22+i*2,2));
+            GUID.D4[i]:=byte(hexstr2longint(copy(s,22+i*2,2)));
           string2guid:=true;
         end
         else
@@ -1533,7 +1540,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.77  2002-12-06 17:50:00  peter
+  Revision 1.78  2002-12-07 14:27:07  carl
+    * 3% memory optimization
+    * changed some types
+    + added type checking with different size for call node and for
+       parameters
+
+  Revision 1.77  2002/12/06 17:50:00  peter
     * amiga fixes merged
 
   Revision 1.76  2002/12/01 22:07:41  carl

+ 2 - 3
compiler/msg/errore.msg

@@ -1103,8 +1103,7 @@ type_w_smaller_possible_range_check=04048_W_Type size mismatch, possible loss of
 % this may cause a range-check error, or may lead to possible loss of data.
 type_h_smaller_possible_range_check=04049_H_Type size mismatch, possible loss of data / range check error
 % There is an assignment to a smaller type than the source type. This means that
-% this may cause a range-check error, or may lead to possible loss of data.
-%
+% this may cause a range-check error, or may lead to possible loss of data. 
 % \end{description}
 #
 # Symtable
@@ -1287,7 +1286,7 @@ cg_e_parasize_too_big=06009_E_Parameter list size exceeds 65535 bytes
 cg_e_illegal_type_conversion=06010_E_Illegal type conversion
 % When doing a type-cast, you must take care that the sizes of the variable and
 % the destination type are the same.
-cg_h_pointer_to_longint_conv_not_portable=06011_H_Conversion between ordinals and pointers is not portable
+cg_h_pointer_to_longint_conv_not_portable=06011_H_Conversion between ordinals and pointers are not portable
 % If you typecast a pointer to a longint (or vice-versa), this code will not compile
 % on a machine using 64-bit for pointer storage.
 cg_e_file_must_call_by_reference=06012_E_File types must be var parameters

+ 1 - 1
compiler/msgidx.inc

@@ -604,7 +604,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 34092;
+  MsgTxtSize = 34093;
 
   MsgIdxMax : array[1..20] of longint=(
     17,62,192,50,56,44,98,19,35,43,

+ 76 - 77
compiler/msgtxt.inc

@@ -387,89 +387,89 @@ const msgtxt : array[0..000142,1..240] of char=(
   '06008_E_Can'#039't determine which overloaded function to call'#000+
   '06009_E_Paramete','r list size exceeds 65535 bytes'#000+
   '06010_E_Illegal type conversion'#000+
-  '06011_H_Conversion between ordinals and pointers is not portable'#000+
+  '06011_H_Conversion between ordinals and pointers are not portable'#000+
   '06012_E_File types must be var parameters'#000+
   '06013_E_The use of a far pointer isn'#039't allowed there'#000+
-  '06014_E_illegal ','call by reference parameters'#000+
+  '06014_E_illegal',' call by reference parameters'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
   '06016_W_Possible illegal call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
   '06020_E_Abstract methods can'#039't be called directly'#000+
-  '06','027_D_Register $1 weight $2 $3'#000+
+  '0','6027_D_Register $1 weight $2 $3'#000+
   '06029_D_Stack frame is omitted'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls cannot be inline.'#000+
   '06033_E_No code for inline procedure stored'#000+
-  '06035_E_Element zero of an ansi/wide- or long','string can'#039't be acc'+
+  '06035_E_Element zero of an ansi/wide- or lon','gstring can'#039't be acc'+
   'essed, use (set)length instead'#000+
   '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
   'th'#039' clause'#000+
   '06038_E_Cannot call message handler methods directly'#000+
   '06039_E_Jump in or outside of an exception block'#000+
-  '06040_E_Con','trol flow statements aren'#039't allowed in a finally bloc'+
+  '06040_E_Co','ntrol flow statements aren'#039't allowed in a finally bloc'+
   'k'#000+
   '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
   '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
   '06043_E_Local variables size exceeds supported limit'#000+
-  '07000_D_Starting ','$1 styled assembler parsing'#000+
+  '07000_D_Starting',' $1 styled assembler parsing'#000+
   '07001_D_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
   '07004_E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
-  '07007_E_Cannot us','e local variable or parameters here'#000+
+  '07007_E_Cannot u','se local variable or parameters here'#000+
   '07008_E_need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
   '07010_E_Cannot use multiple relocatable symbols'#000+
   '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
-  '07013_E_Relocata','ble symbol is not allowed'#000+
+  '07013_E_Relocat','able symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
   '07015_E_You can not reach $1 from that code'#000+
   '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
   '07017_E_Invalid base and index register usage'#000+
-  '07018_W_Possible error in object ','field handling'#000+
+  '07018_W_Possible error in object',' field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
   '07020_E_Multiple index register usage'#000+
   '07021_E_Invalid operand type'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
   '07023_W_@CODE and @DATA not supported'#000+
-  '07024_E_Null label references are not ','allowed'#000+
+  '07024_E_Null label references are not',' allowed'#000+
   '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#000+
   '07028_E_Invalid symbol reference'#000+
   '07029_W_Fwait can cause emulation problems with emu387'#000+
-  '07030_W_$1 without operand translated int','o $1P'#000+
+  '07030_W_$1 without operand translated in','to $1P'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
   '07032_W_Calling an overload function in assembler'#000+
   '07033_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
-  '07036_E_','Error converting octal $1'#000+
+  '07036_E','_Error converting octal $1'#000+
   '07037_E_Error converting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
   '07039_H_$1 translated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
-  '07042_E_Cannot use ','OLDEBP outside a nested procedure'#000+
+  '07042_E_Cannot use',' OLDEBP outside a nested procedure'#000+
   '07043_W_Procedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
   '07045_E_Size suffix and destination or source size do not match'#000+
-  '07046_W_Size suffix and destination or source size do not matc','h'#000+
+  '07046_W_Size suffix and destination or source size do not mat','ch'#000+
   '07047_E_Assembler syntax error'#000+
   '07048_E_Invalid combination of opcode and operands'#000+
   '07049_E_Assembler syntax error in operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
-  '07052_W_constant with symbol $1 for a','ddress which is not on a pointe'+
+  '07052_W_constant with symbol $1 for ','address which is not on a pointe'+
   'r'#000+
   '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
   '07055_E_Invalid combination of prefix and opcode: $1'#000+
   '07056_E_Invalid combination of override and opcode: $1'#000+
-  '07057_E_Too many operands on line'#000,
+  '07057_E_Too many operands on line',#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
@@ -477,95 +477,95 @@ const msgtxt : array[0..000142,1..240] of char=(
   '07062_E_Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
-  '07066_W_Modulo not s','upported'#000+
+  '07066_W_Modulo not ','supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
   '07068_E_Invalid floating point expression'#000+
   '07069_E_Wrong symbol type'#000+
   '07070_E_Cannot index a local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
-  '07072_W_Identi','fier $1 supposed external'#000+
+  '07072_W_Ident','ifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
   '07074_No type of variable specified'#000+
   '07075_E_assembler code not returned to text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
-  '07077_E_Using a defined name as a local la','bel'#000+
+  '07077_E_Using a defined name as a local l','abel'#000+
   '07078_E_Dollar token is used without an identifier'#000+
   '07079_W_32bit constant created for address'#000+
   '07080_N_.align is target specific, use .balign or .p2align'#000+
   '07081_E_Can'#039't access fields directly for parameters'#000+
-  '07082_E_Can'#039't access fields of ','objects/classes directly'#000+
+  '07082_E_Can'#039't access fields of',' objects/classes directly'#000+
   '07083_E_No size specified and unable to determine the size of the oper'+
   'ands'#000+
   '07084_E_Cannot use RESULT in this function'#000+
   '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
-  '07087_W_"$1 %st(n)" translated into ','"$1 %st,%st(n)"'#000+
+  '07087_W_"$1 %st(n)" translated into',' "$1 %st,%st(n)"'#000+
   '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
   '07090_E_Char > not allowed here'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
-  '07096_E','_Reglist invalid for opcode'#000+
+  '07096_','E_Reglist invalid for opcode'#000+
   '07097_E_Higher cpu mode required ($1)'#000+
   '08000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
   '08003_F_Direct not support for binary writers'#000+
-  '08004_E_Allocating o','f data is only allowed in bss section'#000+
+  '08004_E_Allocating ','of data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
   '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
-  '08009_E_Asm: Invalid effecti','ve address'#000+
+  '08009_E_Asm: Invalid effect','ive address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
   '08014_E_Asm: Comp type not supported for this target'#000+
-  '08015_E_Asm: Ext','ended type not supported for this target'#000+
+  '08015_E_Asm: Ex','tended type not supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
   '08018_E_Asm: First defined here'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
-  '09002_E_Can'#039't create assember fi','le: $1'#000+
+  '09002_E_Can'#039't create assember f','ile: $1'#000+
   '09003_E_Can'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
   '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
-  '09008_E_Can'#039't call the',' assembler, error $1 switching to external'+
+  '09008_E_Can'#039't call th','e assembler, error $1 switching to external'+
   ' assembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
-  '09013_E_Error while linking',#000+
+  '09013_E_Error while linkin','g'#000+
   '09014_E_Can'#039't call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
   '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
-  '09019_E_Creation of Dynamic/Shared',' Libraries not supported'#000+
+  '09019_E_Creation of Dynamic/Share','d Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
   '09021_E_resource compiler not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
   '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
   'king'#000+
-  '09024_T_unit $1 can'#039't be',' smart linked, switching to static linki'+
+  '09024_T_unit $1 can'#039't b','e smart linked, switching to static linki'+
   'ng'#000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
-  '09028_F_Can'#039't post process execu','table $1'#000+
+  '09028_F_Can'#039't post process exec','utable $1'#000+
   '09029_F_Can'#039't open executable $1'#000+
   '09030_X_Size of Code: $1 bytes'#000+
   '09031_X_Size of initialized data: $1 bytes'#000+
   '09032_X_Size of uninitialized data: $1 bytes'#000+
   '09033_X_Stack space reserved: $1 bytes'#000+
-  '09034_X_Stack space commited: $1 bytes'#000+
-  '1','0000_T_Unitsearch: $1'#000+
+  '09034_X_Stack space commited: $1 bytes'#000,
+  '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
@@ -574,84 +574,84 @@ const msgtxt : array[0..000142,1..240] of char=(
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
-  '1000','9_U_PPU is compiled for another processor'#000+
+  '100','09_U_PPU is compiled for another processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
-  '10016_F_Invalid P','PU-File entry: $1'#000+
+  '10016_F_Invalid ','PPU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
   '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1'#000+
-  '10023_W_Un','it $1 was not found but $2 exists'#000+
+  '10023_W_U','nit $1 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
   '10026_F_There were $1 errors compiling module, stopping'#000+
   '10027_U_Load from $1 ($2) unit $3'#000+
-  '10028_U_Recompiling ','$1, checksum changed for $2'#000+
+  '10028_U_Recompiling',' $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recompiling unit, obj and asm are older than',' ppufile'#000+
+  '10032_U_Recompiling unit, obj and asm are older tha','n ppufile'#000+
   '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10038_H_Conditional $1 was not set at startup in',' last compilation of'+
+  '10038_H_Conditional $1 was not set at startup i','n last compilation of'+
   ' $2'#000+
   '10039_H_Conditional $1 was set at startup in last compilation of $2'#000+
   '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
   '10041_H_File $1 is newer than Release PPU file $2'#000+
-  '10042_U_Using a unit which was no','t compiled with correct FPU mode'#000+
+  '10042_U_Using a unit which was n','ot compiled with correct FPU mode'#000+
   '11000_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
   '11003_E_nested response files are not supported'#000+
-  '11004_F_No source file name in co','mmand line'#000+
+  '11004_F_No source file name in c','ommand line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
   '11010_D_Reading further options from $1'#000+
-  '11011_W_Target is alre','ady set to: $1'#000+
+  '11011_W_Target is alr','eady set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
   '11015_F_open conditional at the end of the file'#000+
-  '11016_W_Debug information generation is not supported b','y this execut'+
+  '11016_W_Debug information generation is not supported ','by this execut'+
   'able'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_E_You are using the obsolete switch $1'#000+
   '11019_E_You are using the obsolete switch $1, please use $2'#000+
   '11020_N_Switching assembler to default source writing assembler'#000+
-  '11021_W_Assembler ','output selected "$1" is not compatible with "$2"'#000+
+  '11021_W_Assembler',' output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
   '11029__*** press enter ***'#000+
-  '11030_H_Start of rea','ding config file $1'#000+
+  '11030_H_Start of re','ading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
   '11033_D_interpreting file option "$1"'#000+
   '11034_D_Reading config file "$1"'#000+
-  '11035_D_found source file name "$1"',#000+
+  '11035_D_found source file name "$1','"'#000+
   '11037_D_Defining symbol $1'#000+
   '11038_D_Undefining symbol $1'#000+
   '11039_E_Unknown code page'#000+
   '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
   'Copyright (c) 1993-2002 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler version $FPCVER'#010+
-  #010,
+  '11024_Free Pascal Compiler version $FPCVER'#010,
+  #010+
   'Compiler Date  : $FPCDATE'#010+
   'Compiler Target: $FPCTARGET'#010+
   #010+
@@ -662,25 +662,25 @@ const msgtxt : array[0..000142,1..240] of char=(
   'For more information read COPYING.FPC'#010+
   #010+
   'Report bugs,suggestions etc to:'#010+
-  '                 bugrep@f','reepascal.org'#000+
+  '                 bugrep@','freepascal.org'#000+
   '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
   'ble it'#010+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_list sourcecode lines in assembler file'#010+
-  '**2ar_list register allocation/release in','fo in assembler file'#010+
+  '**2ar_list register allocation/release i','nfo in assembler file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
   '**1b_generate browser info'#010+
   '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
   '**1C<x>_code generation options:'#010+
-  '**2CD_create also dynamic library (not suppor','ted)'#010+
+  '**2CD_create also dynamic library (not suppo','rted)'#010+
   '**2Ce_Compilation with emulated floating point opcodes'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_omit linking stage'#010+
   '**2Co_check overflow of integer operations'#010+
   '**2Cr_range checking'#010+
-  '**2CR_verify object m','ethod call validity'#010+
+  '**2CR_verify object ','method call validity'#010+
   '**2Cs<n>_set stack size to <n>'#010+
   '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
@@ -688,27 +688,27 @@ const msgtxt : array[0..000142,1..240] of char=(
   '*O1D_generate a DEF file'#010+
   '*O2Dd<x>_set description to <x>'#010+
   '*O2Dw_PM application'#010+
-  '**1e<x>_set path to e','xecutable'#010+
+  '**1e<x>_set path to ','executable'#010+
   '**1E_same as -Cn'#010+
   '**1F<x>_set file names and paths:'#010+
   '**2FD<x>_sets the directory where to search for compiler utilities'#010+
   '**2Fe<x>_redirect error output to <x>'#010+
   '**2FE<x>_set exe/unit output path to <x>'#010+
-  '**2Fi<x>_adds <x> to include path',#010+
+  '**2Fi<x>_adds <x> to include pat','h'#010+
   '**2Fl<x>_adds <x> to library path'#010+
   '*L2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
   '**2Fr<x>_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
-  '*g1g_generate de','bugger information:'#010+
+  '*g1g_generate d','ebugger information:'#010+
   '*g2gg_use gsym'#010+
   '*g2gd_use dbx'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
   '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gc_generate checks for pointers'#010+
   '**1i_information'#010+
-  '**2iD_return compiler date'#010,
+  '**2iD_return compiler date',#010+
   '**2iV_return compiler version'#010+
   '**2iSO_return compiler OS'#010+
   '**2iSP_return compiler processor'#010+
@@ -717,79 +717,78 @@ const msgtxt : array[0..000142,1..240] of char=(
   '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
-  '**1n_don'#039't read ','the default config file'#010+
+  '**1n_don'#039't read',' the default config file'#010+
   '**1o<x>_change the name of the executable produced to <x>'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
   '*L1P_use pipes instead of creating temporary assembler files'#010+
   '**1S<x>_syntax options:'#010+
-  '**2S2_switch ','some Delphi 2 extensions on'#010+
+  '**2S2_switch',' some Delphi 2 extensions on'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
   '**2Sd_tries to be Delphi compatible'#010+
   '**2Se<x>_compiler stops after the <x> errors (default is 1)'#010+
   '**2Sg_allow LABEL and GOTO'#010+
-  '**2Sh_Use',' ansistrings'#010+
+  '**2Sh_Us','e ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2Sm_support macros like C (global)'#010+
   '**2So_tries to be TP/BP 7.0 compatible'#010+
   '**2Sp_tries to be gpc compatible'#010+
   '**2Ss_constructor name must be init (destructor must be done)'#010+
-  '**2St_allow static keywo','rd in objects'#010+
+  '**2St_allow static keyw','ord in objects'#010+
   '**1s_don'#039't call assembler and linker (only with -a)'#010+
   '**2st_Generate script to link on target'#010+
   '**2sh_Generate script to link on host'#010+
   '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
   '**2Un_don'#039't check the unit name'#010+
-  '**2Ur_genera','te release unit files'#010+
+  '**2Ur_gener','ate release unit files'#010+
   '**2Us_compile a system unit'#010+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_e : Show errors (default)       d : Show debug info'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
-  '**2*_n : S','how notes                  t : Show tried/used files'#010+
+  '**2*_n : ','Show notes                  t : Show tried/used files'#010+
   '**2*_h : Show hints                  m : Show defined macros'#010+
   '**2*_i : Show general info           p : Show compiled procedures'#010+
-  '**2*_l : Show linenumbers            c : Show conditionals'#010+
-  '*','*2*_a : Show everything             0 : Show nothing (except errors'+
-  ')'#010+
+  '**2*_l : Show linenumbers            c : Show conditionals'#010,
+  '**2*_a : Show everything             0 : Show nothing (except errors)'#010+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
   '**2*_    occurs'#010+
-  '**1V_write fpcd','ebug.txt file with lots of debugging info'#010+
+  '**1V_write fpc','debug.txt file with lots of debugging info'#010+
   '**1X_executable options:'#010+
   '*L2Xc_link with the c library'#010+
   '**2Xs_strip all symbols from executable'#010+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
-  '**2XS_try to link static (default) (defin','es FPC_LINK_STATIC)'#010+
+  '**2XS_try to link static (default) (defi','nes FPC_LINK_STATIC)'#010+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#010+
   '**0*_Processor specific options:'#010+
   '3*1A<x>_output format:'#010+
   '3*2Aas_assemble using GNU AS'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_elf32 (Linux) file u','sing Nasm'#010+
+  '3*2Anasmelf_elf32 (Linux) file ','using Nasm'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
   '3*2Amasm_obj file using Masm (Microsoft)'#010+
   '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
-  '3*1R<x>_assembler reading',' style:'#010+
+  '3*1R<x>_assembler readin','g style:'#010+
   '3*2Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
   '3*2Rdirect_copy assembler text directly to assembler file'#010+
   '3*1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
-  '3*2Or_keep cert','ain variables in registers'#010+
+  '3*2Or_keep cer','tain variables in registers'#010+
   '3*2Ou_enable uncertain optimizations (see docs)'#010+
   '3*2O1_level 1 optimizations (quick optimizations)'#010+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
-  '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010,
+  '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)',#010+
   '3*2Op<x>_target processor:'#010+
   '3*3Op1_set target processor to 386/486'#010+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '3*1T<x>_Target operating system:'#010+
-  '3*2TGO32V2_version 2 of DJ Delor','ie DOS extender'#010+
+  '3*2TGO32V2_version 2 of DJ Delo','rie DOS extender'#010+
   '3*2TWDOSX DOS 32 Bit Extender'#010+
   '3*2TLINUX_Linux'#010+
   '3*2Tnetware_Novell Netware Module (experimental)'#010+
@@ -797,12 +796,12 @@ const msgtxt : array[0..000142,1..240] of char=(
   '3*2TSUNOS_SunOS/Solaris'#010+
   '3*2TWin32_Windows 32 Bit'#010+
   '3*1W<x>_Win32 target options'#010+
-  '3*2WB<x>_Set Image base to Hexadec','imal <x> value'#010+
+  '3*2WB<x>_Set Image base to Hexade','cimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
   '3*2WF_Specify full-screen type application (OS/2 only)'#010+
   '3*2WG_Specify graphic type application'#010+
-  '3*2WN_Do not generate relocation code (n','ecessary for debugging)'#010+
+  '3*2WN_Do not generate relocation code (','necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   '6*1A<x>_output format'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
@@ -810,13 +809,13 @@ const msgtxt : array[0..000142,1..240] of char=(
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   '6*1O_optimizations:'#010+
-  '6*2Oa_turn on t','he optimizer'#010+
+  '6*2Oa_turn on ','the optimizer'#010+
   '6*2Og_generate smaller code'#010+
   '6*2OG_generate faster code (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
   '6*2O0_set target processor to a MC68000'#010+
   '6*2O2_set target processor to a MC68020+ (default)'#010+
-  '6*1R<x>_assembler reading style',':'#010+
+  '6*1R<x>_assembler reading styl','e:'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
   '6*2TAMIGA_Commodore Amiga'#010+
@@ -826,5 +825,5 @@ const msgtxt : array[0..000142,1..240] of char=(
   '6*2TPALMOS_PalmOS'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+
-  '**1h_shows this help with','out waiting'#000
+  '**1h_shows this help wit','hout waiting'#000
 );

+ 20 - 2
compiler/ncal.pas

@@ -198,7 +198,6 @@ type
         speedvalue : cardinal;
         srsym      : tprocsym;
         s          : string;
-        srpdl      : pprocdeflist;
         objdef     : tobjectdef;
       begin
         if aprocsym.overloadchecked then
@@ -494,6 +493,19 @@ type
                end
               else
                begin
+                 { for ordinals, floats and enums, verify if we might cause
+                   some range-check errors. }
+                 if (left.resulttype.def.deftype in [enumdef,orddef,floatdef]) and 
+                    (left.nodetype in [vecn,loadn,calln]) then
+                   begin
+                      if (left.resulttype.def.size > defcoll.paratype.def.size) then
+                        begin 
+                          if (cs_check_range in aktlocalswitches) then
+                             Message(type_w_smaller_possible_range_check)
+                          else
+                             Message(type_h_smaller_possible_range_check);
+                        end;
+                   end;
                  inserttypeconv(left,defcoll.paratype);
                end;
               if codegenerror then
@@ -2845,7 +2857,13 @@ begin
 end.
 {
   $Log$
-  Revision 1.115  2002-12-06 17:51:10  peter
+  Revision 1.116  2002-12-07 14:27:07  carl
+    * 3% memory optimization
+    * changed some types
+    + added type checking with different size for call node and for
+       parameters
+
+  Revision 1.115  2002/12/06 17:51:10  peter
     * merged cdecl and array fixes
 
   Revision 1.114  2002/12/06 16:56:58  peter

+ 8 - 2
compiler/nld.pas

@@ -687,7 +687,7 @@ implementation
         else
           begin
            { get the size before the type conversion - check for all nodes }
-           if assigned(right.resulttype.def) and (right.nodetype in [loadn,vecn]) then
+           if assigned(right.resulttype.def) and (right.nodetype in [loadn,vecn,calln]) then
               original_size := right.resulttype.def.size;
            inserttypeconv(right,left.resulttype);
           end;
@@ -1244,7 +1244,13 @@ begin
 end.
 {
   $Log$
-  Revision 1.70  2002-12-02 19:38:06  carl
+  Revision 1.71  2002-12-07 14:27:07  carl
+    * 3% memory optimization
+    * changed some types
+    + added type checking with different size for call node and for
+       parameters
+
+  Revision 1.70  2002/12/02 19:38:06  carl
     * fix some errors
 
   Revision 1.69  2002/11/29 20:02:44  carl

+ 9 - 1
compiler/pdecsub.pas

@@ -2056,6 +2056,8 @@ const
                end
               else
                begin
+                 if not assigned(aprocdef.localst) then
+                  aprocdef.insert_localst;
                  aprocdef.localst.insert(otsym);
                  aprocdef.localst.insertvardata(otsym);
                end;
@@ -2074,7 +2076,13 @@ const
 end.
 {
   $Log$
-  Revision 1.86  2002-12-06 17:51:10  peter
+  Revision 1.87  2002-12-07 14:27:07  carl
+    * 3% memory optimization
+    * changed some types
+    + added type checking with different size for call node and for
+       parameters
+
+  Revision 1.86  2002/12/06 17:51:10  peter
     * merged cdecl and array fixes
 
   Revision 1.85  2002/12/01 22:06:14  carl

+ 13 - 2
compiler/psub.pas

@@ -194,7 +194,7 @@ implementation
       begin
          { calculate the lexical level }
          inc(lexlevel);
-         if lexlevel>32 then
+         if lexlevel>maxnesting then
            Message(parser_e_too_much_lexlevel);
 
          { static is also important for local procedures !! }
@@ -249,6 +249,9 @@ implementation
               symtablestack:=aktprocdef.parast;
               symtablestack.symtablelevel:=lexlevel;
            end;
+         { create a local symbol table for this routine }
+         if not assigned(aktprocdef.localst) then
+            aktprocdef.insert_localst;
          { insert localsymtable in symtablestack}
          aktprocdef.localst.next:=symtablestack;
          symtablestack:=aktprocdef.localst;
@@ -462,6 +465,8 @@ implementation
                  vs:=tvarsym.create(s,vartype);
                  vs.fileinfo:=fileinfo;
                  vs.varspez:=varspez;
+                 if not assigned(aktprocdef.localst) then
+                    aktprocdef.insert_localst;
                  aktprocdef.localst.insert(vs);
                  aktprocdef.localst.insertvardata(vs);
                  include(vs.varoptions,vo_is_local_copy);
@@ -799,7 +804,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.79  2002-11-25 18:43:32  carl
+  Revision 1.80  2002-12-07 14:27:09  carl
+    * 3% memory optimization
+    * changed some types
+    + added type checking with different size for call node and for
+       parameters
+
+  Revision 1.79  2002/11/25 18:43:32  carl
    - removed the invalid if <> checking (Delphi is strange on this)
    + implemented abstract warning on instance creation of class with
       abstract methods.

+ 11 - 5
compiler/symbase.pas

@@ -97,11 +97,7 @@ interface
        public
           name      : pstring;
           realname  : pstring;
-          symtabletype : tsymtabletype;
-          { each symtable gets a number }
-          unitid    : word{integer give range check errors PM};
           datasize  : longint;
-          dataalignment : longint;
           symindex,
           defindex  : TIndexArray;
           symsearch : Tdictionary;
@@ -110,9 +106,13 @@ interface
           { only used for parameter symtable to determine the offset relative }
           { to the frame pointer and for local inline }
           address_fixup : longint;
+          symtabletype : tsymtabletype;
+          { each symtable gets a number }
+          unitid    : word;
           { this saves all definition to allow a proper clean up }
           { separate lexlevel from symtable type }
           symtablelevel : byte;
+          dataalignment : byte;
           constructor Create(const s:string);
           destructor  destroy;override;
           procedure clear;virtual;
@@ -348,7 +348,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.9  2002-10-02 20:51:59  peter
+  Revision 1.10  2002-12-07 14:27:09  carl
+    * 3% memory optimization
+    * changed some types
+    + added type checking with different size for call node and for
+       parameters
+
+  Revision 1.9  2002/10/02 20:51:59  peter
     * tsymtable.dump to dump the names in a symtable to stdout
 
   Revision 1.8  2002/09/09 17:34:15  peter

+ 33 - 13
compiler/symdef.pas

@@ -522,6 +522,11 @@ interface
           procedure setmangledname(const s : string);
           procedure load_references(ppufile:tcompilerppufile;locals:boolean);
           function  write_references(ppufile:tcompilerppufile;locals:boolean):boolean;
+          { inserts the local symbol table, if this is not 
+            no local symbol table is built. Should be called only
+            when we are sure that a local symbol table will be required.
+          }
+          procedure insert_localst;
           function  fullprocname:string;
           function fullprocnamewithret:string;
           function  cplusplusmangledname : string;
@@ -1273,7 +1278,12 @@ implementation
       begin
          inherited ppuwritedef(ppufile);
          if string_typ=st_shortstring then
-           ppufile.putbyte(len)
+           begin
+{$ifdef extdebug}
+            if len > 255 then internalerror(12122002);
+{$endif}
+            ppufile.putbyte(byte(len))
+           end
          else
            ppufile.putlongint(len);
          case string_typ of
@@ -3041,6 +3051,8 @@ implementation
       end;
 
 
+
+
     { all functions returning in FPU are
       assume to use 2 FPU registers
       until the function implementation
@@ -3266,14 +3278,10 @@ implementation
          fileinfo:=aktfilepos;
          extnumber:=$ffff;
          aliasnames:=tstringlist.create;
-         localst:=tlocalsymtable.create;
          parast:=tparasymtable.create;
          funcretsym:=nil;
-         localst.defowner:=self;
+         localst := nil;
          parast.defowner:=self;
-         { this is used by insert
-           to check same names in parast and localst }
-         localst.next:=parast;
          defref:=nil;
          lastwritten:=nil;
          refcount:=0;
@@ -3480,6 +3488,17 @@ implementation
       end;
 
 
+    procedure tprocdef.insert_localst;
+     begin
+         localst:=tlocalsymtable.create;
+         localst.defowner:=self;
+         { this is used by insert
+           to check same names in parast and localst }
+         localst.next:=parast;
+     end;
+
+
+
     function tprocdef.fullprocname:string;
       var
         s : string;
@@ -3543,7 +3562,7 @@ implementation
 
 
     Const
-      local_symtable_index : longint = $8001;
+      local_symtable_index : word = $8001;
 
     function tprocdef.write_references(ppufile:tcompilerppufile;locals:boolean):boolean;
       var
@@ -4048,11 +4067,6 @@ implementation
                               TOBJECTDEF
 ***************************************************************************}
 
-{$ifdef GDB}
-    const
-       vtabletype : word = 0;
-       vtableassigned : boolean = false;
-{$endif GDB}
 
    constructor tobjectdef.create(ot : tobjectdeftype;const n : string;c : tobjectdef);
      begin
@@ -5500,7 +5514,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.114  2002-12-01 22:05:27  carl
+  Revision 1.115  2002-12-07 14:27:09  carl
+    * 3% memory optimization
+    * changed some types
+    + added type checking with different size for call node and for
+       parameters
+
+  Revision 1.114  2002/12/01 22:05:27  carl
     * no more warnings for structures over 32K since this is
       handled correctly in this version of the compiler.
 

+ 10 - 4
compiler/symsym.pas

@@ -52,14 +52,14 @@ interface
        protected
           _mangledname : pstring;
        public
-{$ifdef GDB}
-          isstabwritten : boolean;
-{$endif GDB}
           refs          : longint;
           lastref,
           defref,
           lastwritten : tref;
           refcount    : longint;
+{$ifdef GDB}
+          isstabwritten : boolean;
+{$endif GDB}
           constructor create(const n : string);
           constructor loadsym(ppufile:tcompilerppufile);
           destructor destroy;override;
@@ -2460,7 +2460,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.80  2002-12-06 17:51:11  peter
+  Revision 1.81  2002-12-07 14:27:10  carl
+    * 3% memory optimization
+    * changed some types
+    + added type checking with different size for call node and for
+       parameters
+
+  Revision 1.80  2002/12/06 17:51:11  peter
     * merged cdecl and array fixes
 
   Revision 1.79  2002/11/27 20:04:10  peter

+ 10 - 4
compiler/symtable.pas

@@ -154,8 +154,8 @@ interface
 
        tglobalsymtable = class(tabstractunitsymtable)
        public
-          unittypecount : word;
           unitsym       : tunitsym;
+          unittypecount : word;
           constructor create(const n : string);
           destructor  destroy;override;
           procedure ppuload(ppufile:tcompilerppufile);override;
@@ -203,7 +203,7 @@ interface
        systemunit     : tglobalsymtable; { pointer to the system unit }
        read_member    : boolean;        { reading members of an symtable }
 
-       lexlevel       : longint;       { level of code }
+       lexlevel       : byte;          { level of code }
                                        { 1 for main procedure }
                                        { 2 for normal function or proc }
                                        { higher for locals }
@@ -368,7 +368,7 @@ implementation
          ppufile.getlongint;
          { load datasize,dataalignment of this symboltable }
          datasize:=ppufile.getlongint;
-         dataalignment:=ppufile.getlongint;
+         dataalignment:=byte(ppufile.getlongint);
       { now read the symbols }
          repeat
            b:=ppufile.readentry;
@@ -2338,7 +2338,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.84  2002-12-06 17:51:11  peter
+  Revision 1.85  2002-12-07 14:27:10  carl
+    * 3% memory optimization
+    * changed some types
+    + added type checking with different size for call node and for
+       parameters
+
+  Revision 1.84  2002/12/06 17:51:11  peter
     * merged cdecl and array fixes
 
   Revision 1.83  2002/11/30 11:12:48  carl