* cs_create_smart instead of cs_smartlink

  * -CX is create smartlink
  * -CD is create dynamic, but does nothing atm.

compiler/aasm.pas

@@ -829,7 +829,7 @@ uses
       begin;
         labelnr:=nextlabelnr;
         inc(nextlabelnr);
-        if (cs_smartlink in aktmoduleswitches) then
+        if (cs_create_smart in aktmoduleswitches) then
           inherited init('_$'+current_module^.modulename^+'$_L'+tostr(labelnr),AS_GLOBAL)
         else
           inherited init(target_asm.labelprefix+tostr(labelnr),AS_LOCAL);
@@ -987,7 +987,12 @@ uses
 end.
 {
   $Log$
-  Revision 1.63  1999-09-16 23:05:51  florian
+  Revision 1.64  1999-09-20 16:38:51  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.63  1999/09/16 23:05:51  florian
     * m68k compiler is again compilable (only gas writer, no assembler reader)
 
   Revision 1.62  1999/09/15 20:35:37  florian

compiler/cg386con.pas

@@ -109,7 +109,7 @@ implementation
                      begin
                         getdatalabel(lastlabel);
                         p^.lab_real:=lastlabel;
-                        if (cs_smartlink in aktmoduleswitches) then
+                        if (cs_create_smart in aktmoduleswitches) then
                          consts^.concat(new(pai_cut,init));
                         consts^.concat(new(pai_label,init(lastlabel)));
                         case realait of
@@ -247,7 +247,7 @@ implementation
                 begin
                    getdatalabel(lastlabel);
                    p^.lab_str:=lastlabel;
-                   if (cs_smartlink in aktmoduleswitches) then
+                   if (cs_create_smart in aktmoduleswitches) then
                     consts^.concat(new(pai_cut,init));
                    consts^.concat(new(pai_label,init(lastlabel)));
                    { generate an ansi string ? }
@@ -381,7 +381,7 @@ implementation
                begin
                  getdatalabel(lastlabel);
                  p^.lab_set:=lastlabel;
-                 if (cs_smartlink in aktmoduleswitches) then
+                 if (cs_create_smart in aktmoduleswitches) then
                   consts^.concat(new(pai_cut,init));
                  consts^.concat(new(pai_label,init(lastlabel)));
                  if psetdef(p^.resulttype)^.settype=smallset then
@@ -417,7 +417,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.40  1999-09-04 20:53:06  florian
+  Revision 1.41  1999-09-20 16:38:52  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.40  1999/09/04 20:53:06  florian
     * bug 580 fixed
 
   Revision 1.39  1999/08/04 00:22:45  florian

compiler/cg386set.pas

@@ -752,7 +752,7 @@ implementation
       begin
          getlabel(endlabel);
          getlabel(elselabel);
-         if (cs_smartlink in aktmoduleswitches) then
+         if (cs_create_smart in aktmoduleswitches) then
            jumpsegment:=procinfo.aktlocaldata
          else
            jumpsegment:=datasegment;
@@ -919,7 +919,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.40  1999-08-25 11:59:47  jonas
+  Revision 1.41  1999-09-20 16:38:52  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.40  1999/08/25 11:59:47  jonas
     * changed pai386, paippc and paiapha (same for tai*) to paicpu (taicpu)
 
   Revision 1.39  1999/08/23 23:46:42  pierre

compiler/cg68kcon.pas

@@ -95,7 +95,7 @@ implementation
                 begin
                    getdatalabel(lastlabel);
                    p^.lab_real:=lastlabel;
-                   if (cs_smartlink in aktmoduleswitches) then
+                   if (cs_create_smart in aktmoduleswitches) then
                     consts^.concat(new(pai_cut,init));
                    consts^.concat(new(pai_label,init(lastlabel)));
                    case realait of
@@ -200,7 +200,7 @@ implementation
                 begin
                    getdatalabel(lastlabel);
                    p^.lab_str:=lastlabel;
-                   if (cs_smartlink in aktmoduleswitches) then
+                   if (cs_create_smart in aktmoduleswitches) then
                     consts^.concat(new(pai_cut,init));
                    consts^.concat(new(pai_label,init(lastlabel)));
                    { generate an ansi string ? }
@@ -337,7 +337,7 @@ implementation
                begin
                  getdatalabel(lastlabel);
                  p^.lab_set:=lastlabel;
-                 if (cs_smartlink in aktmoduleswitches) then
+                 if (cs_create_smart in aktmoduleswitches) then
                   consts^.concat(new(pai_cut,init));
                  consts^.concat(new(pai_label,init(lastlabel)));
                  if psetdef(p^.resulttype)^.settype=smallset then
@@ -372,7 +372,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.6  1999-09-16 23:05:51  florian
+  Revision 1.7  1999-09-20 16:38:52  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.6  1999/09/16 23:05:51  florian
     * m68k compiler is again compilable (only gas writer, no assembler reader)
 
   Revision 1.5  1998/12/11 00:03:01  peter

compiler/errore.msg

@@ -1,7 +1,7 @@
 #
 #   $Id$
 #   This file is part of the Free Pascal Compiler
-#   Copyright (c) 1998 by the Free Pascal Development team
+#   Copyright (c) 1999 by the Free Pascal Development team
 #
 #   English (default) Language File for Free Pascal
 #
@@ -1158,26 +1158,55 @@ cg_e_cannot_call_message_direct=E_Cannot call message handler method directly
 # Assembler reader
 #
 asmr_d_start_reading=D_Starting $1 styled assembler parsing
+% This informs you that an assembler block is being parsed
 asmr_d_finish_reading=D_Finished $1 styled assembler parsing
+% This informs you that an assembler block has finished.
 asmr_e_none_label_contain_at=E_Non-label pattern contains @
+% A identifier which isn't a label can't contain a @.
 asmr_w_override_op_not_supported=W_Override operator not supported
+% The Override operator is not supported
 asmr_e_building_record_offset=E_Error building record offset
+% There has an error occured while building the offset of a record/object
+% structure, this can happend when there is no field specified at all or
+% an unknown field identifier is used.
 asmr_e_offset_without_identifier=E_OFFSET used without identifier
+% You can only use OFFSET with an identifier. Other syntaxes aren't
+% supported
 asmr_e_type_without_identifier=E_TYPE used without identifier
+% You can only use TYPE with an identifier. Other syntaxes aren't
+% supported
 asmr_e_no_local_or_para_allowed=E_Cannot use local variable or parameters here
+% You can't use a local variable or parameter here, mostly because the
+% addressing of locals and parameters is done using the %ebp register so the
+% address can't be get directly.
 asmr_e_need_offset=E_need to use OFFSET here
+% You need to use OFFSET <id> here to get the address of the identifier.
 asmr_e_cant_have_multiple_relocatable_symbols=E_Cannot use multiple relocatable symbols
+% You can't have more than one relocatable symbol (variable/typed constant)
+% in one argument.
 asmr_e_only_add_relocatable_symbol=E_Relocatable symbol can only be added
+% Relocatable symbols (variable/typed constant) can't be used with other
+% operators. Only addition is allowed.
 asmr_e_invalid_constant_expression=E_Invalid constant expression
+% There is an error in the constant expression.
 asmr_e_relocatable_symbol_not_allowed=E_Relocatable symbol is not allowed
+% You can't use a relocatable symbol (variable/typed constant) here.
 asmr_e_invalid_reference_syntax=E_Invalid reference syntax
-asmr_e_local_symbol_not_allowed_as_ref=E_Local symbols not allowed as references
+% There is an error in the reference.
+asmr_e_local_label_not_allowed_as_ref=E_Local symbols/labels aren't allowed as references
+% You can't use local symbols/labels as references
 asmr_e_wrong_base_index=E_Invalid base and index register usage
+% There is an error with the base and index register
 asmr_e_wrong_scale_factor=E_Wrong scale factor specified
+% The scale factor given is wrong, only 1,2,4 and 8 are allowed
 asmr_e_multiple_index=E_Multiple index register usage
+% You are trying to use more than one index register
 asmr_e_invalid_operand_type=E_Invalid operand type
+% The operand type doesn't match with the opcode used
 asmr_e_invalid_string_as_opcode_operand=E_Invalid string as opcode operand: $1
+% The string specified as operand is not correct with this opcode
 asmr_w_CODE_and_DATA_not_supported=W_@CODE and @DATA not supported
+% @CODE and @DATA are unsupported and are ignored.
 asmr_e_null_label_ref_not_allowed=E_Null label references are not allowed
 asmr_e_ev_zero_divide=F_Divide by zero in asm evaluator
 asmr_e_ev_stack_overflow=F_Evaluator stack overflow
@@ -1479,7 +1508,7 @@ option_switch_bin_to_src_assembler=N_Switching assembler to default source writi
 # Logo (option -l)
 #
 option_logo_start=Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET
-option_logo_end=Copyright (c) 1993-99 by Florian Klaempfl
+option_logo_end=Copyright (c) 1993-1999 by Florian Klaempfl
 
 #
 # Info (option -i)
@@ -1517,8 +1546,8 @@ ol013=**2Co_check overflow of integer operations
 ol014=**2Cr_range checking
 ol015=**2Cs<n>_set stack size to <n>
 ol016=**2Ct_stack checking
-ol017=3*2CS_create static library
-ol018=3*2Cx_use smartlinking
+ol017=**2CD_create also dynamic library (* doesn't work yet *)
+ol018=**2CX_create also smartlinked library
 ol019=**1d<x>_defines the symbol <x>
 ol020=*O1D_generate a DEF file
 ol021=*O2Dd<x>_set description to <x>
@@ -1553,7 +1582,7 @@ ol049=**1k<x>_Pass <x> to the linker
 ol050=**1l_write logo
 ol051=**1n_don't read the default config file
 ol052=**1o<x>_change the name of the executable produced to <x>
-ol053=**1pg_generate profile code for gprof
+ol053=**1pg_generate profile code for gprof (defines FPC_PROFILE)
 ol054=*L1P_use pipes instead of creating temporary assembler files
 ol055=**1S<x>_syntax options:
 ol056=**2S2_switch some Delphi 2 extensions on
@@ -1586,62 +1615,63 @@ ol082=**2*_    declarations if an error    x : Executable info (Win32 only)
 ol083=**2*_    occurs
 ol084=**1X_executable options:
 ol085=*L2Xc_link with the c library
-ol086=**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)
-ol087=**2Xs_strip all symbols from executable
-ol088=**2XS_link with static libraries (defines FPC_LINK_STATIC)
-ol089=**0*_Processor specific options:
-ol090=3*1A<x>_output format:
-ol091=3*2Aas_assemble using GNU AS
-ol092=3*2Aasaout_assemble using GNU AS for aout (Go32v1)
-ol093=3*2Anasmcoff_coff (Go32v2) file using Nasm
-ol094=3*2Anasmelf_elf32 (Linux) file using Nasm
-ol095=3*2Anasmobj_obj file using Nasm
-ol096=3*2Amasm_obj file using Masm (Microsoft)
-ol097=3*2Atasm_obj file using Tasm (Borland)
-ol098=3*2Acoff_coff (Go32v2) using internal writer
-ol099=3*2Apecoff_pecoff (Win32) using internal writer
-ol100=3*1R<x>_assembler reading style:
-ol101=3*2Ratt_read AT&T style assembler
-ol102=3*2Rintel_read Intel style assembler
-ol103=3*2Rdirect_copy assembler text directly to assembler file
-ol104=3*1O<x>_optimizations:
-ol105=3*2Og_generate smaller code
-ol106=3*2OG_generate faster code (default)
-ol107=3*2Or_keep certain variables in registers (still BUGGY!!!)
-ol108=3*2Ou_enable uncertain optimizations (see docs)
-ol109=3*2O1_level 1 optimizations (quick optimizations)
-ol110=3*2O2_level 2 optimizations (-O1 + slower optimizations)
-ol111=3*2O3_level 3 optimizations (same as -O2u)
-ol112=3*2Op<x>_target processor:
-ol113=3*3Op1_set target processor to 386/486
-ol114=3*3Op2_set target processor to Pentium/PentiumMMX (tm)
-ol115=3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)
-ol116=3*1T<x>_Target operating system:
-ol117=3*2TGO32V1_version 1 of DJ Delorie DOS extender
-ol118=3*2TGO32V2_version 2 of DJ Delorie DOS extender
-ol119=3*2TLINUX_Linux
-ol120=3*2TOS2_OS/2 2.x
-ol121=3*2TWin32_Windows 32 Bit
-ol122=6*1A<x>_output format
-ol123=6*2Aas_Unix o-file using GNU AS
-ol124=6*2Agas_GNU Motorola assembler
-ol125=6*2Amit_MIT Syntax (old GAS)
-ol126=6*2Amot_Standard Motorola assembler
-ol127=6*1O_optimizations:
-ol128=6*2Oa_turn on the optimizer
-ol129=6*2Og_generate smaller code
-ol130=6*2OG_generate faster code (default)
-ol131=6*2Ox_optimize maximum (still BUGGY!!!)
-ol132=6*2O2_set target processor to a MC68020+
-ol133=6*1R<x>_assembler reading style:
-ol134=6*2RMOT_read motorola style assembler
-ol135=6*1T<x>_Target operating system:
-ol136=6*2TAMIGA_Commodore Amiga
-ol137=6*2TATARI_Atari ST/STe/TT
-ol138=6*2TMACOS_Macintosh m68k
-ol139=6*2TLINUX_Linux-68k
-ol140=**1*_
-ol141=**1?_shows this help
+ol086=**2Xs_strip all symbols from executable
+ol087=**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)
+ol088=**2XS_try to link static (default) (defines FPC_LINK_STATIC)
+ol089=**2XX_try to link smart            (defines FPC_LINK_SMART)
+ol090=**0*_Processor specific options:
+ol091=3*1A<x>_output format:
+ol092=3*2Aas_assemble using GNU AS
+ol093=3*2Aasaout_assemble using GNU AS for aout (Go32v1)
+ol094=3*2Anasmcoff_coff (Go32v2) file using Nasm
+ol095=3*2Anasmelf_elf32 (Linux) file using Nasm
+ol096=3*2Anasmobj_obj file using Nasm
+ol097=3*2Amasm_obj file using Masm (Microsoft)
+ol098=3*2Atasm_obj file using Tasm (Borland)
+ol099=3*2Acoff_coff (Go32v2) using internal writer
+ol100=3*2Apecoff_pecoff (Win32) using internal writer
+ol101=3*1R<x>_assembler reading style:
+ol102=3*2Ratt_read AT&T style assembler
+ol103=3*2Rintel_read Intel style assembler
+ol104=3*2Rdirect_copy assembler text directly to assembler file
+ol105=3*1O<x>_optimizations:
+ol106=3*2Og_generate smaller code
+ol107=3*2OG_generate faster code (default)
+ol108=3*2Or_keep certain variables in registers (still BUGGY!!!)
+ol109=3*2Ou_enable uncertain optimizations (see docs)
+ol110=3*2O1_level 1 optimizations (quick optimizations)
+ol111=3*2O2_level 2 optimizations (-O1 + slower optimizations)
+ol112=3*2O3_level 3 optimizations (same as -O2u)
+ol113=3*2Op<x>_target processor:
+ol114=3*3Op1_set target processor to 386/486
+ol115=3*3Op2_set target processor to Pentium/PentiumMMX (tm)
+ol116=3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)
+ol117=3*1T<x>_Target operating system:
+ol118=3*2TGO32V1_version 1 of DJ Delorie DOS extender
+ol119=3*2TGO32V2_version 2 of DJ Delorie DOS extender
+ol120=3*2TLINUX_Linux
+ol121=3*2TOS2_OS/2 2.x
+ol122=3*2TWin32_Windows 32 Bit
+ol123=6*1A<x>_output format
+ol124=6*2Aas_Unix o-file using GNU AS
+ol125=6*2Agas_GNU Motorola assembler
+ol126=6*2Amit_MIT Syntax (old GAS)
+ol127=6*2Amot_Standard Motorola assembler
+ol128=6*1O_optimizations:
+ol129=6*2Oa_turn on the optimizer
+ol130=6*2Og_generate smaller code
+ol131=6*2OG_generate faster code (default)
+ol132=6*2Ox_optimize maximum (still BUGGY!!!)
+ol133=6*2O2_set target processor to a MC68020+
+ol134=6*1R<x>_assembler reading style:
+ol135=6*2RMOT_read motorola style assembler
+ol136=6*1T<x>_Target operating system:
+ol137=6*2TAMIGA_Commodore Amiga
+ol138=6*2TATARI_Atari ST/STe/TT
+ol139=6*2TMACOS_Macintosh m68k
+ol140=6*2TLINUX_Linux-68k
+ol141=**1*_
+ol142=**1?_shows this help
 ol_end=**1h_shows this help without waiting
 #
 # The End...

