瀏覽代碼

* more fixes to get it with delphi running

florian 26 年之前
父節點
當前提交
47fd93dfa5
共有 8 個文件被更改,包括 157 次插入132 次删除
  1. 11 5
      compiler/cobjects.pas
  2. 21 19
      compiler/dmisc.pas
  3. 1 1
      compiler/mdppc386.bat
  4. 1 1
      compiler/mppc386.bat
  5. 100 100
      compiler/msgtxt.inc
  6. 12 1
      compiler/ppu.pas
  7. 6 3
      compiler/symtable.pas
  8. 5 2
      compiler/systems.pas

+ 11 - 5
compiler/cobjects.pas

@@ -367,20 +367,23 @@ unit cobjects;
 
   implementation
 
-{$ifdef FPC}
+{$ifndef TP}
     function getspeedvalue(const s : string) : longint;
       var
         p1,p2:^byte;
+        i : longint;
+
       begin
         p1:=@s;
         longint(p2):=longint(p1)+p1^+1;
         inc(longint(p1));
-        getspeedvalue:=0;
+        i:=0;
         while p1<>p2 do
          begin
-           inc(getspeedvalue,p1^);
+           inc(i,p1^);
            inc(longint(p1));
          end;
+        getspeedvalue:=i;
       end;
 {$else}
     function getspeedvalue(const s : string) : longint;
@@ -1433,7 +1436,7 @@ end;
       var
         i : longint;
       begin
-        for i:=1to count do
+        for i:=1 to count do
          if assigned(data^[i]) then
           begin
             dispose(data^[i],done);
@@ -1932,7 +1935,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.26  1999-04-21 09:43:31  peter
+  Revision 1.27  1999-05-05 09:19:03  florian
+    * more fixes to get it with delphi running
+
+  Revision 1.26  1999/04/21 09:43:31  peter
     * storenumber works
     * fixed some typos in double_checksum
     + incompatible types type1 and type2 message (with storenumber)

+ 21 - 19
compiler/dmisc.pas

@@ -157,15 +157,15 @@ uses strings,globals;
                            --- Conversion ---
 ******************************************************************************}
 
-   function GetLastError : DWORD;
+   function GetLastError : DWORD;stdcall;
      external 'Kernel32.dll' name 'GetLastError';
-   function FileTimeToDosDateTime(const ft :TFileTime;var data,time : word) : boolean;
+   function FileTimeToDosDateTime(const ft :TFileTime;var data,time : word) : boolean;stdcall;
      external 'Kernel32.dll' name 'FileTimeToDosDateTime';
-   function DosDateTimeToFileTime(date,time : word;var ft :TFileTime) : boolean;
+   function DosDateTimeToFileTime(date,time : word;var ft :TFileTime) : boolean;stdcall;
      external 'Kernel32.dll' name 'DosDateTimeToFileTime';
-   function FileTimeToLocalFileTime(const ft : TFileTime;var lft : TFileTime) : boolean;
+   function FileTimeToLocalFileTime(const ft : TFileTime;var lft : TFileTime) : boolean;stdcall;
      external 'Kernel32.dll' name 'FileTimeToLocalFileTime';
-   function LocalFileTimeToFileTime(const lft : TFileTime;var ft : TFileTime) : boolean;
+   function LocalFileTimeToFileTime(const lft : TFileTime;var ft : TFileTime) : boolean;stdcall;
      external 'Kernel32.dll' name 'LocalFileTimeToFileTime';
 
 type
@@ -228,11 +228,11 @@ end;
                         --- Info / Date / Time ---
 ******************************************************************************}
 
-   function GetVersion : longint;
+   function GetVersion : longint;stdcall;
      external 'Kernel32.dll' name 'GetVersion';
-   procedure GetLocalTime(var t : TSystemTime);
+   procedure GetLocalTime(var t : TSystemTime);stdcall;
      external 'Kernel32.dll' name 'GetLocalTime';
-   function SetLocalTime(const t : TSystemTime) : boolean;
+   function SetLocalTime(const t : TSystemTime) : boolean;stdcall;
      external 'Kernel32.dll' name 'SetLocalTime';
 
 function dosversion : word;
@@ -446,12 +446,11 @@ end;
 ******************************************************************************}
 
 { Needed kernel calls }
