瀏覽代碼

* change .align to .balign

peter 25 年之前
父節點
當前提交
91592c2c11
共有 2 個文件被更改,包括 17 次插入22 次删除
  1. 11 8
      rtl/i386/strings.inc
  2. 6 14
      rtl/i386/stringss.inc

+ 11 - 8
rtl/i386/strings.inc

@@ -37,7 +37,7 @@ asm
         jz      .LStrCopyDone
         jz      .LStrCopyDone
         decl    %ecx
         decl    %ecx
         jnz     .LStrCopyAlignLoop
         jnz     .LStrCopyAlignLoop
-        .align  16
+        .balign  16
 .LStrCopyAligned:
 .LStrCopyAligned:
         movl    (%esi),%eax
         movl    (%esi),%eax
         addl    $4,%esi
         addl    $4,%esi
@@ -98,7 +98,7 @@ asm
         movl    maxlen,%ecx
         movl    maxlen,%ecx
         movl    dest,%edi
         movl    dest,%edi
         orl     %ecx,%ecx
         orl     %ecx,%ecx
-        jz      .LSTRLCOPY2 
+        jz      .LSTRLCOPY2
         cld
         cld
 .LSTRLCOPY1:
 .LSTRLCOPY1:
         lodsb
         lodsb
@@ -128,7 +128,7 @@ asm
         scasb
         scasb
         movl    $0xfffffffe,%eax
         movl    $0xfffffffe,%eax
         subl    %ecx,%eax
         subl    %ecx,%eax
-.LNil:        
+.LNil:
 end ['EDI','ECX','EAX'];
 end ['EDI','ECX','EAX'];
 
 
 
 
@@ -292,7 +292,7 @@ asm
         decl    %esi
         decl    %esi
         jnz     .LSTRSCANALIGNLOOP
         jnz     .LSTRSCANALIGNLOOP
         jmp     .LSTRSCANLOOP
         jmp     .LSTRSCANLOOP
-        .align  16
+        .balign  16
 .LSTRSCANLOOP:
 .LSTRSCANLOOP:
         movl    (%edi),%eax
         movl    (%edi),%eax
         movl    %eax,%esi
         movl    %eax,%esi
@@ -343,7 +343,7 @@ end ['EAX','ECX','ESI','EDI','EDX'];
 
 
 function strrscan(p : pchar;c : char) : pchar;assembler;
 function strrscan(p : pchar;c : char) : pchar;assembler;
 asm
 asm
-	xorl    %eax,%eax
+        xorl    %eax,%eax
         movl    p,%edi
         movl    p,%edi
         orl     %edi,%edi
         orl     %edi,%edi
         jz      .LSTRRSCAN
         jz      .LSTRRSCAN
@@ -372,8 +372,8 @@ end ['EAX','ECX','EDI'];
 function strupper(p : pchar) : pchar;assembler;
 function strupper(p : pchar) : pchar;assembler;
 asm
 asm
         movl    p,%esi
         movl    p,%esi
-	orl     %esi,%esi
-	jz      .LStrUpperNil
+        orl     %esi,%esi
+        jz      .LStrUpperNil
         movl    %esi,%edi
         movl    %esi,%edi
 .LSTRUPPER1:
 .LSTRUPPER1:
         lodsb
         lodsb
@@ -414,7 +414,10 @@ end ['EAX','ESI','EDI'];
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.9  2000-06-11 14:25:23  jonas
+  Revision 1.10  2000-06-12 19:53:32  peter
+    * change .align to .balign
+
+  Revision 1.9  2000/06/11 14:25:23  jonas
     * much faster strcopy and strscan procedures
     * much faster strcopy and strscan procedures
 
 
   Revision 1.8  2000/03/28 11:14:33  jonas
   Revision 1.8  2000/03/28 11:14:33  jonas

+ 6 - 14
rtl/i386/stringss.inc

@@ -17,15 +17,8 @@
 
 
 function strpas(p : pchar) : string;
 function strpas(p : pchar) : string;
 begin
 begin
-{$ifndef NEWATT}
-  strpas:='';
-{$endif}
 asm
 asm
-{$ifdef NEWATT}
         movl    __RESULT,%edi
         movl    __RESULT,%edi
-{$else}
-        movl    8(%ebp),%edi
-{$endif}
         movl    p,%esi
         movl    p,%esi
         // at the end, add 255 to cl to get the string length (byte(1+255) = 0)
         // at the end, add 255 to cl to get the string length (byte(1+255) = 0)
         movb    $1,%cl
         movb    $1,%cl
@@ -39,7 +32,7 @@ asm
         addl    $3,%esi
         addl    $3,%esi
         // Store everything already, since the temp string = 255 chars anyway
         // Store everything already, since the temp string = 255 chars anyway
         // The length byte will contain zero this way, but it will be
         // The length byte will contain zero this way, but it will be
-        // overwritten at the end, so it doesn't matter       
+        // overwritten at the end, so it doesn't matter
         movl    %eax,(%edi)
         movl    %eax,(%edi)
         // test the second char (we shifted left 8 bits)
         // test the second char (we shifted left 8 bits)
         testl   $0x0ff0000,%eax
         testl   $0x0ff0000,%eax
@@ -51,7 +44,7 @@ asm
         testl   $0x0ff000000,%eax
         testl   $0x0ff000000,%eax
         jz      .LStrPasDone
         jz      .LStrPasDone
         incb    %cl
         incb    %cl
-        .align  16
+        .balign  16
 .LStrPasLoop:
 .LStrPasLoop:
         movl    (%esi),%eax
         movl    (%esi),%eax
         addl    $4,%esi
         addl    $4,%esi
@@ -80,11 +73,7 @@ asm
 .LStrPasByte:
 .LStrPasByte:
         incb    %cl
         incb    %cl
 .LStrPasDone:
 .LStrPasDone:
-{$ifdef NEWATT}
         movl    __RESULT,%edi
         movl    __RESULT,%edi
-{$else}
-        movl    8(%ebp),%edi
-{$endif}
         addb    $255,%cl
         addb    $255,%cl
         movb    %cl,(%edi)
         movb    %cl,(%edi)
 end ['EAX','ECX','ESI','EDI'];
 end ['EAX','ECX','ESI','EDI'];
@@ -109,7 +98,10 @@ end ['EDI','EAX','ECX'];
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.12  2000-06-12 13:17:56  jonas
+  Revision 1.13  2000-06-12 19:53:32  peter
+    * change .align to .balign
+
+  Revision 1.12  2000/06/12 13:17:56  jonas
     * fixed typo :(
     * fixed typo :(
 
 
   Revision 1.11  2000/06/12 08:33:26  jonas
   Revision 1.11  2000/06/12 08:33:26  jonas