compiler/globtype.pas

@@ -81,7 +81,7 @@ interface
          cs_profile,cs_debuginfo,cs_browser,cs_local_browser,cs_compilesystem,
          cs_lineinfo,
          { linking }
-         cs_smartlink
+         cs_create_smart,cs_create_dynamic
        );
        tmoduleswitches = set of tmoduleswitch;
 
@@ -179,7 +179,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.18  1999-09-08 16:05:32  peter
+  Revision 1.19  1999-09-20 16:38:54  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.18  1999/09/08 16:05:32  peter
     * pointer add/sub is now as expected and the same results as inc/dec
 
   Revision 1.17  1999/08/13 15:44:58  peter

compiler/msgidx.inc

@@ -324,7 +324,7 @@ type tmsgconst=(
   asmr_e_invalid_constant_expression,
   asmr_e_relocatable_symbol_not_allowed,
   asmr_e_invalid_reference_syntax,
-  asmr_e_local_symbol_not_allowed_as_ref,
+  asmr_e_local_label_not_allowed_as_ref,
   asmr_e_wrong_base_index,
   asmr_e_wrong_scale_factor,
   asmr_e_multiple_index,
@@ -643,6 +643,7 @@ type tmsgconst=(
   ol139,
   ol140,
   ol141,
+  ol142,
   ol_end,
 endmsgconst
 );

compiler/msgtxt.inc

@@ -345,45 +345,45 @@ const msgtxt : array[0..000102,1..240] of char=(
   'E_Invali','d constant expression'#000+
   'E_Relocatable symbol is not allowed'#000+
   'E_Invalid reference syntax'#000+
-  'E_Local symbols not allowed as references'#000+
+  'E_Local symbols/labels aren'#039't allowed as references'#000+
   'E_Invalid base and index register usage'#000+
   'E_Wrong scale factor specified'#000+
-  'E_Multiple index register usage'#000+
-  'E_Invalid ','operand type'#000+
+  'E_Multiple index register usage'#000,
+  'E_Invalid operand type'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
   'E_Null label references are not allowed'#000+
   'F_Divide by zero in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
-  'F_Invalid numeric format in',' asm evaluator'#000+
+  'F_Invalid numeric',' format in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
   'E_escape sequence ignored: $1'#000+
   'E_Invalid symbol reference'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
   'W_Calling an overload function in assembler'#000+
-  'E_Unsupported symbol type for operand'#000+
-  'E','_Constant value out of bounds'#000+
+  'E_Unsupported symbol type for',' operand'#000+
+  'E_Constant value out of bounds'#000+
   'E_Error converting decimal $1'#000+
   'E_Error converting octal $1'#000+
   'E_Error converting binary $1'#000+
   'E_Error converting hexadecimal $1'#000+
   'H_$1 translated to $2'#000+
   'W_$1 is associated to an overloaded function'#000+
-  'E_Cannot use SELF outs','ide a method'#000+
+  'E_Cannot use',' SELF outside a method'#000+
   'E_Cannot use OLDEBP outside a nested procedure'#000+
   'W_Functions with void return value can'#039't return any value in asm c'+
   'ode'#000+
   'E_SEG not supported'#000+
   'E_Size suffix and destination or source size do not match'#000+
-  'W_Size suffix and destination or',' source size do not match'#000+
+  'W_Size suffix and dest','ination or source size do not match'#000+
   'E_Assembler syntax error'#000+
   'E_Invalid combination of opcode and operands'#000+
   'E_Assemler syntax error in operand'#000+
   'E_Assemler syntax error in constant'#000+
   'E_Invalid String expression'#000+
-  '32bit constant created for address'#000+
-  'E_Invalid ','or missing opcode'#000+
+  '32bit constant created for address'#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_Too many operands on line'#000+
@@ -391,67 +391,67 @@ const msgtxt : array[0..000102,1..240] of char=(
   'W_FAR ignored'#000+
   'E_Duplicate local symbol $1'#000+
   'E_Undefined local symbol $1'#000+
-  'E_Unknown lab','el identifier $1'#000+
+  'E_U','nknown label identifier $1'#000+
   'E_Invalid floating point register name'#000+
   'E_NOR not supported'#000+
   'W_Modulo not supported'#000+
   'E_Invalid floating point constant $1'#000+
   'E_Invalid floating point expression'#000+
   'E_Wrong symbol type'#000+
-  'E_Cannot index a local var or parameter with a r','egister'#000+
+  'E_Cannot index a local var or paramete','r with a register'#000+
   'E_Invalid segment override expression'#000+
   'W_Identifier $1 supposed external'#000+
   'E_Strings not allowed as constants'#000+
   'No type of variable specified'#000+
   'E_assembler code not returned to text section'#000+
   'E_Not a directive or local symbol $1'#000+
-  'E_Using a de','fined name as a local label'#000+
+  'E_','Using a defined name as a local label'#000+
   'E_Dollar token is used without an identifier'#000+
   'W_32bit constant created for address'#000+
   'N_.align is target specific, use .balign or .p2align'#000+
   'E_Can'#039't access fields directly for parameters'#000+
-  'E_Can'#039't access fields of object','s/classes directly'#000+
+  'E_Can'#039't access fields',' of objects/classes directly'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'F_Comp not supported'#000+
   'F_Direct not support for binary writers'#000+
   'E_Allocating of data is only allowed in bss section'#000+
   'F_No binary writer selected'#000+
-  'E_Asm: Opco','de $1 not in table'#000+
+  'E','_Asm: Opcode $1 not in table'#000+
   'E_Asm: $1 invalid combination of opcode and operands'#000+
   'E_Asm: 16 Bit references not supported'#000+
   'E_Asm: Invalid effective address'#000+
   'E_Asm: Immediate or reference expected'#000+
   'E_Asm: $1 value exceeds bounds $2'#000+
-  'E_Asm: Short jump is ou','t of range $1'#000+
+  'E_Asm: Short ','jump is out of range $1'#000+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $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+
   'W_Error while assembling exitcode $1'#000+
-  'W_Can'#039't call the ','assembler, error $1 switching to external assem'+
+  'W_Can'#039't',' call the assembler, error $1 switching to external assem'+
   'bling'#000+
   'I_Assembling $1'#000+
   'I_Assembling smartlink $1'#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_Library $1 not found, Linking',' may fail !'#000+
+  'W_Library $1 not foun','d, 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_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
-  'I_Closing scr','ipt $1'#000+
+  'I_C','losing script $1'#000+
   'W_resource compiler not found, switching to external mode'#000+
   'I_Compiling resource $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 uninitialized dat','a: $1 bytes'#000+
+  'X_Size of uniniti','alized data: $1 bytes'#000+
   'X_Stack space reserved: $1 bytes'#000+
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
@@ -461,8 +461,8 @@ const msgtxt : array[0..000102,1..240] of char=(
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
   'U_PPU File too short'#000+
-  'U_PPU Invalid Header (no PPU at the begin)'#000+
-  'U_PP','U Invalid Version $1'#000+
+  'U_PPU Invalid Header (no PPU at the b','egin)'#000+
+  'U_PPU Invalid 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+
@@ -470,203 +470,204 @@ const msgtxt : array[0..000102,1..240] of char=(
   'F_Can'#039't Write PPU-File'#000+
   'F_reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
-  'F_Invalid PPU-File entry: $1'#000+
-  'F_PPU Dbx ','count problem'#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_Circular unit reference between $1 and $2'#000+
   'F_Can'#039't compile unit $1, no sources available'#000+
   'F_Can'#039't find unit $1'#000+
   'W_Unit $1 was not found but $2 exists'#000+
-  'F_Unit $1 searched but $2 found'#000+
-  'W_Co','mpiling the system unit requires the -Us switch'#000+
+  'F_Unit $1 searched but $2 ','found'#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_Recompiling $1, source found only'#000+
-  'U_Recompiling unit, static lib is ol','der than ppufile'#000+
+  'U_Recompiling unit, static',' 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_Parsing interface of $1'#000+
   'U_Parsing implementation of $1'#000+
-  'U_Second load fo','r unit $1'#000+
+  'U_Seco','nd load for unit $1'#000+
   'U_PPU Check file $1 time $2'#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+
   'F_No source file name in command line'#000+
-  'E_Illegal para','meter: $1'#000+
+  'E_Il','legal parameter: $1'#000+
   'H_-? writes help pages'#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_Shared libs not supported on DOS platform, reverting to static'#000+
-  'F_too many IF(N)DEFs'#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+
   'E_You are using the obsolete switch $1'#000+
-  'E_You are using the obsolete switch $1, pleas','e use $2'#000+
+  'E_You are using the obsolete switch',' $1, please use $2'#000+
   'N_Switching assembler to default source writing assembler'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
-  'Copyright (c) 1993-99 by Florian Klaempfl'#000+
+  'Copyright (c) 1993-1999 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
-  'Compiler Date  : $FPCDATE'#000+
-  'Comp','iler Target: $FPCTARGET'#000+
+  'Compiler Date  : $','FPCDATE'#000+
+  'Compiler Target: $FPCTARGET'#000+
   #000+
   'This program comes under the GNU General Public Licence'#000+
   'For more information read COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
   '                 [email protected]'#000+
-  '**0*_put + after a boolean switch opt','ion to enable it, - to disable '+
+  '**0*_put + after a boolea','n switch option to enable it, - to disable '+
   'it'#000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
   '**2ar_list register allocation/release info in assembler file'#000+
-  '**2at_list temp allocation/release i','nfo in assembler file'#000+
+  '**2at_list temp allocati','on/release info in assembler file'#000+
   '**1b_generate browser info'#000+
   '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
   '**1C<x>_code generation options:'#000+
   '3*2CD_create dynamic library'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
-  '**2Ci_IO-checking'#000+
-  '**2','Cn_omit linking stage'#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+
-  '3*2CS_create static library'#000+
-  '3*2Cx_use smartlinking'#000+
+  '**2CD_create also dynamic library (* doesn'#039't work yet *)'#000+
+  '**2CX_create also smartlinked lib','rary'#000+
   '**1d<x>_defines the symbol <x>'#000+
-  '*O1D_generate a DEF ','file'#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<x>_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+
+  '**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+
   '**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> to object path'#000+
-  '**2Fr<x>_load error message file <x>'#000+
-  '**2Fu<x>_adds <x> to',' unit path'#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<x>_generate debugger information:'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
   '*g2gh_use heap trace unit'#000+
-  '*g2gc_generate checks for pointers'#000+
+  '*g2gc_generate checks for p','ointers'#000+
   '**1i_information'#000+
   '**2iD_return compiler date'#000+
-  '**2i','V_return compiler version'#000+
+  '**2iV_return compiler version'#000+
   '**2iSO_return compiler OS'#000+
   '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#000+
   '**2iTP_return target processor'#000+
   '**1I<x>_adds <x> to include path'#000+
-  '**1k<x>_Pass <x> to the linker'#000+
+  '**1k<x>_Pas','s <x> to the linker'#000+
   '**1l_write logo'#000+
-  '**1n_don'#039't read the ','default config file'#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 profile code for gprof'#000+
-  '*L1P_use pipes instead of creating temporary assembler files'#000+
+  '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#000+
+  '*L1P_use pipes instead of creating temporary a','ssembler files'#000+
   '**1S<x>_syntax options:'#000+
-  '**2S2_switch some Delphi 2 extensions o','n'#000+
+  '**2S2_switch some Delphi 2 extensions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
   '**2Se<x>_compiler stops after the <x> errors (default is 1)'#000+
-  '**2Sg_allow LABEL and GOTO'#000+
+  '**2Sg_allow LA','BEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
   '**2Si_support C++ styled INLINE'#000+
-  '**2Sm_suppo','rt macros like C (global)'#000+
+  '**2Sm_support 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 (destructor must be done)'#000+
-  '**2St_allow static keyword in objects'#000+
-  '**1s_don'#039't call assembler and linker (only',' with -a)'#000+
+  '**','2St_allow static keyword in objects'#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+
   '**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 files'#000+
-  '**2*_h : Show hints                  m : Show defined macros'#000+
-  '**2*_i : Show general info           p : Show compiled',' procedures'#000+
+  '**2*_h : Show hints                  ','m : Show defined macros'#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*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
-  '**2*_    declarations if an e','rror    x : Executable info (Win32 only'+
-  ')'#000+
+  '**2*_b : Show all pro','cedure          r : Rhide/GCC compatibility 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+
-  '**2XS_link with static libr','aries (defines FPC_LINK_STATIC)'#000+
+  '**2XD_try ','to link dynamic          (defines FPC_LINK_DYNAMIC)'#000+
+  '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#000+
+  '**2XX_try to link smart            (defines FPC_LINK_SMART)'#000+
   '**0*_Processor specific options:'#000+
   '3*1A<x>_output format:'#000+
-  '3*2Aas_assemble using GNU AS'#000+
+  '3*2Aas_asse','mble using GNU AS'#000+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#000+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#000+
-  '3*2Anasmelf_elf32 (Linux) fil','e using Nasm'#000+
+  '3*2Anasmelf_elf32 (Linux) file using Nasm'#000+
   '3*2Anasmobj_obj file using Nasm'#000+
   '3*2Amasm_obj file using Masm (Microsoft)'#000+
-  '3*2Atasm_obj file using Tasm (Borland)'#000+
+  '3*2Atasm_obj ','file using Tasm (Borland)'#000+
   '3*2Acoff_coff (Go32v2) using internal writer'#000+
   '3*2Apecoff_pecoff (Win32) using internal writer'#000+
-  '3*1R<x>_assembler read','ing style:'#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 a','ssembler 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 c','ertain 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*2O','1_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*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op<x>_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*2TGO32V1_version 1 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*2TOS2_OS/2 2','.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
   '6*1A<x>_output format'#000+
   '6*2Aas_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
-  '6*2Amit_MIT Syntax (old GAS)',#000+
+  '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations:'#000+
   '6*2Oa_turn on the optimizer'#000+
-  '6*2Og_generate smaller code'#000+
+  '6*2Og_generate',' smaller code'#000+
   '6*2OG_generate faster code (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
   '6*2O2_set target processor to a MC68020+'#000+
-  '6*1R<x>_a','ssembler reading style:'#000+
+  '6*1R<x>_assembler reading style:'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system:'#000+
-  '6*2TAMIGA_Commodore Amiga'#000+
+  '6*2T','AMIGA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
-  '**1h_shows this help ','without waiting'#000
+  '**1h_shows this help without waiting'#000
 );

compiler/options.pas

@@ -445,14 +445,22 @@ begin
                                  End
                                Else
                                  initlocalswitches:=initlocalswitches+[cs_check_stack];
-                            'x' :
+                            'D' :
                                If UnsetBool(More, j) then
                                  Begin
-                                   initmoduleswitches:=initmoduleswitches-[cs_smartlink];
+                                   initmoduleswitches:=initmoduleswitches-[cs_create_dynamic];
                                    inc(j)
                                  End
                                Else
-                                 initmoduleswitches:=initmoduleswitches+[cs_smartlink];
+                                 initmoduleswitches:=initmoduleswitches+[cs_create_dynamic];
+                            'X' :
+                               If UnsetBool(More, j) then
+                                 Begin
+                                   initmoduleswitches:=initmoduleswitches-[cs_create_smart];
+                                   inc(j)
+                                 End
+                               Else
+                                 initmoduleswitches:=initmoduleswitches+[cs_create_smart];
                             else
                                IllegalPara(opt);
                           end;
@@ -1217,7 +1225,12 @@ end;
 end.
 {
   $Log$
-  Revision 1.22  1999-09-16 11:34:56  pierre
+  Revision 1.23  1999-09-20 16:38:59  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.22  1999/09/16 11:34:56  pierre
    * typo correction
 
   Revision 1.21  1999/09/15 20:35:40  florian

compiler/os2_targ.pas

@@ -51,7 +51,7 @@ implementation
 {$ifdef Delphi}
      dmisc,
 {$else Delphi}
-     dos, 
+     dos,
 {$endif Delphi}
      globtype,strings,comphook,
      globals,link,files;
@@ -266,7 +266,7 @@ const   ar_magic:array[1..8] of char='!<arch>'#10;
 
 begin
     seq_no:=1;
-    if not (cs_smartlink in aktmoduleswitches) then
+    if not (cs_create_smart in aktmoduleswitches) then
       current_module^.linkotherstaticlibs.insert(s,link_allways);
     assign(out_file,current_module^.path^+s+'.ao2');
     rewrite(out_file,1);
@@ -336,7 +336,12 @@ end.
 
 {
   $Log$
-  Revision 1.10  1999-09-07 15:05:19  pierre
+  Revision 1.11  1999-09-20 16:38:59  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.10  1999/09/07 15:05:19  pierre
   * use do_halt instead of runerror
 
   Revision 1.9  1999/07/18 10:19:58  florian

compiler/pdecl.pas

@@ -1722,7 +1722,7 @@ unit pdecl;
          if not(oo_has_vmt in aktclass^.objectoptions) and
             ([oo_has_virtual,oo_has_constructor,oo_has_destructor,oo_is_class]*aktclass^.objectoptions<>[]) then
            aktclass^.insertvmt;
-         if (cs_smartlink in aktmoduleswitches) then
+         if (cs_create_smart in aktmoduleswitches) then
            datasegment^.concat(new(pai_cut,init));
 
          { Write the start of the VMT, wich is equal for classes and objects }
@@ -2536,7 +2536,12 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.154  1999-09-15 22:09:24  florian
+  Revision 1.155  1999-09-20 16:38:59  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.154  1999/09/15 22:09:24  florian
     + rtti is now automatically generated for published classes, i.e.
       they are handled like an implicit property
 

compiler/pmodules.pas

@@ -55,7 +55,7 @@ unit pmodules;
         GenerateAsm(false);
 
         { Also create a smartlinked version ? }
-        if (cs_smartlink in aktmoduleswitches) then
+        if (cs_create_smart in aktmoduleswitches) then
          begin
            GenerateAsm(true);
            if target_asm.needar then
@@ -73,7 +73,7 @@ unit pmodules;
         current_module^.linkunitofiles.insert(current_module^.objfilename^,link_static);
         current_module^.flags:=current_module^.flags or uf_static_linked;
 
-        if (cs_smartlink in aktmoduleswitches) then
+        if (cs_create_smart in aktmoduleswitches) then
          begin
            current_module^.linkunitstaticlibs.insert(current_module^.staticlibfilename^,link_smart);
            current_module^.flags:=current_module^.flags or uf_smart_linked;
@@ -86,14 +86,14 @@ unit pmodules;
         procedure fixseg(p:paasmoutput;sec:tsection);
         begin
           p^.insert(new(pai_section,init(sec)));
-          if (cs_smartlink in aktmoduleswitches) then
+          if (cs_create_smart in aktmoduleswitches) then
            p^.insert(new(pai_cut,init));
           p^.concat(new(pai_section,init(sec_none)));
         end;
 
       begin
       {Insert Ident of the compiler}
-        if (not (cs_smartlink in aktmoduleswitches))
+        if (not (cs_create_smart in aktmoduleswitches))
 {$ifndef EXTDEBUG}
            and (not current_module^.is_unit)
 {$endif}
@@ -152,7 +152,7 @@ unit pmodules;
           concat(new(pai_symbol_end,initname('FPC_RESOURCESTRINGTABLES')));
           end;
         { insert in data segment }
-        if (cs_smartlink in aktmoduleswitches) then
+        if (cs_create_smart in aktmoduleswitches) then
           datasegment^.concat(new(pai_cut,init));
         datasegment^.concatlist(@ResourceStringTables);
         ResourceStringTables.done;
@@ -196,7 +196,7 @@ unit pmodules;
         unitinits.insert(new(pai_symbol,initname_global('INITFINAL',0)));
         unitinits.concat(new(pai_symbol_end,initname('INITFINAL')));
         { insert in data segment }
-        if (cs_smartlink in aktmoduleswitches) then
+        if (cs_create_smart in aktmoduleswitches) then
           datasegment^.concat(new(pai_cut,init));
         datasegment^.concatlist(@unitinits);
         unitinits.done;
@@ -205,7 +205,7 @@ unit pmodules;
 
     procedure insertheap;
       begin
-         if (cs_smartlink in aktmoduleswitches) then
+         if (cs_create_smart in aktmoduleswitches) then
            begin
              bsssegment^.concat(new(pai_cut,init));
              datasegment^.concat(new(pai_cut,init));
@@ -1464,7 +1464,12 @@ unit pmodules;
 end.
 {
   $Log$
-  Revision 1.155  1999-09-16 23:05:54  florian
+  Revision 1.156  1999-09-20 16:39:00  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.155  1999/09/16 23:05:54  florian
     * m68k compiler is again compilable (only gas writer, no assembler reader)
 
   Revision 1.154  1999/09/16 14:18:12  pierre

compiler/psub.pas

@@ -1701,7 +1701,7 @@ begin
             procinfo.aktproccode^.concatlist(procinfo.aktlocaldata);
          end;
        { now we can insert a cut }
-       if (cs_smartlink in aktmoduleswitches) then
+       if (cs_create_smart in aktmoduleswitches) then
          codesegment^.concat(new(pai_cut,init));
 
        { add the procedure to the codesegment }
@@ -1948,7 +1948,7 @@ begin
       pdflags:=pd_body;
       if current_module^.in_implementation then
        pdflags:=pdflags or pd_implemen;
-      if (not current_module^.is_unit) or (cs_smartlink in aktmoduleswitches) then
+      if (not current_module^.is_unit) or (cs_create_smart in aktmoduleswitches) then
        pdflags:=pdflags or pd_global;
       procinfo.exported:=false;
       aktprocsym^.definition^.forwarddef:=false;
@@ -2053,7 +2053,12 @@ end.
 
 {
   $Log$
-  Revision 1.21  1999-09-15 20:35:42  florian
+  Revision 1.22  1999-09-20 16:39:00  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.21  1999/09/15 20:35:42  florian
     * small fix to operator overloading when in MMX mode
     + the compiler uses now fldz and fld1 if possible
     + some fixes to floating point registers

compiler/ra386int.pas

@@ -782,7 +782,6 @@ Begin
            Message(asmr_e_type_without_identifier)
           else
            begin
-
              getsym(actasmpattern,false);
              Consume(AS_ID);
              if assigned(srsym) then
@@ -796,10 +795,8 @@ Begin
                   typesym :
                     l:=ptypesym(srsym)^.definition^.size;
                   else
-
                     Message(asmr_e_wrong_sym_type);
                 end;
-
                 str(l,tempstr);
                 expr:=expr+tempstr;
               end
@@ -990,7 +987,7 @@ Begin
           if not GotPlus then
             Message(asmr_e_invalid_reference_syntax);
           if actasmpattern[1] = '@' then
-           Message(asmr_e_local_symbol_not_allowed_as_ref);
+           Message(asmr_e_local_label_not_allowed_as_ref);
           GotStar:=false;
           GotPlus:=false;
           if SearchIConstant(actasmpattern,l) or
@@ -1082,7 +1079,9 @@ Begin
            begin
              if hs<>'' then
               val(hs,l,code);
-             opr.ref.scalefactor:=l
+             opr.ref.scalefactor:=l;
+             if l>8 then
+              Message(asmr_e_wrong_scale_factor);
            end;
           GotPlus:=false;
           GotStar:=false;
@@ -1752,7 +1751,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.47  1999-09-15 20:35:43  florian
+  Revision 1.48  1999-09-20 16:39:01  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.47  1999/09/15 20:35:43  florian
     * small fix to operator overloading when in MMX mode
     + the compiler uses now fldz and fld1 if possible
     + some fixes to floating point registers

compiler/scandir.inc

@@ -539,7 +539,7 @@ const
           _DIR_GOTO      : sw:=cs_support_goto;
           _DIR_MACRO     : sw:=cs_support_macro;
           _DIR_INLINE    : sw:=cs_support_inline;
-          _DIR_SMARTLINK : sw:=cs_smartlink;
+          _DIR_SMARTLINK : sw:=cs_create_smart;
           _DIR_STATIC    : sw:=cs_static_keyword;
         end;
         state:=current_scanner^.readstate;
@@ -1146,7 +1146,12 @@ const
 
 {
   $Log$
-  Revision 1.62  1999-09-03 10:00:49  peter
+  Revision 1.63  1999-09-20 16:39:02  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.62  1999/09/03 10:00:49  peter
     * included the 1.60 version of Pierre which was lost !
 
   Revision 1.61  1999/09/02 18:47:46  daniel

compiler/symdef.inc

@@ -848,7 +848,7 @@
 
     function tenumdef.getrangecheckstring : string;
       begin
-         if (cs_smartlink in aktmoduleswitches) then
+         if (cs_create_smart in aktmoduleswitches) then
            getrangecheckstring:='R_'+current_module^.modulename^+tostr(rangenr)
          else
            getrangecheckstring:='R_'+tostr(rangenr);
@@ -861,7 +861,7 @@
            begin
               { generate two constant for bounds }
               getlabelnr(rangenr);
-              if (cs_smartlink in aktmoduleswitches) then
+              if (cs_create_smart in aktmoduleswitches) then
                 datasegment^.concat(new(pai_symbol,initname_global(getrangecheckstring,8)))
               else
                 datasegment^.concat(new(pai_symbol,initname(getrangecheckstring,8)));
@@ -1049,7 +1049,7 @@
     function torddef.getrangecheckstring : string;
 
       begin
-         if (cs_smartlink in aktmoduleswitches) then
+         if (cs_create_smart in aktmoduleswitches) then
            getrangecheckstring:='R_'+current_module^.modulename^+tostr(rangenr)
          else
            getrangecheckstring:='R_'+tostr(rangenr);
@@ -1067,7 +1067,7 @@
                rangechecksize:=16;
               { generate two constant for bounds }
               getlabelnr(rangenr);
-              if (cs_smartlink in aktmoduleswitches) then
+              if (cs_create_smart in aktmoduleswitches) then
                 datasegment^.concat(new(pai_symbol,initname_global(getrangecheckstring,rangechecksize)))
               else
                 datasegment^.concat(new(pai_symbol,initname(getrangecheckstring,rangechecksize)));
@@ -1763,7 +1763,7 @@
 
     function tarraydef.getrangecheckstring : string;
       begin
-         if (cs_smartlink in aktmoduleswitches) then
+         if (cs_create_smart in aktmoduleswitches) then
            getrangecheckstring:='R_'+current_module^.modulename^+tostr(rangenr)
          else
            getrangecheckstring:='R_'+tostr(rangenr);
@@ -1776,7 +1776,7 @@
            begin
               { generates the data for range checking }
               getlabelnr(rangenr);
-              if (cs_smartlink in aktmoduleswitches) then
+              if (cs_create_smart in aktmoduleswitches) then
                 datasegment^.concat(new(pai_symbol,initname_global(getrangecheckstring,8)))
               else
                 datasegment^.concat(new(pai_symbol,initname(getrangecheckstring,8)));
@@ -2697,7 +2697,7 @@ Const local_symtable_index : longint = $8001;
 {$endif}
 {$endif newcg}
            end;
-     
+
 {$ifdef newcg}
          writenormalset(usedregisters);
 {$else newcg}
@@ -3778,7 +3778,12 @@ Const local_symtable_index : longint = $8001;
 
 {
   $Log$
-  Revision 1.164  1999-09-15 22:09:26  florian
+  Revision 1.165  1999-09-20 16:39:02  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.164  1999/09/15 22:09:26  florian
     + rtti is now automatically generated for published classes, i.e.
       they are handled like an implicit property
 

compiler/symsym.inc

@@ -1093,7 +1093,7 @@
            end;
          case owner^.symtabletype of
            staticsymtable :
-             if (cs_smartlink in aktmoduleswitches) then
+             if (cs_create_smart in aktmoduleswitches) then
                prefix:='_'+owner^.name^+'$$$_'
              else
                prefix:='_';
@@ -1223,7 +1223,7 @@
                  begin
                    { enable unitialized warning for local symbols }
                    varstate:=vs_declared;
-                   if (cs_smartlink in aktmoduleswitches) then
+                   if (cs_create_smart in aktmoduleswitches) then
                      bsssegment^.concat(new(pai_cut,init));
                    ali:=data_align(l);
                    if ali>1 then
@@ -1237,7 +1237,7 @@
                       concatstabto(bsssegment);
 {$endif GDB}
 
-                   if (cs_smartlink in aktmoduleswitches) or
+                   if (cs_create_smart in aktmoduleswitches) or
                       DLLSource or
                       (vo_is_C_var in varoptions) then
                      bsssegment^.concat(new(pai_datablock,init_global(mangledname,l)))
@@ -1255,7 +1255,7 @@
                  end;
                globalsymtable :
                  begin
-                   if (cs_smartlink in aktmoduleswitches) then
+                   if (cs_create_smart in aktmoduleswitches) then
                      bsssegment^.concat(new(pai_cut,init));
                    ali:=data_align(l);
                    if ali>1 then
@@ -1575,7 +1575,7 @@
           curconstsegment:=consts
         else
           curconstsegment:=datasegment;
-        if (cs_smartlink in aktmoduleswitches) then
+        if (cs_create_smart in aktmoduleswitches) then
           curconstsegment^.concat(new(pai_cut,init));
         l:=getsize;
         ali:=data_align(l);
@@ -1599,7 +1599,7 @@
         else
           if owner^.symtabletype<>unitsymtable then
             begin
-              if (cs_smartlink in aktmoduleswitches) or
+              if (cs_create_smart in aktmoduleswitches) or
                  DLLSource then
                 curconstsegment^.concat(new(pai_symbol,initname_global(mangledname,getsize)))
               else
@@ -2157,7 +2157,12 @@
 
 {
   $Log$
-  Revision 1.117  1999-08-31 15:42:24  pierre
+  Revision 1.118  1999-09-20 16:39:03  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.117  1999/08/31 15:42:24  pierre
    + tmacrosym is_used and defined_at_startup boolean fields added
 
   Revision 1.116  1999/08/24 22:38:55  michael

compiler/win_targ.pas

@@ -260,7 +260,7 @@ unit win_targ;
          l1,l2,l3,l4 : pasmlabel;
          r : preference;
       begin
-         if (cs_smartlink in aktmoduleswitches) then
+         if (cs_create_smart in aktmoduleswitches) then
           begin
             generatesmartlib;
             exit;
@@ -270,7 +270,7 @@ unit win_targ;
          while assigned(hp1) do
            begin
               { Insert cuts for smartlinking }
-              if (cs_smartlink in aktmoduleswitches) then
+              if (cs_create_smart in aktmoduleswitches) then
                 begin
                   importssection^.concat(new(pai_cut,init));
                   codesegment^.concat(new(pai_cut,init));
@@ -799,7 +799,12 @@ unit win_targ;
 end.
 {
   $Log$
-  Revision 1.33  1999-08-25 12:00:07  jonas
+  Revision 1.34  1999-09-20 16:39:04  peter
+    * cs_create_smart instead of cs_smartlink
+    * -CX is create smartlink
+    * -CD is create dynamic, but does nothing atm.
+
+  Revision 1.33  1999/08/25 12:00:07  jonas
     * changed pai386, paippc and paiapha (same for tai*) to paicpu (taicpu)
 
   Revision 1.32  1999/08/11 17:26:38  peter