Browse Source

* fixes for 0.99.8

peter 27 years ago
parent
commit
a990cb8ab6
2 changed files with 20 additions and 19 deletions
  1. 15 12
      rtl/i386/rttip.inc
  2. 5 7
      rtl/inc/text.inc

+ 15 - 12
rtl/i386/rttip.inc

@@ -16,7 +16,7 @@
 { Run-Time type information routines - processor dependent part }
 {$ASMMODE DIRECT}
 
-Procedure Initialize (Data,TypeInfo : pointer);[Public,Alias : 'FPC_INITIALIZE'];assembler;
+Procedure Initialize (Data,TypeInfo : pointer);[Public,Alias : 'FPC_INITIALIZE'{$ifndef FPC_NAMES},alias:'INITIALIZE'{$endif}];assembler;
 
 asm
 # Save registers
@@ -72,10 +72,10 @@ asm
 # Array handling
 .DoArrayInit:
 # Skip array name !!
-	incl	%ebx
-	movzbl  (%ebx),%eax
-	incl	%eax
-	addl	%eax,%ebx
+        incl    %ebx
+        movzbl  (%ebx),%eax
+        incl    %eax
+        addl    %eax,%ebx
 # %ebx points to size. Put size in ecx
         movl    (%ebx),%ecx
         addl    $4, %ebx
@@ -108,7 +108,7 @@ asm
         pop     %eax
 end;
 
-Procedure Finalize (Data,TypeInfo: Pointer);[Public,Alias : 'FPC_FINALIZE']; assembler;
+Procedure Finalize (Data,TypeInfo: Pointer);[Public,Alias : 'FPC_FINALIZE'{$ifndef FPC_NAMES},alias:'FINALIZE'{$endif}]; assembler;
 
 asm
         push    %eax
@@ -151,7 +151,7 @@ asm
 # Push type
         pushl    (%ebx)
         addl     $4,%ebx
-# %ebx points to offset.        
+# %ebx points to offset.
 # Use to calculate data
         movl    8(%ebp),%eax
         addl    (%ebx),%eax
@@ -163,10 +163,10 @@ asm
 # Array handling
 .DoArrayFinal:
 # Skip array name !!
-	incl	%ebx
-	movzbl  (%ebx),%eax
-	incl	%eax
-	addl	%eax,%ebx
+        incl    %ebx
+        movzbl  (%ebx),%eax
+        incl    %eax
+        addl    %eax,%ebx
 # %ebx points to size. Put size in ecx
         movl    (%ebx),%ecx
         addl    $4, %ebx
@@ -374,7 +374,10 @@ end;
 
 {
   $Log$
-  Revision 1.9  1998-09-29 08:38:25  michael
+  Revision 1.10  1998-11-16 12:21:47  peter
+    * fixes for 0.99.8
+
+  Revision 1.9  1998/09/29 08:38:25  michael
   + Corrections in record and array handling.
 
   Revision 1.8  1998/09/20 17:49:07  florian

+ 5 - 7
rtl/inc/text.inc

@@ -479,20 +479,17 @@ Begin
   WriteBuffer(f,p^,PCharLen);
 End;
 
-{$ifdef UseAnsiStrings}
+
 Procedure Write_Text_AnsiString (Len : Longint; Var T : TextRec; S : Pointer);[Public, alias: {$ifdef FPCNAMES}'FPC_'+{$endif}'WRITE_TEXT_ANSISTRING'];
 {
  Writes a AnsiString to the Text file T
 }
-
 begin
   If S=Nil then
    exit;
   Write_pchar (Len,t,PChar(S));
 end;
 
-{$endif}
-
 
 Procedure Write_LongInt(Len : Longint;var t : TextRec;l : Longint);[Public,Alias: {$ifdef FPCNAMES}'FPC_'+{$endif}'WRITE_TEXT_LONGINT'];
 var
@@ -905,7 +902,6 @@ Begin
 End;
 
 
-{$ifdef useansistrings}
 Procedure Read_String(Maxlen : Longint;var f : TextRec;var s : AnsiString);[Public,Alias: {$ifdef FPCNAMES}'FPC_'+{$endif}'READ_TEXT_ANSISTRING'];
 var
   p,maxp,startp,sidx : PChar;
@@ -965,7 +961,6 @@ Begin
   sidx^:=#0;
   PAnsiRec(Pointer(S)-FirstOff)^.Len:=spos;
 End;
-{$endif}
 
 
 Procedure Read_Longint(var f : TextRec;var l : Longint);[Public,Alias: {$ifdef FPCNAMES}'FPC_'+{$endif}'READ_TEXT_LONGINT'];
@@ -1199,7 +1194,10 @@ end;
 
 {
   $Log$
-  Revision 1.33  1998-10-23 00:03:29  peter
+  Revision 1.34  1998-11-16 12:21:48  peter
+    * fixes for 0.99.8
+
+  Revision 1.33  1998/10/23 00:03:29  peter
     * write(pchar) has check for nil
 
   Revision 1.32  1998/10/20 14:37:45  peter