Mercurial > sdl-ios-xcode
view src/hermes/x86p_16.asm @ 1135:cf6133247d34
Mac Classic and CodeWarrior patches.
--ryan.
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Subject: Re: [SDL] Updated Mac patch
Date: Tue, 6 Sep 2005 15:21:27 +0200
To: A list for developers using the SDL library <sdl@libsdl.org>
Earlier, I wrote:
> Updated the previous Mac patch to disable Carbon by default.
> Also "fixed" the SDL.spec again, so that it builds on Darwin.
>
> http://www.algonet.se/~afb/SDL-1.2.9-mac.patch
> Also applied fine to SDL12 CVS, when I tried it.
>
> Haven't completed any new packaging or projects for Xcode/PB,
> but it seems to build and install fine here (in development).
Tested the new patch to build with old CodeWarrior and MPW,
and it seems it needed some hacks with those old headers...
Just in case you want to support the archeological versions -
here is a small add-on to the above patch, to fix those...
http://www.algonet.se/~afb/SDL-1.2.9-classic.patch
I couldn't get the old CW5 projects to build without a few
modifications - such as deleting the stray old header in:
"CWprojects/Support/Carbon/Include/ConditionalMacros.h" ?
But I updated both projects to CW6 too and built for Carbon,
and it ran all of the Mac test projects without any problems.
The MPW file seems to have compiled, with a small order change.
As long as you're still shipping the CWProjects and MPWmake
with the download, they should probably be updated/fixed ?
(another "solution" would of course be to just delete them)
I'll post my new projects along with the new Xcode projects
later on, along with XML exports of the various .mcp files.
(CW5 builds for Classic / "PPC", and CW6 builds for Carbon)
It'll be packaged as a part of the next SpriteWorld X release...
http://spriteworldx.sourceforge.net/ [Classic/Carbon/Win/X11]
--anders
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Thu, 08 Sep 2005 06:34:28 +0000 |
parents | 74212992fb08 |
children | da33b7e6d181 |
line wrap: on
line source
; ; x86 format converters for HERMES ; Copyright (c) 1998 Glenn Fielder (gaffer@gaffer.org) ; This source code is licensed under the GNU LGPL ; ; Please refer to the file COPYING.LIB contained in the distribution for ; licensing conditions ; ; Routines adjusted for Hermes by Christian Nentwich (brn@eleet.mcb.at) ; Used with permission. ; BITS 32 GLOBAL _ConvertX86p16_32RGB888 GLOBAL _ConvertX86p16_32BGR888 GLOBAL _ConvertX86p16_32RGBA888 GLOBAL _ConvertX86p16_32BGRA888 GLOBAL _ConvertX86p16_24RGB888 GLOBAL _ConvertX86p16_24BGR888 GLOBAL _ConvertX86p16_16BGR565 GLOBAL _ConvertX86p16_16RGB555 GLOBAL _ConvertX86p16_16BGR555 GLOBAL _ConvertX86p16_8RGB332 EXTERN _ConvertX86 EXTERN _x86return SECTION .text _ConvertX86p16_16BGR565: ; check short cmp ecx,BYTE 16 ja .L3 .L1 ; short loop mov al,[esi] mov ah,[esi+1] mov ebx,eax mov edx,eax shr eax,11 and eax,BYTE 11111b and ebx,11111100000b shl edx,11 add eax,ebx add eax,edx mov [edi],al mov [edi+1],ah add esi,BYTE 2 add edi,BYTE 2 dec ecx jnz .L1 .L2 jmp _x86return .L3 ; head mov eax,edi and eax,BYTE 11b jz .L4 mov al,[esi] mov ah,[esi+1] mov ebx,eax mov edx,eax shr eax,11 and eax,BYTE 11111b and ebx,11111100000b shl edx,11 add eax,ebx add eax,edx mov [edi],al mov [edi+1],ah add esi,BYTE 2 add edi,BYTE 2 dec ecx .L4 ; save count push ecx ; unroll twice shr ecx,1 ; point arrays to end lea esi,[esi+ecx*4] lea edi,[edi+ecx*4] ; negative counter neg ecx jmp SHORT .L6 .L5 mov [edi+ecx*4-4],eax .L6 mov eax,[esi+ecx*4] mov ebx,[esi+ecx*4] and eax,07E007E0h mov edx,[esi+ecx*4] and ebx,0F800F800h shr ebx,11 and edx,001F001Fh shl edx,11 add eax,ebx add eax,edx inc ecx jnz .L5 mov [edi+ecx*4-4],eax ; tail pop ecx and ecx,BYTE 1 jz .L7 mov al,[esi] mov ah,[esi+1] mov ebx,eax mov edx,eax shr eax,11 and eax,BYTE 11111b and ebx,11111100000b shl edx,11 add eax,ebx add eax,edx mov [edi],al mov [edi+1],ah add esi,BYTE 2 add edi,BYTE 2 .L7 jmp _x86return _ConvertX86p16_16RGB555: ; check short cmp ecx,BYTE 32 ja .L3 .L1 ; short loop mov al,[esi] mov ah,[esi+1] mov ebx,eax shr ebx,1 and ebx, 0111111111100000b and eax,BYTE 0000000000011111b add eax,ebx mov [edi],al mov [edi+1],ah add esi,BYTE 2 add edi,BYTE 2 dec ecx jnz .L1 .L2 jmp _x86return .L3 ; head mov eax,edi and eax,BYTE 11b jz .L4 mov al,[esi] mov ah,[esi+1] mov ebx,eax shr ebx,1 and ebx, 0111111111100000b and eax,BYTE 0000000000011111b add eax,ebx mov [edi],al mov [edi+1],ah add esi,BYTE 2 add edi,BYTE 2 dec ecx .L4 ; save ebp push ebp ; save count push ecx ; unroll four times shr ecx,2 ; point arrays to end lea esi,[esi+ecx*8] lea edi,[edi+ecx*8] ; negative counter xor ebp,ebp sub ebp,ecx .L5 mov eax,[esi+ebp*8] ; agi? mov ecx,[esi+ebp*8+4] mov ebx,eax mov edx,ecx and eax,0FFC0FFC0h and ecx,0FFC0FFC0h shr eax,1 and ebx,001F001Fh shr ecx,1 and edx,001F001Fh add eax,ebx add ecx,edx mov [edi+ebp*8],eax mov [edi+ebp*8+4],ecx inc ebp jnz .L5 ; tail pop ecx .L6 and ecx,BYTE 11b jz .L7 mov al,[esi] mov ah,[esi+1] mov ebx,eax shr ebx,1 and ebx, 0111111111100000b and eax,BYTE 0000000000011111b add eax,ebx mov [edi],al mov [edi+1],ah add esi,BYTE 2 add edi,BYTE 2 dec ecx jmp SHORT .L6 .L7 pop ebp jmp _x86return _ConvertX86p16_16BGR555: ; check short cmp ecx,BYTE 16 ja .L3 .L1 ; short loop mov al,[esi] mov ah,[esi+1] mov ebx,eax mov edx,eax shr eax,11 and eax,BYTE 11111b shr ebx,1 and ebx,1111100000b shl edx,10 and edx,0111110000000000b add eax,ebx add eax,edx mov [edi],al mov [edi+1],ah add esi,BYTE 2 add edi,BYTE 2 dec ecx jnz .L1 .L2 jmp _x86return .L3 ; head mov eax,edi and eax,BYTE 11b jz .L4 mov al,[esi] mov ah,[esi+1] mov ebx,eax mov edx,eax shr eax,11 and eax,BYTE 11111b shr ebx,1 and ebx,1111100000b shl edx,10 and edx,0111110000000000b add eax,ebx add eax,edx mov [edi],al mov [edi+1],ah add esi,BYTE 2 add edi,BYTE 2 dec ecx .L4 ; save count push ecx ; unroll twice shr ecx,1 ; point arrays to end lea esi,[esi+ecx*4] lea edi,[edi+ecx*4] ; negative counter neg ecx jmp SHORT .L6 .L5 mov [edi+ecx*4-4],eax .L6 mov eax,[esi+ecx*4] shr eax,1 mov ebx,[esi+ecx*4] and eax,03E003E0h mov edx,[esi+ecx*4] and ebx,0F800F800h shr ebx,11 and edx,001F001Fh shl edx,10 add eax,ebx add eax,edx inc ecx jnz .L5 mov [edi+ecx*4-4],eax ; tail pop ecx and ecx,BYTE 1 jz .L7 mov al,[esi] mov ah,[esi+1] mov ebx,eax mov edx,eax shr eax,11 and eax,BYTE 11111b shr ebx,1 and ebx,1111100000b shl edx,10 and edx,0111110000000000b add eax,ebx add eax,edx mov [edi],al mov [edi+1],ah add esi,BYTE 2 add edi,BYTE 2 .L7 jmp _x86return _ConvertX86p16_8RGB332: ; check short cmp ecx,BYTE 16 ja .L3 .L1 ; short loop mov al,[esi+0] mov ah,[esi+1] mov ebx,eax mov edx,eax and eax,BYTE 11000b ; blue shr eax,3 and ebx,11100000000b ; green shr ebx,6 and edx,1110000000000000b ; red shr edx,8 add eax,ebx add eax,edx mov [edi],al add esi,BYTE 2 inc edi dec ecx jnz .L1 .L2 jmp _x86return .L3 mov eax,edi and eax,BYTE 11b jz .L4 mov al,[esi+0] mov ah,[esi+1] mov ebx,eax mov edx,eax and eax,BYTE 11000b ; blue shr eax,3 and ebx,11100000000b ; green shr ebx,6 and edx,1110000000000000b ; red shr edx,8 add eax,ebx add eax,edx mov [edi],al add esi,BYTE 2 inc edi dec ecx jmp SHORT .L3 .L4 ; save ebp push ebp ; save count push ecx ; unroll 4 times shr ecx,2 ; prestep mov dl,[esi+0] mov bl,[esi+1] mov dh,[esi+2] .L5 shl edx,16 mov bh,[esi+3] shl ebx,16 mov dl,[esi+4] mov dh,[esi+6] mov bl,[esi+5] and edx,00011000000110000001100000011000b mov bh,[esi+7] ror edx,16+3 mov eax,ebx ; setup eax for reds and ebx,00000111000001110000011100000111b and eax,11100000111000001110000011100000b ; reds ror ebx,16-2 add esi,BYTE 8 ror eax,16 add edi,BYTE 4 add eax,ebx mov bl,[esi+1] ; greens add eax,edx mov dl,[esi+0] ; blues mov [edi-4],eax mov dh,[esi+2] dec ecx jnz .L5 ; check tail pop ecx and ecx,BYTE 11b jz .L7 .L6 ; tail mov al,[esi+0] mov ah,[esi+1] mov ebx,eax mov edx,eax and eax,BYTE 11000b ; blue shr eax,3 and ebx,11100000000b ; green shr ebx,6 and edx,1110000000000000b ; red shr edx,8 add eax,ebx add eax,edx mov [edi],al add esi,BYTE 2 inc edi dec ecx jnz .L6 .L7 pop ebp jmp _x86return