i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace a few equ with %define to make nasm happy

Browse Source 
Interestingly, it only complained about some of them. Changing them all
to %define though, as equ means it should try to evaluate it once, which
of course it can't really if those are ebp+CONSTANT.

Didn't catch those since I wasn't building gcc2h.
Thanks to jessicah for reporting and testing the fix!
This commit is contained in:
Jonathan Schleifer
2014-03-29 05:07:54 +01:00
parent a743eac426
commit 6c95865236
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ffmpeg/yuvrgb_sse.nasm
+8 -8
View File
@@ -134,17 +134,17 @@ Const128 dw 128
; Packed Convert ; Packed Convert
; void Convert_YUV422_RGBA32_SSE(void *fromPtr, void *toPtr, int width) ; void Convert_YUV422_RGBA32_SSE(void *fromPtr, void *toPtr, int width)
width equ ebp+16 %define width ebp+16
toPtr equ ebp+12 %define toPtr ebp+12
fromPtr equ ebp+8 %define fromPtr ebp+8
; Planar Convert ; Planar Convert
; void Convert_YUV420P_RGBA32_SSE(void *fromYPtr, void *fromUPtr, void *fromVPtr, void *toPtr, int width) ; void Convert_YUV420P_RGBA32_SSE(void *fromYPtr, void *fromUPtr, void *fromVPtr, void *toPtr, int width)
width1 equ ebp+24 %define width1 ebp+24
toPtr1 equ ebp+20 %define toPtr1 ebp+20
fromVPtr equ ebp+16 %define fromVPtr ebp+16
fromUPtr equ ebp+12 %define fromUPtr ebp+12
fromYPtr equ ebp+8 %define fromYPtr ebp+8
SECTION .text align=16 SECTION .text align=16
src/add-ons/media/plugins/ffmpeg/yuvrgb_sse2.nasm
+8 -8
View File
@@ -185,16 +185,16 @@ UVMask db 0x01
%endmacro %endmacro
; void Convert_YUV422_RGBA32_SSE2(void *fromPtr, void *toPtr, int width) ; void Convert_YUV422_RGBA32_SSE2(void *fromPtr, void *toPtr, int width)
width equ ebp+16 %define width ebp+16
toPtr equ ebp+12 %define toPtr ebp+12
fromPtr equ ebp+8 %define fromPtr ebp+8
; void Convert_YUV420P_RGBA32_SSE2(void *fromYPtr, void *fromUPtr, void *fromVPtr, void *toPtr, int width) ; void Convert_YUV420P_RGBA32_SSE2(void *fromYPtr, void *fromUPtr, void *fromVPtr, void *toPtr, int width)
width1 equ ebp+24 %define width1 ebp+24
toPtr1 equ ebp+20 %define toPtr1 ebp+20
fromVPtr equ ebp+16 %define fromVPtr ebp+16
fromUPtr equ ebp+12 %define fromUPtr ebp+12
fromYPtr equ ebp+8 %define fromYPtr ebp+8
SECTION .text align=16 SECTION .text align=16
src/add-ons/media/plugins/ffmpeg/yuvrgb_ssse3.nasm
+8 -8
View File
@@ -218,16 +218,16 @@ BConst dw 7258
; void Convert_YUV422_RGBA32_SSSE3(void *fromPtr, void *toPtr, int width) ; void Convert_YUV422_RGBA32_SSSE3(void *fromPtr, void *toPtr, int width)
width equ ebp+16 %define width ebp+16
toPtr equ ebp+12 %define toPtr ebp+12
fromPtr equ ebp+8 %define fromPtr ebp+8
; void Convert_YUV420P_RGBA32_SSSE3(void *fromYPtr, void *fromUPtr, void *fromVPtr, void *toPtr, int width) ; void Convert_YUV420P_RGBA32_SSSE3(void *fromYPtr, void *fromUPtr, void *fromVPtr, void *toPtr, int width)
width1 equ ebp+24 %define width1 ebp+24
toPtr1 equ ebp+20 %define toPtr1 ebp+20
fromVPtr equ ebp+16 %define fromVPtr ebp+16
fromUPtr equ ebp+12 %define fromUPtr ebp+12
fromYPtr equ ebp+8 %define fromYPtr ebp+8
SECTION .text align=16 SECTION .text align=16