Просмотр исходного кода

* changes of Bruessel:
+ message handler can now take an explicit self
* typinfo fixed: sometimes the type names weren't written
* the type checking for pointer comparisations and subtraction
and are now more strict (was also buggy)
* small bug fix to link.pas to support compiling on another
drive
* probable bug in popt386 fixed: call/jmp => push/jmp
transformation didn't count correctly the jmp references
+ threadvar support
* warning if ln/sqrt gets an invalid constant argument

florian 26 лет назад
Родитель
Сommit
d27b21891b

+ 16 - 2
compiler/cg386cnv.pas

@@ -912,7 +912,8 @@ implementation
                         exprasmlist^.concat(new(pai386,op_const_reg(A_MOV,newsize,1,pto^.location.register)));
                         emitjmp(C_None,hlabel);
                         emitlab(falselabel);
-                        exprasmlist^.concat(new(pai386,op_reg_reg(A_XOR,newsize,pto^.location.register,pto^.location.register)));
+                        exprasmlist^.concat(new(pai386,op_reg_reg(A_XOR,newsize,pto^.location.register,
+                          pto^.location.register)));
                         emitlab(hlabel);
                       end;
          else
@@ -1288,7 +1289,20 @@ implementation
 end.
 {
   $Log$
-  Revision 1.67  1999-04-22 10:49:07  peter
+  Revision 1.68  1999-04-28 06:01:54  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.67  1999/04/22 10:49:07  peter
     * fixed pchar to string location
 
   Revision 1.66  1999/04/20 10:35:58  peter

+ 37 - 1
compiler/cg386ld.pas

@@ -57,6 +57,8 @@ implementation
          i : longint;
          hp : preference;
          s : pasmsymbol;
+         popeax : boolean;
+
       begin
          simple_loadn:=true;
          reset_reference(p^.location.reference);
@@ -100,6 +102,27 @@ implementation
                          p^.location.reference.symbol:=newasmsymbol(p^.symtableentry^.mangledname);
                          concat_external(p^.symtableentry^.mangledname,EXT_NEAR);
                       end
+                    { thread variable }
+                    else if (pvarsym(p^.symtableentry)^.var_options and vo_is_thread_var)<>0 then
+                      begin
+                         popeax:=not(R_EAX in unused);
+                         if popeax then
+                           exprasmlist^.concat(new(pai386,op_reg(A_PUSH,S_L,R_EAX)));
+                         p^.location.reference.symbol:=newasmsymbol(p^.symtableentry^.mangledname);
+                         if symtabletype=unitsymtable then
+                           concat_external(p^.symtableentry^.mangledname,EXT_NEAR);
+                         exprasmlist^.concat(new(pai386,op_ref(A_PUSH,S_L,newreference(p^.location.reference))));
+                         { the called procedure isn't allowed to change }
+                         { any register except EAX                      }
+                         emitcall('FPC_RELOCATE_THREADVAR',true);
+
+                         clear_reference(p^.location.reference);
+                         p^.location.reference.base:=getregister32;
+                         emit_reg_reg(A_MOV,S_L,R_EAX,p^.location.reference.base);
+                         if popeax then
+                           exprasmlist^.concat(new(pai386,op_reg(A_POP,S_L,R_EAX)));
+
+                      end
                     { normal variable }
                     else
                       begin
@@ -841,7 +864,20 @@ implementation
 end.
 {
   $Log$
-  Revision 1.50  1999-04-16 13:42:26  jonas
+  Revision 1.51  1999-04-28 06:01:55  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.50  1999/04/16 13:42:26  jonas
     * more regalloc fixes (still not complete)
 
   Revision 1.49  1999/04/13 18:57:48  florian

+ 3 - 0
compiler/msgidx.inc

@@ -195,6 +195,8 @@ type tmsgconst=(
   parser_e_ill_msg_expr,
   parser_e_ill_msg_param,
   parser_e_duplicate_message_label,
+  parser_e_self_in_non_message_handler,
+  parser_e_threadvars_only_sg,
   type_e_mismatch,
   type_e_incompatible_types,
   type_e_integer_expr_expected,
@@ -280,6 +282,7 @@ type tmsgconst=(
   cg_e_no_code_for_inline_stored,
   cg_e_can_access_element_zero,
   cg_e_include_not_implemented,
+  cg_w_may_wrong_math_argument,
   cg_e_cannot_call_cons_dest_inside_with,
   assem_f_ev_zero_divide,
   assem_f_ev_stack_overflow,

+ 147 - 145
compiler/msgtxt.inc

@@ -1,4 +1,4 @@
-const msgtxt : array[0..00102,1..240] of char=(
+const msgtxt : array[0..00103,1..240] of char=(
   'T_Compiler: $1'#000+
   'D_Source OS: $1'#000+
   'I_Target OS: $1'#000+
@@ -203,480 +203,482 @@ const msgtxt : array[0..00102,1..240] of char=(
   'E_Illegal expression after message directive'#000+
   'E_Message handlers can take only one call by ref. parameter'#000+
   'E_Duplicate message label: %1'#000+
-  'E_Type m','ismatch'#000+
+  'E_Self c','an be only an explicit parameter in message handlers'#000+
+  'E_Threadvars can be only static or global'#000+
+  'E_Type mismatch'#000+
   'E_Incompatible types $1 and $2'#000+
   'E_Integer expression expected'#000+
   'E_Ordinal expression expected'#000+
   'E_Type identifier expected'#000+
-  'E_Variable identifier expected'#000+
+  'E_Variable ','identifier expected'#000+
   'E_pointer type expected'#000+
   'E_class type expected'#000+
-  'E_Variable or type indentifier expect','ed'#000+
+  'E_Variable or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'E_Operation not implemented for sets'#000+
-  'W_Automatic type conversion from floating type to COMP which is an int'+
-  'eger type'#000+
+  'W_Automatic type conversio','n from floating type to COMP which is an i'+
+  'nteger type'#000+
   'H_use DIV instead to get an integer result'#000+
-  'E_stri','ng types doesn'#039't match, because of $V+ mode'#000+
+  'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
-  'E_Can'#039't read or write variables of this type'#000+
+  'E_Can'#039't read or write variables of this',' type'#000+
   'E_Type conflict between set elements'#000+
   'W_lo/hi(longint/dword) returns the upper/lower word'#000+
-  'E_Intege','r or real expression expected'#000+
+  'E_Integer or real expression expected'#000+
   'E_Wrong type in array constructor'#000+
   'E_Incompatible type for arg #$1, $2 and $3'#000+
   'E_Identifier not found $1'#000+
-  'F_Internal Error in SymTableStack()'#000+
+  'F_In','ternal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#000+
   'E_Unknown identifier $1'#000+
-  'E_Forward declaration',' not solved $1'#000+
+  'E_Forward declaration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
   'E_Error in type definition'#000+
   'E_Type identifier not defined'#000+
-  'E_Forward type not resolved $1'#000+
+  'E_Forward type not reso','lved $1'#000+
   'E_Only static variables can be used in static methods or outside metho'+
   'ds'#000+
-  'E_Invalid call to tvar','sym.mangledname()'#000+
+  'E_Invalid call to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
   'E_Instances of classes or objects with an abtsract method are not allo'+
   'wed'#000+
-  'W_Label not defined $1'#000+
+  'W_Label not d','efined $1'#000+
   'E_Illegal label declaration'#000+
-  'E_GOTO und LABEL are not supported (use command line switch -Sg)'#000,+
+  'E_GOTO und LABEL are not supported (use command line switch -Sg)'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
   'E_illegal type declaration of set elements'#000+
-  'E_Forward class definition not resolved $1'#000+
+  'E_Forward class definitio','n not resolved $1'#000+
   'H_Parameter not used $1'#000+
   'N_Local variable not used $1'#000+
   'E_Set type expected'#000+
-  'W_Function r','esult does not seem to be set'#000+
+  'W_Function result does not seem to be set'#000+
   'E_Unknown record field identifier $1'#000+
   'W_Local variable $1 does not seem to be initialized'#000+
-  'E_identifier idents no member $1'#000+
+  'E_identifier ident','s no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
   'E_CONTINUE not allowed'#000+
-  'E_Expression too comp','licated - FPU stack overflow'#000+
+  'E_Expression too complicated - FPU stack overflow'#000+
   'E_Illegal expression'#000+
   'E_Invalid integer'#000+
   'E_Illegal qualifier'#000+
   'E_High range limit < low range limit'#000+
-  'E_Illegal counter variable'#000+
+  'E_Illegal co','unter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
-  'E_Parameter list size exceeds 65535 ','bytes'#000+
+  'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
   'E_File types must be var parameters'#000+
   'E_The use of a far pointer isn'#039't allowed there'#000+
-  'E_illegal call by reference parameters'#000+
+  'E_illegal call by refe','rence parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
-  'W_Possible illegal call of constructor or ','destructor (doesn'#039't ma'+
-  'tch to this context)'#000+
+  'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
+  'h to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
   'E_procedure call with stackframe ESP/SP'#000+
-  'E_Abstract methods can'#039't be called directly'#000+
+  'E_Abstract metho','ds can'#039't be called directly'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
-  'F_Unknown float type'#000,+
+  'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
   'F_32-bit unsigned not supported in MC68000 mode'#000+
-  'F_Internal Error in secondinline()'#000+
+  'F_Internal Error in seco','ndinline()'#000+
   'D_Register $1 weight $2 $3'#000+
   'E_Stack limit excedeed in local routine'#000+
   'D_Stack frame is omited'#000+
-  'E','_Unable to inline object methods'#000+
+  'E_Unable to inline object methods'#000+
   'E_Unable to inline procvar calls'#000+
   'E_No code for inline procedure stored'#000+
-  'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
-  'se (set)length instead'#000+
-  'E_Include or exclude not implemented in this ca','se'#000+
+  'E_Element zero of an ansi/wide- o','r longstring can'#039't be accessed,'+
+  ' use (set)length instead'#000+
+  'E_Include or exclude not implemented in this case'#000+
+  'W_Probably illegal constant passed to internal math function'#000+
   'Constructors or destructors can not be called inside with here'#000+
-  'F_Divide by zero in asm evaluator'#000+
+  'F_Divide b','y 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 Operator in asm evaluator'#000+
-  'F_Unkno','wn error in asm evaluator'#000+
+  'F_Unknown error in asm evaluator'#000+
   'W_Invalid numeric value'#000+
-  'E_escape sequence ignored: $1'#000+
+  'E_escape sequence ignored:',' $1'#000+
   'E_Asm syntax error - Prefix not found'#000+
   'E_Asm syntax error - Trying to add more than one prefix'#000+
   'E_Asm syntax error - Opcode not found'#000+
   'E_Invalid symbol reference'#000+
-  'W','_Calling an overload function in an asm'#000+
+  'W_Calling an overload function in an asm'#000+
   'E_Constant value out of bounds'#000+
-  'E_Non-label pattern contains @'#000+
+  'E_Non','-label pattern contains @'#000+
   'E_Invalid Operand: $1'#000+
   'W_Override operator not supported'#000+
   'E_Error in binary constant: $1'#000+
   'E_Error in octal constant: $1'#000+
-  'E_Error in hexadecima','l constant: $1'#000+
+  'E_Error in hexadecimal constant: $1'#000+
   'E_Error in integer constant: $1'#000+
   'E_Invalid labeled opcode'#000+
-  'F_Internal error in Findtype()'#000+
+  'F_In','ternal error in Findtype()'#000+
   'E_Invalid size for MOVSX/MOVZX'#000+
   'E_16-bit base in 32-bit segment'#000+
   'E_16-bit index in 32-bit segment'#000+
   'E_Invalid Opcode'#000+
-  'E_Constant reference not',' allowed'#000+
+  'E_Constant reference not allowed'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
-  'E_Invalid combination of opcode and operands'#000+
+  'E_Invalid combinat','ion of opcode and operands'#000+
   'E_Unsupported combination of opcode and operands'#000+
   'W_Opcode $1 not in table, operands not checked'#000+
   'F_Internal Error in ConcatOpcode()'#000+
-  'E_Inva','lid size in reference'#000+
+  'E_Invalid size in reference'#000+
   'E_Invalid middle sized operand'#000+
-  'E_Invalid three operand opcode'#000+
+  'E_Invalid three operand',' opcode'#000+
   'E_Assembler syntax error'#000+
   'E_Invalid operand type'#000+
   'E_Segment overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
   'F_Internal Errror converting binary'#000+
-  'F_Interna','l Errror converting hexadecimal'#000+
+  'F_Internal Errror converting hexadecimal'#000+
   'F_Internal Errror converting octal'#000+
-  'E_Invalid constant expression'#000+
+  'E_Invalid',' constant expression'#000+
   'E_Unknown identifier: $1'#000+
   'E_Trying to define an index register more than once'#000+
   'E_Invalid field specifier'#000+
   'F_Internal Error in BuildScaling()'#000+
-  'E_Inv','alid scaling factor'#000+
+  'E_Invalid scaling factor'#000+
   'E_Invalid scaling value'#000+
-  'E_Scaling value only allowed with index'#000+
+  'E_Scaling value only allowed wit','h index'#000+
   'E_Invalid assembler syntax. No ref with brackets)'#000+
   'E_Expressions of the form [sreg:reg...] are currently not supported'#000+
-  'E_Trying to define a segment register ','twice'#000+
+  'E_Trying to define a segment register twice'#000+
   'E_Trying to define a base register twice'#000+
-  'E_Trying to use a negative index register'#000+
+  'E_Trying to use a negative in','dex register'#000+
   'E_Asm syntax error - error in reference'#000+
   'E_Local symbols not allowed as references'#000+
   'E_Invalid operand in bracket expression'#000+
   'E_Invalid symbol name: $1'#000+
-  'E_I','nvalid Reference syntax'#000+
+  'E_Invalid Reference syntax'#000+
   'E_Invalid string as opcode operand: $1'#000+
-  'W_@CODE and @DATA not supported'#000+
+  'W_@CODE and @','DATA not supported'#000+
   'E_Null label references are not allowed'#000+
   'W_Calling of an overloaded function in direct assembler'#000+
   'E_Cannot use SELF outside a method'#000+
-  'E_Asm syntax e','rror - Should start with bracket'#000+
+  'E_Asm syntax error - Should start with bracket'#000+
   'E_Asm syntax error - register: $1'#000+
-  'E_SEG and OFFSET not supported'#000+
+  'E_SEG and',' OFFSET not supported'#000+
   'E_Asm syntax error - in opcode operand'#000+
   'E_Invalid String expression'#000+
   'E_Constant expression out of bounds'#000+
   'F_Internal Error in BuildConstant()'#000+
-  'W_A',' repeat prefix and a segment override on <= i386 may result in er'+
-  'rors if an interrupt occurs'#000+
+  'W_A repeat prefix and a segment override on <= i386 may result in erro'+
+  'rs if an ','interrupt occurs'#000+
   'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
-  'E_Too many operands on ','line'#000+
+  'E_Too many operands on line'#000+
   'E_Duplicate local symbol: $1'#000+
   'E_Unknown label identifer: $1'#000+
-  'E_Assemble node syntax error'#000+
+  'E_Assemble n','ode syntax error'#000+
   'E_Undefined local symbol: $1'#000+
   'D_Starting intel styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
-  'E_Not a directive or local s','ymbol: $1'#000+
+  'E_Not a directive or local symbol: $1'#000+
   'E_/ at beginning of line not allowed'#000+
   'E_NOR not supported'#000+
-  'E_Invalid floating point register name'#000+
+  'E_Invalid',' floating point register name'#000+
   'W_Modulo not supported'#000+
   'E_Invalid floating point constant: $1'#000+
   'E_Size suffix and destination register do not match'#000+
-  'E_Size suffix and des','tination or source size do not match'#000+
-  'W_Size suffix and destination or source size do not match'#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+
   'E_Internal error in ConcatLabeledInstr()'#000+
   'W_Floating point binary representation ignored'#000+
   'W_Floating point hexadecimal representation ignored'#000+
-  'W_Flo','ating point octal representation ignored'#000+
-  'E_Invalid real constant expression'#000+
+  'W_Floating point octal representation ignored'#000+
+  'E_Invalid real constant expression'#000,+
   'E_Parenthesis are not allowed'#000+
   'E_Invalid Reference'#000+
   'E_Cannot use __SELF outside a method'#000+
   'E_Cannot use __OLDEBP outside a nested procedure'#000+
-  'W_Identifier $1 supposed ext','ernal'#000+
+  'W_Identifier $1 supposed external'#000+
   'E_Invalid segment override expression'#000+
-  'E_Strings not allowed as constants'#000+
+  'E_Strings not allowed as constan','ts'#000+
   'D_Starting AT&T styled assembler parsing...'#000+
   'D_Finished AT&T styled assembler parsing...'#000+
   'E_Switching sections is not allowed in an assembler block'#000+
-  'E_Invalid globa','l definition'#000+
+  'E_Invalid global definition'#000+
   'E_Line separator expected'#000+
   'W_globl not supported'#000+
-  'W_align not supported'#000+
+  'W_align not sup','ported'#000+
   'W_lcomm not supported'#000+
   'W_comm not supported'#000+
   'E_Invalid local common definition'#000+
   'E_Invalid global common definition'#000+
-  'E_local symbol: $1 not found inside asm state','ment'#000+
+  'E_local symbol: $1 not found inside asm statement'#000+
   'E_assembler code not returned to text'#000+
-  'F_internal error in BuildReference()'#000+
+  'F_internal error in BuildReferenc','e()'#000+
   'E_invalid opcode size'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
   'D_Creating inline asm lookup tables'#000+
   'E_Using a defined name as a local label'#000+
-  'F_internal error in HandleExtend(',')'#000+
+  'F_internal error in HandleExtend()'#000+
   'E_Invalid character: <'#000+
   'E_Invalid character: >'#000+
   'E_Unsupported opcode'#000+
-  'E_Increment and Decrement mode not allowed together'#000+
+  'E_Incre','ment and Decrement mode not allowed together'#000+
   'E_Invalid Register list in movem/fmovem'#000+
   'E_Invalid Register list for opcode'#000+
   'E_68020+ mode required to assemble'#000+
-  'D_Startin','g Motorola styled assembler parsing...'#000+
-  'D_Finished Motorola styled assembler parsing...'#000+
+  'D_Starting Motorola styled assembler parsing...'#000+
+  'D_Finished Motorola styled assembler ','parsing...'#000+
   'W_XDEF not supported'#000+
   'W_Functions with void return value can'#039't return any value in asm c'+
   'ode'#000+
   'E_Invalid suffix for intel assembler'#000+
-  'E_Extended not supported ','in this mode'#000+
+  'E_Extended not supported in this mode'#000+
   'E_Comp not supported in this mode'#000+
-  'W_You need GNU as version >= 2.81 to compile this MMX code'#000+
+  'W_You need GNU as version >= ','2.81 to compile this MMX code'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'E_Unsupported symbol type for operand'#000+
-  'E_Cannot index a local var ','or parameter with a register'#000+
+  'E_Cannot index a local var or parameter with a register'#000+
   'H_$1 translated to $2'#000+
-  'W_$1 is associated to an overloaded function'#000+
+  'W_$1 is associated to an ','overloaded function'#000+
   'Z_Reference at $1 corresponds to $2 arg'#000+
   'Z_Reference at $1 is not an arg !'#000+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $1'#000+
-  'E_Can'#039't cre','ate assember file $1'#000+
-  'W_Assembler $1 not found, switching to external assembling'#000+
+  'E_Can'#039't create assember file $1'#000+
+  'W_Assembler $1 not found, switching to external assembl','ing'#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 assembl'+
   'ing'#000+
   'I_Assembling $1'#000+
-  'W_Linker $1 not',' found, switching to external linking'#000+
+  'W_Linker $1 not found, switching to external linking'#000+
   'T_Using linker: $1'#000+
-  'W_Object $1 not found, Linking may fail !'#000+
+  'W_Object $1 not fou','nd, Linking may fail !'#000+
   'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
-  'W_binder',' not found, switching to external binding'#000+
-  'W_ar not found, switching to external ar'#000+
+  'W_binder not found, switching to external binding'#000+
+  'W_ar not found, switching to exter','nal ar'#000+
   'E_Dynamic Libraries not supported'#000+
   'I_Closing 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 post process executable $1'#000+
   'F_Can'#039't open executable $1'#000+
   'X_Size of Code: $1 bytes'#000+
-  'X_Size of initialized data: $1 bytes'#000+
+  'X_Size of ','initialized data: $1 bytes'#000+
   'X_Size of uninitialized data: $1 bytes'#000+
   'X_Stack space reserved: $1 bytes'#000+
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
-  'T_PPU Loading $','1'#000+
+  'T_PPU Loading $1'#000+
   'U_PPU Name: $1'#000+
   'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
-  'U_PPU File too short'#000+
+  'U_PPU File too',' short'#000+
   'U_PPU Invalid Header (no PPU at the begin)'#000+
   'U_PPU Invalid Version $1'#000+
   'U_PPU is compiled for an other processor'#000+
   'U_PPU is compiled for an other target'#000+
-  'U_PPU Sour','ce: $1'#000+
+  'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
   'F_reading PPU-File'#000+
-  'F_unexpected end of PPU-File'#000+
+  'F_unexpected e','nd of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
-  'F_Can'#039't com','pile unit $1, no sources available'#000+
-  'W_Compiling the system unit requires the -Us switch'#000+
+  'F_Can'#039't compile unit $1, no sources available'#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 on','ly'#000+
+  'U_Recompiling $1, source found only'#000+
   'U_Recompiling unit, static lib is older than ppufile'#000+
-  'U_Recompiling unit, shared lib is older than ppufile'#000+
+  'U_Recompiling unit, ','shared lib is older than ppufile'#000+
   'U_Recompiling unit, obj and asm are older than ppufile'#000+
   'U_Recompiling unit, obj is older than asm'#000+
   'U_Parsing interface of $1'#000+
-  'U_Parsin','g implementation of $1'#000+
+  'U_Parsing implementation of $1'#000+
   'U_Second load for unit $1'#000+
-  'U_PPU Check file $1 time $2'#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 f','ile name in command line'#000+
+  'F_No source file name in command line'#000+
   'E_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
-  'F_Too many config files nested'#000+
+  'F_To','o 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, re','verting to static'#000+
+  'W_Shared libs not supported on DOS platform, reverting to static'#000+
   'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
-  'F_open conditional at the end of the file'#000+
+  'F_open conditional ','at the end of the file'#000+
   'W_Debug information generation is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
   'W_You are using the obsolete switch $1'#000+
-  'Free P','ascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
-  'Copyright (c) 1993-98 by Florian Klaempfl'#000+
+  'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
+  'Copyright (c) 1993-','98 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
   'Compiler Date  : $FPCDATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
-  'This program comes under the GNU General Public ','Licence'#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+
+  'Report bugs,suggestions etc t','o:'#000+
   '                 [email protected]'#000+
   '**0*_put + after a boolean switch option to enable it, - to disable it'+
   #000+
-  '**1a_the compiler doesn'#039't delete the ge','nerated assembler file'#000+
+  '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
-  '**1b_generate browser info'#000+
+  '**1b_ge','nerate browser info'#000+
   '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
   '**1C_code generation options'#000+
   '3*2CD_create dynamic library'#000+
-  '**2Ch<n>_<n> bytes heap (betwe','en 1023 and 67107840)'#000+
+  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
   '**2Ci_IO-checking'#000+
   '**2Cn_omit linking stage'#000+
-  '**2Co_check overflow of integer operations'#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+
-  '**1d<x>_','defines the symbol <x>'#000+
+  '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
-  '*O2Dd<x>_set description to <x>'#000+
+  '*O2Dd<x>_set description to ','<x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F_set file names and paths'#000+
-  '**2FD<x>_sets the directory where to search for compiler util','ities'#000+
+  '**2FD<x>_sets the directory where to search for compiler utilities'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
-  '**2FE<x>_set exe/unit output path to <x>'#000+
+  '**2FE<x>_set exe/unit output pat','h to <x>'#000+
   '*L2Fg<x>_same as -Fl'#000+
   '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
-  '**2Fo<x>_adds <x> to object pa','th'#000+
+  '**2Fo<x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
   '**2Fu<x>_adds <x> to unit path'#000+
-  '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
+  '**2FU','<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g_generate debugger information'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
   '*g2gh_use heap trace unit'#000+
   '**1i_information'#000+
-  '**2iD_retu','rn compiler date'#000+
+  '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return source OS'#000+
-  '**2iSP_return source processor'#000+
+  '**2iS','P_return source 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+
   '**1l_write logo'#000+
-  '**1','n_don'#039't read the default config file'#000+
-  '**1o<x>_change the name of the executable produced to <x>'#000+
+  '**1n_don'#039't read the default config file'#000+
+  '**1o<x>_change the name of the executab','le produced to <x>'#000+
   '**1pg_generate profile code for gprof'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
   '**1S_syntax options'#000+
-  '**2S2_switch some Delphi 2',' extensions on'#000+
+  '**2S2_switch some Delphi 2 extensions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
-  '**2Sd_tries to be Delphi compatible'#000+
+  '**2Sd_tries',' to be Delphi compatible'#000+
   '**2Se_compiler stops after the first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
   '**2Si_support C++ stlyed INLINE'#000+
-  '**2Sm_support m','acros 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+
+  '**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 wit','h -a)'#000+
+  '**1s_don'#039't call assembler and linker (only with -a)'#000+
   '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options'#000+
-  '**2Un_don'#039't check the unit name'#000+
+  '**2Un_don'#039't check t','he unit name'#000+
   '**2Up<x>_same as -Fu<x>'#000+
   '**2Us_compile a system unit'#000+
   '**1v<x>_Be verbose. <x> is a combination of the following letters :'#000+
-  '**2*_e : Show errors (default) ','      d : Show debug info'#000+
-  '**2*_w : Show warnings               u : Show unit info'#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*_l : Show linenumbers            c : Show conditionals'#000+
+  '**2*_i : Show general info           p : Show compiled procedures'#000+
+  '**2*_l : Show linenumbers            c : Sho','w 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 error    x : Executable info (Win32 only'+
-  ')'#000+
-  '**2*_    occurs'#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_li','nk with static libraries (defines FPC_LINK_STATIC)'#000+
-  '**0*_Processor specific options:'#000+
+  '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
+  '**0*_Processor specific o','ptions:'#000+
   '3*1A<x>_output format'#000+
   '3*2Ao_coff file using GNU AS'#000+
   '3*2Anasmcoff_coff file using Nasm'#000+
   '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
-  '3*2Anasmobj_obj file using Na','sm'#000+
+  '3*2Anasmobj_obj file using Nasm'#000+
   '3*2Amasm_obj using Masm (Mircosoft)'#000+
   '3*2Atasm_obj using Tasm (Borland)'#000+
-  '3*1R<x>_assembler reading style'#000+
+  '3*1','R<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*1O<x','>_optimizations'#000+
+  '3*1O<x>_optimizations'#000+
   '3*2Og_generate smaller code'#000+
-  '3*2OG_generate faster code (default)'#000+
+  '3*2OG_generate faster code (defa','ult)'#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*','2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
-  '3*2O3_level 3 optimizations (same as -O2u)'#000+
+  '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
+  '3*2O3_level 3 optimiz','ations (same as -O2u)'#000+
   '3*2Op_target processor'#000+
   '3*3Op1_set target processor to 386/486'#000+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
-  '3*3Op3_set target process','or to PPro/PII/c6x86/K6 (tm)'#000+
+  '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
   '3*1T<x>_Target operating system'#000+
-  '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
+  '3*2TGO32V1_vers','ion 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*2TWin32_Windows 32 Bit'#000+
   '6*1A<x>_output format'#000+
-  '6*2','Ao_Unix o-file using GNU AS'#000+
+  '6*2Ao_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
-  '6*2Amit_MIT Syntax (old GAS)'#000+
+  '6*2Amit_MIT Synta','x (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 faster code (default)'#000+
-  '6*2O','x_optimize maximum (still BUGGY!!!)'#000+
-  '6*2O2_set target processor to a MC68020+'#000+
+  '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
+  '6*2O2_set target processor to a MC68020+',#000+
   '6*1R<x>_assembler reading style'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
-  '6*2TMACOS','_Macintosh m68k'#000+
+  '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
-  '**1h_shows this help without waiting'#000
+  '**1h_shows th','is help without waiting'#000
 );

+ 16 - 3
compiler/pass_2.pas

@@ -306,11 +306,11 @@ implementation
        regvars_refs : array[1..maxvarregs] of longint;
        parasym : boolean;
 
-    procedure searchregvars(p : psym);
+    procedure searchregvars(p : pnamedindexobject);
       var
          i,j,k : longint;
       begin
-         if (p^.typ=varsym) and ((pvarsym(p)^.var_options and vo_regable)<>0) then
+         if (psym(p)^.typ=varsym) and ((pvarsym(p)^.var_options and vo_regable)<>0) then
            begin
               { walk through all momentary register variables }
               for i:=1 to maxvarregs do
@@ -547,7 +547,20 @@ implementation
 end.
 {
   $Log$
-  Revision 1.17  1999-03-31 13:55:11  peter
+  Revision 1.18  1999-04-28 06:02:04  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.17  1999/03/31 13:55:11  peter
     * assembler inlining working for ag386bin
 
   Revision 1.16  1999/03/24 23:17:11  peter

+ 18 - 3
compiler/pbase.pas

@@ -83,7 +83,7 @@ unit pbase;
 
     { inserts the symbols of sc in st with def as definition }
     { sc is disposed                                         }
-    procedure insert_syms(st : psymtable;sc : pstringcontainer;def : pdef);
+    procedure insert_syms(st : psymtable;sc : pstringcontainer;def : pdef;is_threadvar : boolean);
 
     { just for an accurate position of the end of a procedure (PM) }
     var
@@ -171,7 +171,7 @@ unit pbase;
 
     { inserts the symbols of sc in st with def as definition }
     { sc is disposed                                         }
-    procedure insert_syms(st : psymtable;sc : pstringcontainer;def : pdef);
+    procedure insert_syms(st : psymtable;sc : pstringcontainer;def : pdef;is_threadvar : boolean);
       var
          s : string;
          filepos : tfileposinfo;
@@ -182,6 +182,8 @@ unit pbase;
            begin
               s:=sc^.get_with_tokeninfo(tokenpos);
               ss:=new(pvarsym,init(s,def));
+              if is_threadvar then
+                ss^.var_options:=ss^.var_options or vo_is_thread_var;
               st^.insert(ss);
               { static data fields are inserted in the globalsymtable }
               if (st^.symtabletype=objectsymtable) and
@@ -200,7 +202,20 @@ end.
 
 {
   $Log$
-  Revision 1.20  1999-04-14 18:41:24  daniel
+  Revision 1.21  1999-04-28 06:02:05  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.20  1999/04/14 18:41:24  daniel
   * Better use of routines in pbase and symtable. 4k code removed.
 
   Revision 1.19  1999/04/08 20:59:42  florian

+ 53 - 26
compiler/pdecl.pas

@@ -243,7 +243,7 @@ unit pdecl;
       end;
 
 
-    procedure read_var_decs(is_record,is_object:boolean);
+    procedure read_var_decs(is_record,is_object,is_threadvar:boolean);
     { reads the filed of a record into a        }
     { symtablestack, if record=false            }
     { variants are forbidden, so this procedure }
@@ -280,10 +280,10 @@ unit pdecl;
          old_block_type:=block_type;
          block_type:=bt_type;
          is_gpc_name:=false;
-       { Force an expected ID error message }
+         { Force an expected ID error message }
          if not (token in [ID,_CASE,_END]) then
           consume(ID);
-       { read vars }
+         { read vars }
          while (token=ID) and
                not(is_object and (idtoken in [_PUBLIC,_PRIVATE,_PUBLISHED,_PROTECTED])) do
            begin
@@ -291,7 +291,7 @@ unit pdecl;
              sc:=idlist;
              consume(COLON);
              if (m_gpc in aktmodeswitches) and
-                not(is_record or is_object) and
+                not(is_record or is_object or is_threadvar) and
                 (token=ID) and (orgpattern='__asmname__') then
                begin
                  consume(ID);
@@ -322,17 +322,17 @@ unit pdecl;
                   symtablestack^.insert(aktvarsym);
                   symdone:=true;
                end;
-           { check for absolute }
+             { check for absolute }
              if not symdone and
-                (idtoken=_ABSOLUTE) and not(is_record or is_object) then
+                (idtoken=_ABSOLUTE) and not(is_record or is_object or is_threadvar) then
               begin
                 consume(_ABSOLUTE);
-              { only allowed for one var }
+                { only allowed for one var }
                 s:=sc^.get_with_tokeninfo(declarepos);
                 if not sc^.empty then
                  Message(parser_e_absolute_only_one_var);
                 dispose(sc,done);
-              { parse the rest }
+                { parse the rest }
                 if token=ID then
                  begin
                    getsym(pattern,true);
@@ -431,7 +431,7 @@ unit pdecl;
               begin
                 { Check for C Variable declarations }
                 if (m_cvar_support in aktmodeswitches) and
-                   not(is_record or is_object) and
+                   not(is_record or is_object or is_threadvar) and
                    (idtoken in [_EXPORT,_EXTERNAL,_PUBLIC,_CVAR]) then
                  begin
                    { only allowed for one var }
@@ -467,7 +467,7 @@ unit pdecl;
                       else
                        export_aktvarsym:=true;
                     end;
-                 { external and export need a name after when no cdecl is used }
+                   { external and export need a name after when no cdecl is used }
                    if not is_cdecl then
                     begin
                       { dll name ? }
@@ -479,13 +479,13 @@ unit pdecl;
                        end;
                       consume(_NAME);
                       C_name:=pattern;
-                    { allow also char }
+                      { allow also char }
                       if token=CCHAR then
                        consume(CCHAR)
                       else
                        consume(CSTRING);
                     end;
-                 { consume the ; when export or external is used }
+                   { consume the ; when export or external is used }
                    if extern_aktvarsym or export_aktvarsym then
                     consume(SEMICOLON);
                    { insert in the symtable }
@@ -525,7 +525,7 @@ unit pdecl;
                  if (is_object) and (cs_static_keyword in aktmoduleswitches) and (idtoken=_STATIC) then
                   begin
                     current_object_option:=current_object_option or sp_static;
-                    insert_syms(symtablestack,sc,p);
+                    insert_syms(symtablestack,sc,p,false);
                     current_object_option:=current_object_option - sp_static;
                     consume(_STATIC);
                     consume(SEMICOLON);
@@ -538,10 +538,10 @@ unit pdecl;
                   if (current_object_option=sp_published) and
                     (not((p^.deftype=objectdef) and (pobjectdef(p)^.isclass))) then
                     Message(parser_e_cant_publish_that);
-                  insert_syms(symtablestack,sc,p);
+                  insert_syms(symtablestack,sc,p,is_threadvar);
                end;
            end;
-       { Check for Case }
+         { Check for Case }
          if is_record and (token=_CASE) then
            begin
               maxsize:=0;
@@ -575,21 +575,21 @@ unit pdecl;
                    break;
                 until false;
                 consume(COLON);
-              { read the vars }
+                { read the vars }
                 consume(LKLAMMER);
                 if token<>RKLAMMER then
-                  read_var_decs(true,false);
+                  read_var_decs(true,false,false);
                 consume(RKLAMMER);
-              { calculates maximal variant size }
+                { calculates maximal variant size }
                 maxsize:=max(maxsize,symtablestack^.datasize);
-              { the items of the next variant are overlayed }
+                { the items of the next variant are overlayed }
                 symtablestack^.datasize:=startvarrec;
                 if (token<>_END) and (token<>RKLAMMER) then
                   consume(SEMICOLON)
                 else
                   break;
               until (token=_END) or (token=RKLAMMER);
-            { at last set the record size to that of the biggest variant }
+              { at last set the record size to that of the biggest variant }
               symtablestack^.datasize:=maxsize;
            end;
          block_type:=old_block_type;
@@ -1356,7 +1356,7 @@ unit pdecl;
                                     actmembertype:=sp_published;
                                   end;
                       else
-                        read_var_decs(false,true);
+                        read_var_decs(false,true,false);
                       end;
                     end;
         _PROPERTY : property_dec;
@@ -1369,8 +1369,9 @@ unit pdecl;
                       if idtoken=_MESSAGE then
                         begin
                            { check parameter type }
-                           if assigned(aktprocsym^.definition^.para1^.next) or
-                             (aktprocsym^.definition^.para1^.paratyp<>vs_var) then
+                           if ((aktprocsym^.definition^.options and pocontainsself)=0) and
+                              (assigned(aktprocsym^.definition^.para1^.next) or
+                             (aktprocsym^.definition^.para1^.paratyp<>vs_var)) then
                              Message(parser_e_ill_msg_param);
                            consume(idtoken);
                            pt:=comp_expr(true);
@@ -1651,7 +1652,7 @@ unit pdecl;
          storetypeforwardsallowed:=typecanbeforward;
          if m_tp in aktmodeswitches then
            typecanbeforward:=false;
-         read_var_decs(true,false);
+         read_var_decs(true,false,false);
 
          { may be scale record size to a size of n*4 ? }
          if ((symtablestack^.datasize mod aktpackrecords)<>0) then
@@ -2171,7 +2172,17 @@ unit pdecl;
     { the top symbol table of symtablestack            }
       begin
         consume(_VAR);
-        read_var_decs(false,false);
+        read_var_decs(false,false,false);
+      end;
+
+    procedure threadvar_dec;
+    { parses thread variable declarations and inserts them in }
+    { the top symbol table of symtablestack                   }
+      begin
+        consume(_THREADVAR);
+        if not(symtablestack^.symtabletype in [staticsymtable,globalsymtable]) then
+          message(parser_e_threadvars_only_sg);
+        read_var_decs(false,false,true);
       end;
 
 
@@ -2210,6 +2221,8 @@ unit pdecl;
                 end;
               _VAR:
                 var_dec;
+              _THREADVAR:
+                threadvar_dec;
               _CONSTRUCTOR,_DESTRUCTOR,
               _FUNCTION,_PROCEDURE,_OPERATOR,_CLASS:
                 begin
@@ -2245,6 +2258,7 @@ unit pdecl;
             _CONST : const_dec;
              _TYPE : type_dec;
               _VAR : var_dec;
+              _THREADVAR : threadvar_dec;
          _FUNCTION,
         _PROCEDURE,
          _OPERATOR : read_proc;
@@ -2258,7 +2272,20 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.111  1999-04-26 13:31:37  peter
+  Revision 1.112  1999-04-28 06:02:07  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.111  1999/04/26 13:31:37  peter
     * release storenumber,double_checksum
 
   Revision 1.110  1999/04/25 22:42:16  pierre

+ 15 - 1
compiler/popt386.pas

@@ -1581,6 +1581,7 @@ Begin
                    (hp1^.typ = ait_labeled_instruction) And
                    (pai386_labeled(hp1)^.opcode = A_JMP) Then
                   Begin
+                    Inc(pai386_labeled(hp1)^.lab^.refcount);
                     hp2 := New(Pai386,op_sym(A_PUSH,S_L,NewAsmSymbol(Lab2Str(pai386_labeled(hp1)^.lab))));
                     hp2^.fileinfo := p^.fileinfo;
                     InsertLLItem(AsmL, p^.previous, p, hp2);
@@ -1677,7 +1678,20 @@ End.
 
 {
  $Log$
- Revision 1.46  1999-04-20 11:01:42  peter
+ Revision 1.47  1999-04-28 06:02:08  florian
+   * changes of Bruessel:
+      + message handler can now take an explicit self
+      * typinfo fixed: sometimes the type names weren't written
+      * the type checking for pointer comparisations and subtraction
+        and are now more strict (was also buggy)
+      * small bug fix to link.pas to support compiling on another
+        drive
+      * probable bug in popt386 fixed: call/jmp => push/jmp
+        transformation didn't count correctly the jmp references
+      + threadvar support
+      * warning if ln/sqrt gets an invalid constant argument
+
+ Revision 1.46  1999/04/20 11:01:42  peter
    * skipped vesion 1.44 :(
 
  Revision 1.44  1999/04/17 22:17:01  pierre

+ 16 - 1
compiler/symconst.inc

@@ -66,6 +66,7 @@
        pomsgstr         = $8000000;  { method for string message handling }
        pomsgint         = $10000000; { method for int message handling }
        posavestdregs    = $20000000; { save std regs cdecl and stdcall need that ! }
+       pocontainsself   = $40000000; { self is passed explicit to the compiler }
        { relevant options for assigning a proc or a procvar to a procvar }
        po_compatibility_options = $7FFFFFFF-
          (pomethodpointer+povirtualmethod+pooverridingmethod);
@@ -94,10 +95,24 @@
        vo_is_C_var    = $2;
        vo_is_external = $4;
        vo_is_dll_var  = $8;
+       vo_is_thread_var = $10;
 
 {
   $Log$
-  Revision 1.5  1999-04-26 13:31:46  peter
+  Revision 1.6  1999-04-28 06:02:10  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.5  1999/04/26 13:31:46  peter
     * release storenumber,double_checksum
 
   Revision 1.4  1999/04/16 10:28:26  pierre

+ 23 - 2
compiler/symdef.inc

@@ -658,18 +658,22 @@
             st_ansistring:
               begin
                  rttilist^.concat(new(pai_const,init_8bit(tkAString)));
+                 write_rtti_name;
               end;
             st_widestring:
               begin
                  rttilist^.concat(new(pai_const,init_8bit(tkWString)));
+                 write_rtti_name;
               end;
             st_longstring:
               begin
                  rttilist^.concat(new(pai_const,init_8bit(tkLString)));
+                 write_rtti_name;
               end;
             st_shortstring:
               begin
                  rttilist^.concat(new(pai_const,init_8bit(tkSString)));
+                 write_rtti_name;
                  rttilist^.concat(new(pai_const,init_8bit(len)));
               end;
          end;
@@ -865,6 +869,7 @@
 
       begin
          rttilist^.concat(new(pai_const,init_8bit(tkEnumeration)));
+         write_rtti_name;
          case savesize of
             1:
               rttilist^.concat(new(pai_const,init_8bit(otUByte)));
@@ -1070,6 +1075,7 @@
             else
               rttilist^.concat(new(pai_const,init_8bit(tkInteger)));
          end;
+         write_rtti_name;
          rttilist^.concat(new(pai_const,init_8bit(byte(trans[typ]))));
          rttilist^.concat(new(pai_const,init_32bit(low)));
          rttilist^.concat(new(pai_const,init_32bit(high)));
@@ -1162,6 +1168,7 @@
            (ftFixed32,ftSingle,ftDouble,ftExtended,ftComp,ftFixed16);
       begin
          rttilist^.concat(new(pai_const,init_8bit(tkFloat)));
+         write_rtti_name;
          rttilist^.concat(new(pai_const,init_8bit(translate[typ])));
       end;
 
@@ -1519,6 +1526,7 @@
     procedure tsetdef.write_rtti_data;
       begin
          rttilist^.concat(new(pai_const,init_8bit(tkSet)));
+         write_rtti_name;
          rttilist^.concat(new(pai_const,init_8bit(otULong)));
          rttilist^.concat(new(pai_const_symbol,init(setof^.get_rtti_label)));
       end;
@@ -1986,7 +1994,7 @@
 
     procedure trecdef.write_rtti_data;
       begin
-         rttilist^.concat(new(pai_const,init_8bit(14)));
+         rttilist^.concat(new(pai_const,init_8bit(tkrecord)));
          write_rtti_name;
          rttilist^.concat(new(pai_const,init_32bit(size)));
          count:=0;
@@ -3451,7 +3459,20 @@ Const local_symtable_index : longint = $8001;
 
 {
   $Log$
-  Revision 1.106  1999-04-26 18:30:01  peter
+  Revision 1.107  1999-04-28 06:02:11  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.106  1999/04/26 18:30:01  peter
     * farpointerdef moved into pointerdef.is_far
 
   Revision 1.105  1999/04/26 13:31:47  peter

+ 18 - 3
compiler/symsym.inc

@@ -1114,8 +1114,10 @@
                ((pobjectdef(pvarsym(sym)^.definition)^.options and oo_is_abstract)<>0) then
                Message(sym_e_no_instance_of_abstract_object);
              }
-
-             l:=getsize;
+             if ((var_options and vo_is_thread_var)<>0) then
+               l:=4
+             else
+               l:=getsize;
              case owner^.symtabletype of
                stt_exceptsymtable:
                  { can contain only one symbol, address calculated later }
@@ -1949,7 +1951,20 @@
 
 {
   $Log$
-  Revision 1.82  1999-04-26 13:31:52  peter
+  Revision 1.83  1999-04-28 06:02:13  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.82  1999/04/26 13:31:52  peter
     * release storenumber,double_checksum
 
   Revision 1.81  1999/04/25 22:38:39  pierre

+ 45 - 4
compiler/tcadd.pas

@@ -766,18 +766,46 @@ implementation
            if (rd^.deftype=pointerdef) and (ld^.deftype=pointerdef) then
             begin
               p^.location.loc:=LOC_REGISTER;
-              p^.right:=gentypeconvnode(p^.right,ld);
-              firstpass(p^.right);
+              { p^.right:=gentypeconvnode(p^.right,ld); }
+              { firstpass(p^.right); }
               calcregisters(p,1,0,0);
               case p^.treetype of
-                 equaln,unequaln : ;
+                 equaln,unequaln :
+                   begin
+                      if is_equal(p^.right^.resulttype,voidpointerdef) then
+                        begin
+                           p^.right:=gentypeconvnode(p^.right,ld);
+                           firstpass(p^.right);
+                        end
+                      else if is_equal(p^.left^.resulttype,voidpointerdef) then
+                        begin
+                           p^.left:=gentypeconvnode(p^.left,rd);
+                           firstpass(p^.left);
+                        end
+                      else if not(is_equal(ld,rd)) then
+                        CGMessage(type_e_mismatch);
+                   end;
                  ltn,lten,gtn,gten:
                    begin
+                      if is_equal(p^.right^.resulttype,voidpointerdef) then
+                        begin
+                           p^.right:=gentypeconvnode(p^.right,ld);
+                           firstpass(p^.right);
+                        end
+                      else if is_equal(p^.left^.resulttype,voidpointerdef) then
+                        begin
+                           p^.left:=gentypeconvnode(p^.left,rd);
+                           firstpass(p^.left);
+                        end
+                      else if not(is_equal(ld,rd)) then
+                        CGMessage(type_e_mismatch);
                       if not(cs_extsyntax in aktmoduleswitches) then
                         CGMessage(type_e_mismatch);
                    end;
                  subn:
                    begin
+                      if not(is_equal(ld,rd)) then
+                        CGMessage(type_e_mismatch);
                       if not(cs_extsyntax in aktmoduleswitches) then
                         CGMessage(type_e_mismatch);
                       p^.resulttype:=s32bitdef;
@@ -1046,7 +1074,20 @@ implementation
 end.
 {
   $Log$
-  Revision 1.26  1999-04-16 20:44:37  florian
+  Revision 1.27  1999-04-28 06:02:14  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.26  1999/04/16 20:44:37  florian
     * the boolean operators =;<>;xor with LOC_JUMP and LOC_FLAGS
       operands fixed, small things for new ansistring management
 

+ 34 - 5
compiler/tcinl.pas

@@ -250,9 +250,17 @@ implementation
                  in_const_sqrt :
                    begin
                      if isreal then
-                      hp:=genrealconstnode(sqrt(vr))
+                       begin
+                          if vr<0.0 then
+                            message(cg_w_may_wrong_math_argument);
+                          hp:=genrealconstnode(sqrt(vr))
+                       end
                      else
-                      hp:=genrealconstnode(sqrt(vl));
+                       begin
+                          if vl<0 then
+                            message(cg_w_may_wrong_math_argument);
+                          hp:=genrealconstnode(sqrt(vl));
+                       end;
                    end;
                  in_const_arctan :
                    begin
@@ -285,9 +293,17 @@ implementation
                  in_const_ln :
                    begin
                      if isreal then
-                      hp:=genrealconstnode(ln(vr))
+                       begin
+                          if vr<=0.0 then
+                            message(cg_w_may_wrong_math_argument);
+                          hp:=genrealconstnode(ln(vr))
+                       end
                      else
-                      hp:=genrealconstnode(ln(vl));
+                       begin
+                          if vl<=0 then
+                            message(cg_w_may_wrong_math_argument);
+                          hp:=genrealconstnode(ln(vl));
+                       end;
                    end;
                  else
                    internalerror(88);
@@ -1084,7 +1100,20 @@ implementation
 end.
 {
   $Log$
-  Revision 1.28  1999-04-26 18:28:12  peter
+  Revision 1.29  1999-04-28 06:02:15  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.28  1999/04/26 18:28:12  peter
     * better read/write array
 
   Revision 1.27  1999/04/26 09:32:22  peter

+ 16 - 1
compiler/tcld.pas

@@ -132,6 +132,8 @@ implementation
                    if p^.symtable^.symtabletype=withsymtable then
                      inc(p^.registers32);
 
+                   if (pvarsym(p^.symtableentry)^.var_options and (vo_is_thread_var or vo_is_dll_var))<>0 then
+                     p^.registers32:=1;
                    { a class variable is a pointer !!!
                      yes, but we have to resolve the reference in an
                      appropriate tree node (FK)
@@ -475,7 +477,20 @@ implementation
 end.
 {
   $Log$
-  Revision 1.23  1999-04-21 21:57:33  pierre
+  Revision 1.24  1999-04-28 06:02:17  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.23  1999/04/21 21:57:33  pierre
    * previous log corrected
 
   Revision 1.22  1999/04/21 16:31:47  pierre

+ 2 - 2
compiler/todo.txt

@@ -15,7 +15,7 @@ compiler version and your short cut.
     - save array for overriding
         - stored qualifier ...................................... 0.99.11 (FK)
         - read/write from/to unit file ........................... 0.99.6 (FK)
-  - call of destructor helper routine
+        - call of destructor helper routine ..................... 0.99.11 (FK)
         - message qualifier ..................................... 0.99.11 (FK)
         - correct handling of constructor result type ............ 0.99.6 (FK)
         - rtti ................................................... 0.99.8 (FK)
@@ -72,7 +72,7 @@ compiler version and your short cut.
         - include/exclude........................................ 0.99.10 (PM)
 - fix all bugs of the bug directory
 - sysutils unit for go32v2 (excpetions!)
-- initialisation/finalization for units
+        - initialisation/finalization for units ................. 0.99.11 (PFV)
 - fixed data type
 - add alignment $A switch
 - $B

+ 16 - 1
compiler/tokens.pas

@@ -186,6 +186,7 @@ type
     _PROCEDURE,
     _PROTECTED,
     _PUBLISHED,
+    _THREADVAR,
     _DESTRUCTOR,
     _INTERNPROC,
     _OPENSTRING,
@@ -363,6 +364,7 @@ const
       (str:'PROCEDURE'     ;special:false;keyword:m_all),
       (str:'PROTECTED'     ;special:false;keyword:m_none),
       (str:'PUBLISHED'     ;special:false;keyword:m_none),
+      (str:'THREADVAR'     ;special:false;keyword:m_objpas),
       (str:'DESTRUCTOR'    ;special:false;keyword:m_all),
       (str:'INTERNPROC'    ;special:false;keyword:m_none),
       (str:'OPENSTRING'    ;special:false;keyword:m_none),
@@ -379,7 +381,20 @@ implementation
 end.
 {
   $Log$
-  Revision 1.5  1999-04-06 11:22:01  peter
+  Revision 1.6  1999-04-28 06:02:19  florian
+    * changes of Bruessel:
+       + message handler can now take an explicit self
+       * typinfo fixed: sometimes the type names weren't written
+       * the type checking for pointer comparisations and subtraction
+         and are now more strict (was also buggy)
+       * small bug fix to link.pas to support compiling on another
+         drive
+       * probable bug in popt386 fixed: call/jmp => push/jmp
+         transformation didn't count correctly the jmp references
+       + threadvar support
+       * warning if ln/sqrt gets an invalid constant argument
+
+  Revision 1.5  1999/04/06 11:22:01  peter
     * more use of ttoken
 
   Revision 1.4  1999/04/01 22:07:53  peter