-
-   function FindFirstFile (lpFileName: PChar; var lpFindFileData: TWIN32FindData): THandle;
+   function FindFirstFile (lpFileName: PChar; var lpFindFileData: TWIN32FindData): THandle;stdcall
      external 'Kernel32.dll' name 'FindFirstFileA';
-   function FindNextFile  (hFindFile: THandle; var lpFindFileData: TWIN32FindData): Boolean;
+   function FindNextFile  (hFindFile: THandle; var lpFindFileData: TWIN32FindData): Boolean;stdcall;
      external 'Kernel32.dll' name 'FindNextFileA';
-   function FindCloseFile (hFindFile: THandle): Boolean;
+   function FindCloseFile (hFindFile: THandle): Boolean;stdcall;
      external 'Kernel32.dll' name 'FindClose';
 
 Procedure StringToPchar (Var S : String);
@@ -534,13 +533,13 @@ end;
                                --- File ---
 ******************************************************************************}
 
-   function GetFileTime(h : longint;creation,lastaccess,lastwrite : PFileTime) : boolean;
+   function GetFileTime(h : longint;creation,lastaccess,lastwrite : PFileTime) : boolean;stdcall;
      external 'Kernel32.dll' name 'GetFileTime';
-   function SetFileTime(h : longint;creation,lastaccess,lastwrite : PFileTime) : boolean;
+   function SetFileTime(h : longint;creation,lastaccess,lastwrite : PFileTime) : boolean;stdcall;
      external 'Kernel32.dll' name 'SetFileTime';
-   function SetFileAttributes(lpFileName : pchar;dwFileAttributes : longint) : boolean;
+   function SetFileAttributes(lpFileName : pchar;dwFileAttributes : longint) : boolean;stdcall;
      external 'Kernel32.dll' name 'SetFileAttributesA';
-   function GetFileAttributes(lpFileName : pchar) : longint;
+   function GetFileAttributes(lpFileName : pchar) : longint;stdcall;
      external 'Kernel32.dll' name 'GetFileAttributesA';
 
 procedure fsplit(path : pathstr;var dir : dirstr;var name : namestr;var ext : extstr);
@@ -753,9 +752,9 @@ end;
   terminated by a #0
 }
 
-   function GetEnvironmentStrings : pchar;
+   function GetEnvironmentStrings : pchar;stdcall;
      external 'Kernel32.dll' name 'GetEnvironmentStringsA';
-   function FreeEnvironmentStrings(p : pchar) : boolean;
+   function FreeEnvironmentStrings(p : pchar) : boolean;stdcall;
      external 'Kernel32.dll' name 'FreeEnvironmentStringsA';
 
 function envcount : longint;
