From 7fa101a106cc7cc89a5b5cb2409ca99b90865521 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sun, 11 Sep 2011 00:33:18 -0400 Subject: [PATCH] Fixed build warnings from nasm on some Hermes blitters. --HG-- branch : SDL-1.2 --- src/hermes/x86p_16.asm | 56 ++++++++++---------- src/hermes/x86p_32.asm | 115 ++++++++++++++++++++--------------------- 2 files changed, 85 insertions(+), 86 deletions(-) diff --git a/src/hermes/x86p_16.asm b/src/hermes/x86p_16.asm index fcb6f5ae6..1801bcd15 100644 --- a/src/hermes/x86p_16.asm +++ b/src/hermes/x86p_16.asm @@ -30,7 +30,7 @@ _ConvertX86p16_16BGR565: ja .L3 -.L1 ; short loop +.L1: ; short loop mov al,[esi] mov ah,[esi+1] mov ebx,eax @@ -47,10 +47,10 @@ _ConvertX86p16_16BGR565: add edi,BYTE 2 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; head +.L3: ; head mov eax,edi and eax,BYTE 11b jz .L4 @@ -70,7 +70,7 @@ _ConvertX86p16_16BGR565: add edi,BYTE 2 dec ecx -.L4 ; save count +.L4: ; save count push ecx ; unroll twice @@ -84,8 +84,8 @@ _ConvertX86p16_16BGR565: neg ecx jmp SHORT .L6 -.L5 mov [edi+ecx*4-4],eax -.L6 mov eax,[esi+ecx*4] +.L5: mov [edi+ecx*4-4],eax +.L6: mov eax,[esi+ecx*4] mov ebx,[esi+ecx*4] and eax,07E007E0h @@ -125,7 +125,7 @@ _ConvertX86p16_16BGR565: add esi,BYTE 2 add edi,BYTE 2 -.L7 +.L7: retn @@ -140,7 +140,7 @@ _ConvertX86p16_16RGB555: ja .L3 -.L1 ; short loop +.L1: ; short loop mov al,[esi] mov ah,[esi+1] mov ebx,eax @@ -154,10 +154,10 @@ _ConvertX86p16_16RGB555: add edi,BYTE 2 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; head +.L3: ; head mov eax,edi and eax,BYTE 11b jz .L4 @@ -174,7 +174,7 @@ _ConvertX86p16_16RGB555: add edi,BYTE 2 dec ecx -.L4 ; save ebp +.L4: ; save ebp push ebp ; save count @@ -191,7 +191,7 @@ _ConvertX86p16_16RGB555: xor ebp,ebp sub ebp,ecx -.L5 mov eax,[esi+ebp*8] ; agi? +.L5: mov eax,[esi+ebp*8] ; agi? mov ecx,[esi+ebp*8+4] mov ebx,eax @@ -217,7 +217,7 @@ _ConvertX86p16_16RGB555: ; tail pop ecx -.L6 and ecx,BYTE 11b +.L6: and ecx,BYTE 11b jz .L7 mov al,[esi] mov ah,[esi+1] @@ -233,7 +233,7 @@ _ConvertX86p16_16RGB555: dec ecx jmp SHORT .L6 -.L7 pop ebp +.L7: pop ebp retn @@ -248,7 +248,7 @@ _ConvertX86p16_16BGR555: ja .L3 -.L1 ; short loop +.L1: ; short loop mov al,[esi] mov ah,[esi+1] mov ebx,eax @@ -267,10 +267,10 @@ _ConvertX86p16_16BGR555: add edi,BYTE 2 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; head +.L3: ; head mov eax,edi and eax,BYTE 11b jz .L4 @@ -292,7 +292,7 @@ _ConvertX86p16_16BGR555: add edi,BYTE 2 dec ecx -.L4 ; save count +.L4: ; save count push ecx ; unroll twice @@ -306,8 +306,8 @@ _ConvertX86p16_16BGR555: neg ecx jmp SHORT .L6 -.L5 mov [edi+ecx*4-4],eax -.L6 mov eax,[esi+ecx*4] +.L5: mov [edi+ecx*4-4],eax +.L6: mov eax,[esi+ecx*4] shr eax,1 mov ebx,[esi+ecx*4] @@ -351,7 +351,7 @@ _ConvertX86p16_16BGR555: add esi,BYTE 2 add edi,BYTE 2 -.L7 +.L7: retn @@ -366,7 +366,7 @@ _ConvertX86p16_8RGB332: ja .L3 -.L1 ; short loop +.L1: ; short loop mov al,[esi+0] mov ah,[esi+1] mov ebx,eax @@ -384,10 +384,10 @@ _ConvertX86p16_8RGB332: inc edi dec ecx jnz .L1 -.L2 +.L2: retn -.L3 mov eax,edi +.L3: mov eax,edi and eax,BYTE 11b jz .L4 mov al,[esi+0] @@ -408,7 +408,7 @@ _ConvertX86p16_8RGB332: dec ecx jmp SHORT .L3 -.L4 ; save ebp +.L4: ; save ebp push ebp ; save count @@ -422,7 +422,7 @@ _ConvertX86p16_8RGB332: mov bl,[esi+1] mov dh,[esi+2] -.L5 shl edx,16 +.L5: shl edx,16 mov bh,[esi+3] shl ebx,16 @@ -463,7 +463,7 @@ _ConvertX86p16_8RGB332: and ecx,BYTE 11b jz .L7 -.L6 ; tail +.L6: ; tail mov al,[esi+0] mov ah,[esi+1] mov ebx,eax @@ -482,7 +482,7 @@ _ConvertX86p16_8RGB332: dec ecx jnz .L6 -.L7 pop ebp +.L7: pop ebp retn %ifidn __OUTPUT_FORMAT__,elf32 diff --git a/src/hermes/x86p_32.asm b/src/hermes/x86p_32.asm index 819157f68..2b478802d 100644 --- a/src/hermes/x86p_32.asm +++ b/src/hermes/x86p_32.asm @@ -41,7 +41,7 @@ _ConvertX86p32_32BGR888: cmp ecx,BYTE 32 ja .L3 -.L1 ; short loop +.L1: ; short loop mov edx,[esi] bswap edx ror edx,8 @@ -50,10 +50,10 @@ _ConvertX86p32_32BGR888: add edi,BYTE 4 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; save ebp +.L3: ; save ebp push ebp ; unroll four times @@ -63,7 +63,7 @@ _ConvertX86p32_32BGR888: ; save count push ecx -.L4 mov eax,[esi] +.L4: mov eax,[esi] mov ebx,[esi+4] bswap eax @@ -100,7 +100,7 @@ _ConvertX86p32_32BGR888: and ecx,BYTE 11b jz .L6 -.L5 ; tail loop +.L5: ; tail loop mov edx,[esi] bswap edx ror edx,8 @@ -110,7 +110,7 @@ _ConvertX86p32_32BGR888: dec ecx jnz .L5 -.L6 pop ebp +.L6: pop ebp retn @@ -122,7 +122,7 @@ _ConvertX86p32_32RGBA888: cmp ecx,BYTE 32 ja .L3 -.L1 ; short loop +.L1: ; short loop mov edx,[esi] rol edx,8 mov [edi],edx @@ -130,10 +130,10 @@ _ConvertX86p32_32RGBA888: add edi,BYTE 4 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; save ebp +.L3: ; save ebp push ebp ; unroll four times @@ -143,7 +143,7 @@ _ConvertX86p32_32RGBA888: ; save count push ecx -.L4 mov eax,[esi] +.L4: mov eax,[esi] mov ebx,[esi+4] rol eax,8 @@ -172,7 +172,7 @@ _ConvertX86p32_32RGBA888: and ecx,BYTE 11b jz .L6 -.L5 ; tail loop +.L5: ; tail loop mov edx,[esi] rol edx,8 mov [edi],edx @@ -181,7 +181,7 @@ _ConvertX86p32_32RGBA888: dec ecx jnz .L5 -.L6 pop ebp +.L6: pop ebp retn @@ -193,7 +193,7 @@ _ConvertX86p32_32BGRA888: cmp ecx,BYTE 32 ja .L3 -.L1 ; short loop +.L1: ; short loop mov edx,[esi] bswap edx mov [edi],edx @@ -201,10 +201,10 @@ _ConvertX86p32_32BGRA888: add edi,BYTE 4 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; save ebp +.L3: ; save ebp push ebp ; unroll four times @@ -214,7 +214,7 @@ _ConvertX86p32_32BGRA888: ; save count push ecx -.L4 mov eax,[esi] +.L4: mov eax,[esi] mov ebx,[esi+4] mov ecx,[esi+8] @@ -245,7 +245,7 @@ _ConvertX86p32_32BGRA888: and ecx,BYTE 11b jz .L6 -.L5 ; tail loop +.L5: ; tail loop mov edx,[esi] bswap edx mov [edi],edx @@ -254,7 +254,7 @@ _ConvertX86p32_32BGRA888: dec ecx jnz .L5 -.L6 pop ebp +.L6: pop ebp retn @@ -268,7 +268,7 @@ _ConvertX86p32_24RGB888: cmp ecx,BYTE 32 ja .L3 -.L1 ; short loop +.L1: ; short loop mov al,[esi] mov bl,[esi+1] mov dl,[esi+2] @@ -279,10 +279,10 @@ _ConvertX86p32_24RGB888: add edi,BYTE 3 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; head +.L3: ; head mov edx,edi and edx,BYTE 11b jz .L4 @@ -297,7 +297,7 @@ _ConvertX86p32_24RGB888: dec ecx jmp SHORT .L3 -.L4 ; unroll 4 times +.L4: ; unroll 4 times push ebp mov ebp,ecx shr ebp,2 @@ -305,7 +305,7 @@ _ConvertX86p32_24RGB888: ; save count push ecx -.L5 mov eax,[esi] ; first dword eax = [A][R][G][B] +.L5: mov eax,[esi] ; first dword eax = [A][R][G][B] mov ebx,[esi+4] ; second dword ebx = [a][r][g][b] shl eax,8 ; eax = [R][G][B][.] @@ -339,7 +339,7 @@ _ConvertX86p32_24RGB888: and ecx,BYTE 11b jz .L7 -.L6 ; tail loop +.L6: ; tail loop mov al,[esi] mov bl,[esi+1] mov dl,[esi+2] @@ -351,7 +351,7 @@ _ConvertX86p32_24RGB888: dec ecx jnz .L6 -.L7 pop ebp +.L7: pop ebp retn @@ -365,8 +365,7 @@ _ConvertX86p32_24BGR888: cmp ecx,BYTE 32 ja .L3 - -.L1 ; short loop +.L1: ; short loop mov dl,[esi] mov bl,[esi+1] mov al,[esi+2] @@ -377,10 +376,10 @@ _ConvertX86p32_24BGR888: add edi,BYTE 3 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; head +.L3: ; head mov edx,edi and edx,BYTE 11b jz .L4 @@ -395,7 +394,7 @@ _ConvertX86p32_24BGR888: dec ecx jmp SHORT .L3 -.L4 ; unroll 4 times +.L4: ; unroll 4 times push ebp mov ebp,ecx shr ebp,2 @@ -403,10 +402,10 @@ _ConvertX86p32_24BGR888: ; save count push ecx -.L5 +.L5: mov eax,[esi] ; first dword eax = [A][R][G][B] mov ebx,[esi+4] ; second dword ebx = [a][r][g][b] - + bswap eax ; eax = [B][G][R][A] bswap ebx ; ebx = [b][g][r][a] @@ -439,7 +438,7 @@ _ConvertX86p32_24BGR888: and ecx,BYTE 11b jz .L7 -.L6 ; tail loop +.L6: ; tail loop mov dl,[esi] mov bl,[esi+1] mov al,[esi+2] @@ -451,7 +450,7 @@ _ConvertX86p32_24BGR888: dec ecx jnz .L6 -.L7 +.L7: pop ebp retn @@ -465,7 +464,7 @@ _ConvertX86p32_16RGB565: cmp ecx,BYTE 16 ja .L3 -.L1 ; short loop +.L1: ; short loop mov bl,[esi+0] ; blue mov al,[esi+1] ; green mov ah,[esi+2] ; red @@ -485,7 +484,7 @@ _ConvertX86p32_16RGB565: retn -.L3 ; head +.L3: ; head mov ebx,edi and ebx,BYTE 11b jz .L4 @@ -581,7 +580,7 @@ _ConvertX86p32_16BGR565: cmp ecx,BYTE 16 ja .L3 -.L1 ; short loop +.L1: ; short loop mov ah,[esi+0] ; blue mov al,[esi+1] ; green mov bl,[esi+2] ; red @@ -596,10 +595,10 @@ _ConvertX86p32_16BGR565: add edi,BYTE 2 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; head +.L3: ; head mov ebx,edi and ebx,BYTE 11b jz .L4 @@ -617,7 +616,7 @@ _ConvertX86p32_16BGR565: add edi,BYTE 2 dec ecx -.L4 ; save count +.L4: ; save count push ecx ; unroll twice @@ -631,9 +630,9 @@ _ConvertX86p32_16BGR565: neg ecx jmp SHORT .L6 -.L5 +.L5: mov [edi+ecx*4-4],eax -.L6 +.L6: mov edx,[esi+ecx*8+4] mov bh,[esi+ecx*8+4] @@ -681,7 +680,7 @@ _ConvertX86p32_16BGR565: add esi,BYTE 4 add edi,BYTE 2 -.L7 +.L7: retn @@ -695,7 +694,7 @@ _ConvertX86p32_16RGB555: cmp ecx,BYTE 16 ja .L3 -.L1 ; short loop +.L1: ; short loop mov bl,[esi+0] ; blue mov al,[esi+1] ; green mov ah,[esi+2] ; red @@ -710,10 +709,10 @@ _ConvertX86p32_16RGB555: add edi,BYTE 2 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; head +.L3: ; head mov ebx,edi and ebx,BYTE 11b jz .L4 @@ -731,7 +730,7 @@ _ConvertX86p32_16RGB555: add edi,BYTE 2 dec ecx -.L4 ; save count +.L4: ; save count push ecx ; unroll twice @@ -745,9 +744,9 @@ _ConvertX86p32_16RGB555: neg ecx jmp SHORT .L6 -.L5 +.L5: mov [edi+ecx*4-4],eax -.L6 +.L6: mov eax,[esi+ecx*8] shr ah,3 @@ -792,7 +791,7 @@ _ConvertX86p32_16RGB555: add esi,BYTE 4 add edi,BYTE 2 -.L7 +.L7: retn @@ -807,7 +806,7 @@ _ConvertX86p32_16BGR555: ja .L3 -.L1 ; short loop +.L1: ; short loop mov ah,[esi+0] ; blue mov al,[esi+1] ; green mov bl,[esi+2] ; red @@ -822,10 +821,10 @@ _ConvertX86p32_16BGR555: add edi,BYTE 2 dec ecx jnz .L1 -.L2 +.L2: retn -.L3 ; head +.L3: ; head mov ebx,edi and ebx,BYTE 11b jz .L4 @@ -843,7 +842,7 @@ _ConvertX86p32_16BGR555: add edi,BYTE 2 dec ecx -.L4 ; save count +.L4: ; save count push ecx ; unroll twice @@ -857,9 +856,9 @@ _ConvertX86p32_16BGR555: neg ecx jmp SHORT .L6 -.L5 +.L5: mov [edi+ecx*4-4],eax -.L6 +.L6: mov edx,[esi+ecx*8+4] mov bh,[esi+ecx*8+4] @@ -907,7 +906,7 @@ _ConvertX86p32_16BGR555: add esi,BYTE 4 add edi,BYTE 2 -.L7 +.L7: retn @@ -920,7 +919,7 @@ _ConvertX86p32_16BGR555: _ConvertX86p32_8RGB332: -.L_ALIGNED +.L_ALIGNED: push ecx shr ecx,2 ; We will draw 4 pixels at once