* assembler wouldn't include always anymore ->changed i386 to cpui386.

    Changed assembler SELF reference from ESI to EAX. (probably now hidden param instead of fixed register ESI)
    Alternative solution for Mantis #21242

git-svn-id: trunk@20968 -

packages/bzip2/src/bzip2.pas

@@ -87,7 +87,7 @@ Type
 
 implementation
 
-{$ifdef i386}
+{$ifdef cpui386}
   {$i bzip2i386.inc}
 {$endif}
 

packages/bzip2/src/bzip2i386.inc

@@ -33,11 +33,11 @@ asm
 {  mov edx,offset c
   call mcount}
   xor edx,edx
-  lea ebx,[esi+Tbzip2_decode_stream.cftab]
-  mov ecx,[esi+Tbzip2_decode_stream.tt_count]
+  lea ebx,[eax+Tbzip2_decode_stream.cftab]
+  mov ecx,[eax+Tbzip2_decode_stream.tt_count]
   push esi
   push ebp
-  mov esi,[esi+Tbzip2_decode_stream.tt]
+  mov esi,[eax+Tbzip2_decode_stream.tt]
   mov edi,esi
   lea ebp,[4*ecx+esi]
   jmp @a2

packages/bzip2/src/bzip2si386.inc

@@ -8,11 +8,11 @@ asm
 {  mov edx,offset c
   call mcount}
   xor edx,edx
-  lea ebx,[esi+TDecompressBzip2Stream.cftab]
-  mov ecx,[esi+TDecompressBzip2Stream.tt_count]
+  lea ebx,[eax+TDecompressBzip2Stream.cftab]
+  mov ecx,[eax+TDecompressBzip2Stream.tt_count]
   push esi
   push ebp
-  mov esi,[esi+TDecompressBzip2Stream.tt]
+  mov esi,[eax+TDecompressBzip2Stream.tt]
   mov edi,esi
   lea ebp,[4*ecx+esi]
   jmp @a2

packages/bzip2/src/bzip2stream.pp

@@ -96,7 +96,7 @@ Type
 
 implementation
 
-{$ifdef i386}
+{$ifdef cpui386}
   {$i bzip2si386.inc}
 {$endif}