@@ -848,7 +847,10 @@ End;
 end.
 {
   $Log$
-  Revision 1.3  1999-05-05 08:20:12  michael
+  Revision 1.4  1999-05-05 09:19:05  florian
+    * more fixes to get it with delphi running
+
+  Revision 1.3  1999/05/05 08:20:12  michael
   * kernel32 changed to kernel32.dll
 
   Revision 1.2  1999/05/04 21:44:41  florian

+ 1 - 1
compiler/mdppc386.bat

@@ -1,2 +1,2 @@
-dcc32 -Di386 -DGDB -Ddelphi -Ddelphi4 -ADOS=sysutils -ASTRINGS=sysutils -CC -$H- ppc.dpr %1 %2 %3 %4 %5 %6 %7 %8 %9
+dcc32 -Di386 -DGDB -Ddelphi -Ddelphi4 -ADOS=sysutils -ASTRINGS=sysutils -CC -$O+ -$H- ppc.dpr %1 %2 %3 %4 %5 %6 %7 %8 %9
 

+ 1 - 1
compiler/mppc386.bat

@@ -1,4 +1,4 @@
-ppc386 -Ch8000000 -dI386 -dGDB -dBROWSERLOG -a -Sg pp.pas %1 %2 %3 %4 %5 %6 %7 %8 %9
+ppc386 -O2p3 -Ch8000000 -dI386 -dGDB -dBROWSERLOG -a -Sg pp.pas %1 %2 %3 %4 %5 %6 %7 %8 %9
 if errorlevel 0 goto success
 goto failed
 :success

+ 100 - 100
compiler/msgtxt.inc

@@ -1,8 +1,8 @@
 {$ifdef Delphi}
-const msgtxt : array[0..00103] of string[240]=(
-{$else}
-const msgtxt : array[0..00103,1..240] of char=(
-{$endif}
+const msgtxt : array[0..    00103] of string[240]=(
+{$else Delphi}
+const msgtxt : array[0..    00103,1..240] of char=(
+{$endif Delphi}
   'T_Compiler: $1'#000+
   'D_Source OS: $1'#000+
   'I_Target OS: $1'#000+
@@ -118,121 +118,121 @@ const msgtxt : array[0..00103,1..240] of char=(
   'E_Only class methods can be accessed in class methods'#000+
   'E_Constant and CASE types do not match'#000+
   'E_The symbol can'#039't be exported from a library'#000+
-  'W_A inherit','ed method is hidden by $1'#000+
+  'W_An inheri','ted method is hidden by $1'#000+
   'E_There is no method in an ancestor class to be overridden: $1'#000+
   'E_No member is provided to access property'#000+
   'W_Stored prorperty directive is not yet implemented'#000+
   'E_Illegal symbol for property access'#000+
-  'E_Cannot access a p','rotected field of an object here'#000+
+  'E_Cannot access a ','protected field of an object here'#000+
   'E_Cannot access a private field of an object here'#000+
   'W_overloaded method of virtual method should be virtual: $1'#000+
   'W_overloaded method of non-virtual method should be non-virtual: $1'#000+
-  'E_overloaded methods which ar','e virtual must have the same return typ'+
+  'E_overloaded methods which a','re virtual must have the same return typ'+
   'e: $1'#000+
   'E_EXPORT declared functions can'#039't be nested'#000+
   'E_methods can'#039't be EXPORTed'#000+
   'E_call by var parameters have to match exactly'#000+
   'E_Class isn'#039't a parent class of the current class'#000+
-  'E_SELF is only allowed in ','methods'#000+
+  'E_SELF is only allowed in',' methods'#000+
   'E_methods can be only in other methods called direct with type identif'+
   'ier of the class'#000+
   'E_Illegal use of '#039':'#039#000+
   'E_range check error in set constructor or duplicate set element'#000+
   'E_Pointer to object expected'#000+
-  'E_Expression must be constructo','r call'#000+
+  'E_Expression must be construct','or call'#000+
   'E_Expression must be destructor call'#000+
   'E_Illegal order of record elements'#000+
   'E_Expression type must be class or record type'#000+
   'E_Functions with void return value can'#039't return any value'#000+
   'E_constructors and destructors must be methods'#000+
-  'E_Operato','r is not overloaded'#000+
+  'E_Operat','or is not overloaded'#000+
   'E_Re-raise isn'#039't possible there'#000+
   'E_The extended syntax of new or dispose isn'#039't allowed for a class'#000+
   'E_Assembler incompatible with function return value'#000+
   'E_Procedure overloading is switched off'#000+
-  'E_It is not possible to overlo','ad this operator (overload = instead)'#000+
+  'E_It is not possible to overl','oad this operator (overload = instead)'#000+
   'E_Comparative operator must return a boolean value'#000+
   'E_Only virtual methods can be abstract'#000+
   'F_Use of unsupported feature!'#000+
   'E_The mix of CLASSES and OBJECTS isn'#039't allowed'#000+
-  'W_Unknown procedure directive had t','o be ignored: $1'#000+
+  'W_Unknown procedure directive had ','to be ignored: $1'#000+
   'E_absolute can only be associated to ONE variable'#000+
   'E_absolute can only be associated a var or const'#000+
   'E_Only ONE variable can be initialized'#000+
-  'E_Abtract methods shouldn'#039't have any definition (with function bod'+
-  'y)'#000+
-  'E_This overloade','d function can'#039't be local (must be exported)'#000+
+  'E_Abstract methods shouldn'#039't have any definition (with function bo'+
+  'dy)'#000+
+  'E_This overloa','ded function can'#039't be local (must be exported)'#000+
   'W_Virtual methods are used without a constructor in $1'#000+
   'M_Macro defined: $1'#000+
   'M_Macro undefined: $1'#000+
   'M_Macro $1 set to $2'#000+
   'I_Compiling $1'#000+
   'D_Compiling $1 for the second time'#000+
-  'E_Array properties aren'#039't a','llowed at this point'#000+
+  'E_Array properties aren'#039't',' allowed at this point'#000+
   'E_No property found to override'#000+
   'E_Only one default property is allowed, found inherited default proper'+
   'ty in class $1'#000+
   'E_The default property must be an array property'#000+
-  'E_Virtual constructors are only supported in class ob','ject model'#000+
+  'E_Virtual constructors are only supported in class ','object model'#000+
   'E_No default property available'#000+
   'E_The class can'#039't have a published section, use the {$M+} switch'#000+
   'E_Forward declaration of class $1 must be resolved here to use the cla'+
   'ss as ancestor'#000+
   'E_Local operators not supported'#000+
-  'E_Procedure dir','ective $1 not allowed in interface section'#000+
+  'E_Procedure d','irective $1 not allowed in interface section'#000+
   'E_Procedure directive $1 not allowed in implementation section'#000+
   'E_Procedure directive $1 not allowed in procvar declaration'#000+
   'E_Function is already declared Public/Forward $1'#000+
-  'E_Can'#039't use both EXPORT a','nd EXTERNAL'#000+
+  'E_Can'#039't use both EXPORT',' and EXTERNAL'#000+
   'E_NAME keyword expected'#000+
   'W_$1 not yet supported inside inline procedure/function'#000+
   'W_Inlining disabled'#000+
   'I_Writing Browser log $1'#000+
   'H_may be pointer dereference is missing'#000+
   'F_Selected assembler reader not supported'#000+
-  'E_Procedure directive',' $1 has conflicts with other directives'#000+
+  'E_Procedure directi','ve $1 has conflicts with other directives'#000+
   'E_Calling convention doesn'#039't match forward'#000+
   'E_Register calling (fastcall) not supported'#000+
   'E_Property can'#039't have a default value'#000+
   'E_The default value of a property must be constant'#000+
-  'E_Symbol can'#039't be publis','hed, can be only a class'#000+
+  'E_Symbol can'#039't be publ','ished, can be only a class'#000+
   'E_That kind of property can'#039't be published'#000+
   'W_Empty import name specified'#000+
   'W_Empty import name specified'#000+
   'E_Function internal name changed after use of function'#000+
   'E_Division by zero'#000+
   'E_Invalid floating point operation'#000+
-  'E_U','pper bound of range is less than lower bound'#000+
+  'E','_Upper bound of range is less than lower bound'#000+
   'E_string length is larger than array of char length'#000+
   '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_Self c','an be only an explicit parameter in message handlers'#000+
+  'E_Self',' can 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: got $1 expected $2'#000+
   'E_Integer expression expected'#000+
   'E_Ordinal expression expected'#000+
-  'E_Type identifier expected'#000+
-  'E','_Variable identifier expected'#000+
+  'E_Type identifier expected',#000+
+  'E_Variable identifier expected'#000+
   'E_pointer type expected'#000+
   'E_class type expected'#000+
   'E_Variable or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_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 i'+
+  'W_Automatic ty','pe conversion from floating type to COMP which is an i'+
   'nteger type'#000+
   'H_use DIV instead to get an integer result'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
-  'E_Can'#039't read or write variabl','es of this type'#000+
+  'E_Can'#039't read or write varia','bles of this type'#000+
   'E_Type conflict between set elements'#000+
   'W_lo/hi(longint/dword) returns the upper/lower word'#000+
   'E_Integer or real expression expected'#000+
   'E_Wrong type in array constructor'#000+
   'E_Incompatible type for arg #$1: Got $2, expected $3'#000+
-  'E_Identifi','er not found $1'#000+
+  'E_Identi','fier not found $1'#000+
   'F_Internal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#000+
   'E_Unknown identifier $1'#000+
@@ -240,12 +240,12 @@ const msgtxt : array[0..00103,1..240] of char=(
   'F_Identifier type already defined as type'#000+
   'E_Error in type definition'#000+
   'E_Type identifier not defined'#000+
-  'E_F','orward type not resolved $1'#000+
+  'E','_Forward type not resolved $1'#000+
   'E_Only static variables can be used in static methods or outside metho'+
   'ds'#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 a','l'+
+  'E_Instances of classes or objects with an abstract method are not',' al'+
   'lowed'#000+
   'W_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
@@ -254,13 +254,13 @@ const msgtxt : array[0..00103,1..240] of char=(
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
   'E_illegal type declaration of set elements'#000+
-  'E_For','ward class definition not resolved $1'#000+
+  'E_F','orward class definition not resolved $1'#000+
   'H_Parameter not used $1'#000+
   'N_Local variable not used $1'#000+
   'E_Set type expected'#000+
   'W_Function result does not seem to be set'#000+
   'E_Unknown record field identifier $1'#000+
-  'W_Local variable $1 does not seem to be initialize','d'#000+
+  'W_Local variable $1 does not seem to be initiali','zed'#000+
   'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
@@ -269,59 +269,59 @@ const msgtxt : array[0..00103,1..240] of char=(
   'E_Illegal expression'#000+
   'E_Invalid integer'#000+
   'E_Illegal qualifier'#000+
-  'E_High range limit < low rang','e limit'#000+
+  'E_High range limit < low ra','nge limit'#000+
   'E_Illegal counter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#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_The use of a far pointer isn'#039't allowed there'#000,
+  'E_illegal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
   'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
   'h to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
-  'E_procedure call with stackframe ESP','/SP'#000+
+  'E_procedure call with stackframe E','SP/SP'#000+
   'E_Abstract methods can'#039't be called directly'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
   'F_32-bit unsigned not supported in MC68000 mode'#000+
-  'F_In','ternal Error in secondinline()'#000+
+  'F_','Internal Error in secondinline()'#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 procvar calls'#000+
   'E_No code for inline procedure stored'#000+
-  'E_Element zer','o of an ansi/wide- or longstring can'#039't be accessed,'+
+  'E_Element z','ero of an ansi/wide- or longstring can'#039't be accessed,'+
   ' use (set)length instead'#000+
   'E_Include or exclude not implemented in this case'#000+
   'W_Probably illegal constant passed to internal math function'#000+
-  'E_Constructors or destructors can not be called insid','e with here'#000+
+  'E_Constructors or destructors can not be called ins','ide with here'#000+
   'E_Cannot call message handler method directly'#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 Operator in asm evaluator'#000+
-  'F_Unknown error',' in asm evaluator'#000+
+  'F_Unknown err','or in asm evaluator'#000+
   'W_Invalid numeric value'#000+
   'E_escape sequence ignored: $1'#000+
   'E_Asm syntax error - Prefix not found'#000+
   'E_Asm syntax error - Trying to add more than one 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_Calli','ng an overload function in an asm'#000+
   'E_Constant value out of bounds'#000+
   'E_Non-label pattern contains @'#000+
   'E_Invalid Operand: $1'#000+
   'W_Override operator not supported'#000+
   'E_Error in binary constant: $1'#000+
   'E_Error in octal constant: $1'#000+
-  'E_Error in hexadecimal consta','nt: $1'#000+
+  'E_Error in hexadecimal cons','tant: $1'#000+
   'E_Error in integer constant: $1'#000+
   'E_Invalid labeled opcode'#000+
   'F_Internal error in Findtype()'#000+
@@ -329,13 +329,13 @@ const msgtxt : array[0..00103,1..240] of char=(
   '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 allow','ed'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
   'E_Invalid combination 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_Invalid size',' in reference'#000+
+  'E_Invalid si','ze in reference'#000+
   'E_Invalid middle sized operand'#000+
   'E_Invalid three operand opcode'#000+
   'E_Assembler syntax error'#000+
@@ -343,75 +343,75 @@ const msgtxt : array[0..00103,1..240] of char=(
   'E_Segment overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
   'F_Internal Errror converting binary'#000+
-  'F_Internal Errror',' converting hexadecimal'#000+
+  'F_Internal Errr','or converting hexadecimal'#000+
   'F_Internal Errror converting octal'#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_Invalid sca','ling factor'#000+
+  'E_Invalid s','caling factor'#000+
   'E_Invalid scaling value'#000+
   'E_Scaling value only allowed with index'#000+
   'E_Invalid assembler syntax. No ref with brackets)'#000+
   'E_Expressions of the form [sreg:reg...] are currently not supported'#000+
-  'E_Trying to define a segment register twice'#000+
-  'E_','Trying to define a base 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_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_Invalid R','eference syntax'#000+
+  'E_Invalid',' Reference syntax'#000+
   'E_Invalid string as opcode operand: $1'#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 error - S','hould 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_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'+
+  'W_A repea','t prefix and a segment override on <= i386 may result in er'+
   'rors 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_D','uplicate local symbol: $1'#000+
+  'E','_Duplicate local symbol: $1'#000+
   'E_Unknown label identifer: $1'#000+
   'E_Assemble node syntax error'#000+
   'E_Undefined local symbol: $1'#000+
   'D_Starting intel styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
-  'E_Not a directive or local symbol: $','1'#000+
+  'E_Not a directive or local symbol:',' $1'#000+
   'E_/ at beginning of line not allowed'#000+
   'E_NOR not supported'#000+
   'E_Invalid floating point register name'#000+
   '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 destination',' or source size do not match'#000+
+  'E_Size suffix and destinati','on 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_Floating po','int octal representation ignored'#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 external'#000+
-  'E_','Invalid segment override expression'#000+
+  'W_Identifier $1 supposed external'#000,
+  'E_Invalid segment override expression'#000+
   'E_Strings not allowed as constants'#000+
   'D_Starting AT&T styled assembler parsing...'#000+
   'D_Finished AT&T styled assembler parsing...'#000+
   'E_Switching sections is not allowed in an assembler block'#000+
-  'E_Invalid global defini','tion'#000+
+  'E_Invalid global defi','nition'#000+
   'E_Line separator expected'#000+
   'W_globl not supported'#000+
   'W_align not supported'#000+
@@ -420,7 +420,7 @@ const msgtxt : array[0..00103,1..240] of char=(
   'E_Invalid local common definition'#000+
   'E_Invalid global common definition'#000+
   'E_local symbol: $1 not found inside asm statement'#000+
-  'E_a','ssembler code not returned to text'#000+
+  'E','_assembler code not returned to text'#000+
   'F_internal error in BuildReference()'#000+
   'E_invalid opcode size'#000+
   'W_NEAR ignored'#000+
@@ -428,53 +428,53 @@ const msgtxt : array[0..00103,1..240] of char=(
   'D_Creating inline asm lookup tables'#000+
   'E_Using a defined name as a local label'#000+
   'F_internal error in HandleExtend()'#000+
-  'E_Inva','lid character: <'#000+
+  'E_In','valid character: <'#000+
   'E_Invalid character: >'#000+
   'E_Unsupported opcode'#000+
   'E_Increment and Decrement mode not allowed together'#000+
   'E_Invalid Register list in movem/fmovem'#000+
   'E_Invalid Register list for opcode'#000+
   'E_68020+ mode required to assemble'#000+
-  'D_Starting Motoro','la styled assembler parsing...'#000+
+  'D_Starting Moto','rola 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 thi','s mode'#000+
   'E_Comp not supported in this mode'#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 param','eter with a register'#000+
+  'E_Cannot index a local var or par','ameter with a register'#000+
   'H_$1 translated to $2'#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 create asse','mber file $1'#000+
+  'E_Can'#039't create as','sember 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 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_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 fou','nd, switching to external binding'#000+
+  'W_binder not f','ound, switching to external binding'#000+
   'W_ar not found, switching to external 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 executab','le $1'#000+
+  'F_Can'#039't post process execut','able $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+
@@ -483,7 +483,7 @@ const msgtxt : array[0..00103,1..240] of char=(
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
   'T_PPU Loading $1'#000+
-  'U_PPU ','Name: $1'#000+
+  'U_PP','U Name: $1'#000+
   'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
@@ -492,8 +492,8 @@ const msgtxt : array[0..00103,1..240] of char=(
   '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+
-  'U','_Writing $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+
@@ -502,60 +502,60 @@ const msgtxt : array[0..00103,1..240] of char=(
   '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 uni','t $1, no sources available'#000+
+  'F_Can'#039't compile u','nit $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 only'#000+
-  'U_Rec','ompiling unit, static lib is older than ppufile'#000+
+  'U_R','ecompiling 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 implem','entation of $1'#000+
+  'U_Parsing impl','ementation of $1'#000+
   'U_Second 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+
+  'F_No source file na','me in command line'#000+
   'E_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
   'N_Reading further options from $1'#000+
   'W_Target is already set to: $1'#000+
-  'W_Shared libs not supported on DOS platform, reverting ','to static'#000+
+  'W_Shared libs not supported on DOS platform, revertin','g to static'#000+
   'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
   'F_open conditional at the end of the file'#000+
   'W_Debug information generation is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
   'W_You are using the obsolete switch $1'#000+
-  'Free Pascal Co','mpiler version $FPCVER [$FPCDATE] for $FPCTARGET'#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 Licenc','e'#000+
   'For more information read COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
   '                 [email protected]'#000+
   '**0*_put + after a boolean switch option to enable it, - to disable it'+
   #000+
-  '**1a_the compiler doesn'#039't delete the generated ','assembler file'#000+
+  '**1a_the compiler doesn'#039't delete the generate','d assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
   '**1b_generate 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 (between 1023 ','and 67107840)'#000+
+  '**2Ch<n>_<n> bytes heap (between 102','3 and 67107840)'#000+
   '**2Ci_IO-checking'#000+
   '**2Cn_omit linking stage'#000+
   '**2Co_check overflow of integer operations'#000+
@@ -564,22 +564,22 @@ const msgtxt : array[0..00103,1..240] of char=(
   '**2Ct_stack checking'#000+
   '3*2CS_create static library'#000+
   '3*2Cx_use smartlinking'#000+
-  '**1d<x>_defines ','the symbol <x>'#000+
+  '**1d<x>_define','s the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F_set 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+
   '*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 path'#000+
-  '**2Fr','<x>_load error message file <x>'#000+
+  '**2','Fr<x>_load error message file <x>'#000+
   '**2Fu<x>_adds <x> to unit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g_generate debugger information'#000+
@@ -587,7 +587,7 @@ const msgtxt : array[0..00103,1..240] of char=(
   '*g2gd_use dbx'#000+
   '*g2gh_use heap trace unit'#000+
   '**1i_information'#000+
-  '**2iD_return compi','ler date'#000+
+  '**2iD_return com','piler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return source OS'#000+
   '**2iSP_return source processor'#000+
@@ -596,70 +596,70 @@ const msgtxt : array[0..00103,1..240] of char=(
   '**1I<x>_adds <x> to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
-  '**1n_don'#039't ','read the default config file'#000+
+  '**1n_don'#039,'t read 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+
   '**1S_syntax options'#000+
-  '**2S2_switch some Delphi 2 extensi','ons on'#000+
+  '**2S2_switch some Delphi 2 exten','sions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
   '**2Se_compiler stops after the first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
   '**2Si_support C++ stlyed INLINE'#000+
-  '**2Sm_support macros li','ke 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+
-  '**','1u<x>_undefines the symbol <x>'#000+
+  '**1s_don'#039't call assembler and linker (only with -a)'#000,
+  '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options'#000+
   '**2Un_don'#039't check the unit name'#000+
   '**2Up<x>_same as -Fu<x>'#000+
   '**2Us_compile a system unit'#000+
   '**1v<x>_Be verbose. <x> is a combination of the following letters :'#000+
-  '**2*_e : Show errors (default)       d ',': Show debug info'#000+
+  '**2*_e : Show errors (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 : S','how compiled procedures'#000+
+  '**2*_i : Show general info           p :',' Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
-  '**2*_    declarat','ions if an error    x : Executable info (Win32 only'+
+  '**2*_    declar','ations 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 libraries (defines FPC_LINK_STATIC)'#000+
+  '**2XS_link wit','h static libraries (defines FPC_LINK_STATIC)'#000+
   '**0*_Processor specific options:'#000+
   '3*1A<x>_output format'#000+
   '3*2Ao_coff file using GNU AS'#000+
   '3*2Anasmcoff_coff file using Nasm'#000+
   '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
   '3*2Anasmobj_obj file using Nasm'#000+
-  '3*2Am','asm_obj using Masm (Mircosoft)'#000+
+  '3*2','Amasm_obj using Masm (Mircosoft)'#000+
   '3*2Atasm_obj using Tasm (Borland)'#000+
   '3*1R<x>_assembler reading style'#000+
   '3*2Ratt_read AT&T style assembler'#000+
   '3*2Rintel_read Intel style assembler'#000+
   '3*2Rdirect_copy assembler text directly to assembler file'#000+
-  '3*1O<x>_optimi','zations'#000+
+  '3*1O<x>_opti','mizations'#000+
   '3*2Og_generate smaller code'#000+
   '3*2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
   '3*2Ou_enable uncertain optimizations (see docs)'#000+
   '3*2O1_level 1 optimizations (quick optimizations)'#000+
-  '3*2O2_leve','l 2 optimizations (-O1 + slower optimizations)'#000+
+  '3*2O2_le','vel 2 optimizations (-O1 + slower optimizations)'#000+
   '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op_target processor'#000+
   '3*3Op1_set target processor to 386/486'#000+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
-  '3*3Op3_set target processor to PP','ro/PII/c6x86/K6 (tm)'#000+
+  '3*3Op3_set target processor to ','PPro/PII/c6x86/K6 (tm)'#000+
   '3*1T<x>_Target operating system'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
@@ -667,7 +667,7 @@ const msgtxt : array[0..00103,1..240] of char=(
   '3*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
   '6*1A<x>_output format'#000+
-  '6*2Ao_Unix ','o-file using GNU AS'#000+
+  '6*2Ao_Uni','x o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
   '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
@@ -675,14 +675,14 @@ const msgtxt : array[0..00103,1..240] of char=(
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
   '6*2OG_generate faster code (default)'#000+
-  '6*2Ox_optimi','ze maximum (still BUGGY!!!)'#000+
+  '6*2Ox_opti','mize 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_Macinto','sh m68k'#000+
+  '6*2TMACOS_Macin','tosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+

+ 12 - 1
compiler/ppu.pas

@@ -235,11 +235,19 @@ implementation
 *****************************************************************************}
 
 var
+{$ifdef Delphi}
+  Crc32Tbl : array[0..255] of longword;
+{$else Delphi}
   Crc32Tbl : array[0..255] of longint;
+{$endif Delphi}
 
 procedure MakeCRC32Tbl;
 var
+{$ifdef Delphi}
+  crc : longword;
+{$else Delphi}
   crc : longint;
+{$endif Delphi}
   i,n : byte;
 begin
   for i:=0 to 255 do
@@ -874,7 +882,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.31  1999-05-04 21:44:59  florian
+  Revision 1.32  1999-05-05 09:19:15  florian
+    * more fixes to get it with delphi running
+
+  Revision 1.31  1999/05/04 21:44:59  florian
     * changes to compile it with Delphi 4.0
 
   Revision 1.30  1999/04/26 18:30:00  peter

+ 6 - 3
compiler/symtable.pas

@@ -648,7 +648,7 @@ const localsymtablestack : psymtable = nil;
 
     procedure resolvesym(var d : psym);
       begin
-        if longint(d)=$ffffffff then
+        if longint(d)=-1 then
           d:=nil
         else
           begin
@@ -670,7 +670,7 @@ const localsymtablestack : psymtable = nil;
 
     procedure resolvedef(var d : pdef);
       begin
-        if longint(d)=$ffffffff then
+        if longint(d)=-1 then
           d:=nil
         else
           begin
@@ -3204,7 +3204,10 @@ const localsymtablestack : psymtable = nil;
 end.
 {
   $Log$
-  Revision 1.5  1999-05-01 13:24:43  peter
+  Revision 1.6  1999-05-05 09:19:16  florian
+    * more fixes to get it with delphi running
+
+  Revision 1.5  1999/05/01 13:24:43  peter
     * merged nasm compiler
     * old asm moved to oldasm/
 

+ 5 - 2
compiler/systems.pas

@@ -130,7 +130,7 @@ unit systems;
           id        : tos;
           name      : string[30];
           shortname : string[8];
-          sharedlibext,
+          sharedlibext : string[10];
           staticlibext,
           sourceext,
           pasext,
@@ -1467,7 +1467,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.69  1999-05-03 18:03:29  peter
+  Revision 1.70  1999-05-05 09:19:18  florian
+    * more fixes to get it with delphi running
+
+  Revision 1.69  1999/05/03 18:03:29  peter
     * no ar.exe running field in target_asm
 
   Revision 1.68  1999/05/02 22:41:59  peter