Branch
Hash :
5e27ca23
Author :
Date :
2025-09-19T14:21:49
x86: Reformat NASM code to improve readability (and simplify the checkstyle script)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472
;
; Merged upsampling/color conversion (32-bit MMX)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, 2024-2025, D. R. Commander.
;
; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
; This file should be assembled with NASM (Netwide Assembler) or Yasm.
%include "jcolsamp.inc"
; --------------------------------------------------------------------------
;
; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
;
; GLOBAL(void)
; jsimd_h2v1_merged_upsample_mmx(JDIMENSION output_width, JSAMPIMAGE input_buf,
; JDIMENSION in_row_group_ctr,
; JSAMPARRAY output_buf)
%define output_width(b) (b) + 8 ; JDIMENSION output_width
%define input_buf(b) (b) + 12 ; JSAMPIMAGE input_buf
%define in_row_group_ctr(b) (b) + 16 ; JDIMENSION in_row_group_ctr
%define output_buf(b) (b) + 20 ; JSAMPARRAY output_buf
%define original_ebp ebp + 0
%define wk(i) ebp - (WK_NUM - (i)) * SIZEOF_MMWORD ; mmword wk[WK_NUM]
%define WK_NUM 3
%define gotptr wk(0) - SIZEOF_POINTER ; void *gotptr
align 32
GLOBAL_FUNCTION(jsimd_h2v1_merged_upsample_mmx)
EXTN(jsimd_h2v1_merged_upsample_mmx):
push ebp
mov eax, esp ; eax = original ebp
sub esp, byte 4
and esp, byte (-SIZEOF_MMWORD) ; align to 64 bits
mov [esp], eax
mov ebp, esp ; ebp = aligned ebp
lea esp, [wk(0)]
PUSHPIC eax ; make a room for GOT address
push ebx
; push ecx ; need not be preserved
; push edx ; need not be preserved
push esi
push edi
GET_GOT ebx ; get GOT address
MOVPIC POINTER [gotptr], ebx ; save GOT address
mov ecx, JDIMENSION [output_width(eax)] ; col
test ecx, ecx
jz near .return
push ecx
mov edi, JSAMPIMAGE [input_buf(eax)]
mov ecx, JDIMENSION [in_row_group_ctr(eax)]
mov esi, JSAMPARRAY [edi + 0 * SIZEOF_JSAMPARRAY]
mov ebx, JSAMPARRAY [edi + 1 * SIZEOF_JSAMPARRAY]
mov edx, JSAMPARRAY [edi + 2 * SIZEOF_JSAMPARRAY]
mov edi, JSAMPARRAY [output_buf(eax)]
mov esi, JSAMPROW [esi + ecx * SIZEOF_JSAMPROW] ; inptr0
mov ebx, JSAMPROW [ebx + ecx * SIZEOF_JSAMPROW] ; inptr1
mov edx, JSAMPROW [edx + ecx * SIZEOF_JSAMPROW] ; inptr2
mov edi, JSAMPROW [edi] ; outptr
pop ecx ; col
ALIGNX 16, 7
.columnloop:
MOVPIC eax, POINTER [gotptr] ; load GOT address (eax)
movq mm6, MMWORD [ebx] ; mm6 = Cb(01234567)
movq mm7, MMWORD [edx] ; mm7 = Cr(01234567)
pxor mm1, mm1 ; mm1 = (all 0's)
pcmpeqw mm3, mm3
psllw mm3, 7 ; mm3 = { 0xFF80 0xFF80 0xFF80 0xFF80 }
movq mm4, mm6
punpckhbw mm6, mm1 ; mm6 = Cb(4567) = CbH
punpcklbw mm4, mm1 ; mm4 = Cb(0123) = CbL
movq mm0, mm7
punpckhbw mm7, mm1 ; mm7 = Cr(4567) = CrH
punpcklbw mm0, mm1 ; mm0 = Cr(0123) = CrL
paddw mm6, mm3
paddw mm4, mm3
paddw mm7, mm3
paddw mm0, mm3
; (Original)
; R = Y + 1.40200 * Cr
; G = Y - 0.34414 * Cb - 0.71414 * Cr
; B = Y + 1.77200 * Cb
;
; (This implementation)
; R = Y + 0.40200 * Cr + Cr
; G = Y - 0.34414 * Cb + 0.28586 * Cr - Cr
; B = Y - 0.22800 * Cb + Cb + Cb
movq mm5, mm6 ; mm5 = CbH
movq mm2, mm4 ; mm2 = CbL
paddw mm6, mm6 ; mm6 = 2 * CbH
paddw mm4, mm4 ; mm4 = 2 * CbL
movq mm1, mm7 ; mm1 = CrH
movq mm3, mm0 ; mm3 = CrL
paddw mm7, mm7 ; mm7 = 2 * CrH
paddw mm0, mm0 ; mm0 = 2 * CrL
pmulhw mm6, [GOTOFF(eax, PW_MF0228)]
; mm6 = (2 * CbH * -FIX(0.22800))
pmulhw mm4, [GOTOFF(eax, PW_MF0228)]
; mm4 = (2 * CbL * -FIX(0.22800))
pmulhw mm7, [GOTOFF(eax, PW_F0402)] ; mm7 = (2 * CrH * FIX(0.40200))
pmulhw mm0, [GOTOFF(eax, PW_F0402)] ; mm0 = (2 * CrL * FIX(0.40200))
paddw mm6, [GOTOFF(eax, PW_ONE)]
paddw mm4, [GOTOFF(eax, PW_ONE)]
psraw mm6, 1 ; mm6 = (CbH * -FIX(0.22800))
psraw mm4, 1 ; mm4 = (CbL * -FIX(0.22800))
paddw mm7, [GOTOFF(eax, PW_ONE)]
paddw mm0, [GOTOFF(eax, PW_ONE)]
psraw mm7, 1 ; mm7 = (CrH * FIX(0.40200))
psraw mm0, 1 ; mm0 = (CrL * FIX(0.40200))
paddw mm6, mm5
paddw mm4, mm2
paddw mm6, mm5 ; mm6 = (CbH * FIX(1.77200)) = (B - Y)H
paddw mm4, mm2 ; mm4 = (CbL * FIX(1.77200)) = (B - Y)L
paddw mm7, mm1 ; mm7 = (CrH * FIX(1.40200)) = (R - Y)H
paddw mm0, mm3 ; mm0 = (CrL * FIX(1.40200)) = (R - Y)L
movq MMWORD [wk(0)], mm6 ; wk(0) = (B - Y)H
movq MMWORD [wk(1)], mm7 ; wk(1) = (R - Y)H
movq mm6, mm5
movq mm7, mm2
punpcklwd mm5, mm1
punpckhwd mm6, mm1
pmaddwd mm5, [GOTOFF(eax, PW_MF0344_F0285)]
pmaddwd mm6, [GOTOFF(eax, PW_MF0344_F0285)]
punpcklwd mm2, mm3
punpckhwd mm7, mm3
pmaddwd mm2, [GOTOFF(eax, PW_MF0344_F0285)]
pmaddwd mm7, [GOTOFF(eax, PW_MF0344_F0285)]
paddd mm5, [GOTOFF(eax, PD_ONEHALF)]
paddd mm6, [GOTOFF(eax, PD_ONEHALF)]
psrad mm5, SCALEBITS
psrad mm6, SCALEBITS
paddd mm2, [GOTOFF(eax, PD_ONEHALF)]
paddd mm7, [GOTOFF(eax, PD_ONEHALF)]
psrad mm2, SCALEBITS
psrad mm7, SCALEBITS
packssdw mm5, mm6 ; mm5 = CbH * -FIX(0.344) + CrH * FIX(0.285)
packssdw mm2, mm7 ; mm2 = CbL * -FIX(0.344) + CrL * FIX(0.285)
psubw mm5, mm1
; mm5 = CbH * -FIX(0.344) + CrH * -FIX(0.714) = (G - Y)H
psubw mm2, mm3
; mm2 = CbL * -FIX(0.344) + CrL * -FIX(0.714) = (G - Y)L
movq MMWORD [wk(2)], mm5 ; wk(2) = (G - Y)H
mov al, 2 ; Yctr
jmp short .Yloop_1st
ALIGNX 16, 7
.Yloop_2nd:
movq mm0, MMWORD [wk(1)] ; mm0 = (R - Y)H
movq mm2, MMWORD [wk(2)] ; mm2 = (G - Y)H
movq mm4, MMWORD [wk(0)] ; mm4 = (B - Y)H
ALIGNX 16, 7
.Yloop_1st:
movq mm7, MMWORD [esi] ; mm7 = Y(01234567)
pcmpeqw mm6, mm6
psrlw mm6, BYTE_BIT ; mm6 = { 0xFF 0x00 0xFF 0x00 .. }
pand mm6, mm7 ; mm6 = Y(0246) = YE
psrlw mm7, BYTE_BIT ; mm7 = Y(1357) = YO
movq mm1, mm0 ; mm1 = mm0 = (R - Y)(L / H)
movq mm3, mm2 ; mm3 = mm2 = (G - Y)(L / H)
movq mm5, mm4 ; mm5 = mm4 = (B - Y)(L / H)
paddw mm0, mm6 ; mm0 = ((R - Y) + YE) = RE = (R0 R2 R4 R6)
paddw mm1, mm7 ; mm1 = ((R - Y) + YO) = RO = (R1 R3 R5 R7)
packuswb mm0, mm0 ; mm0 = (R0 R2 R4 R6 ** ** ** **)
packuswb mm1, mm1 ; mm1 = (R1 R3 R5 R7 ** ** ** **)
paddw mm2, mm6 ; mm2 = ((G - Y) + YE) = GE = (G0 G2 G4 G6)
paddw mm3, mm7 ; mm3 = ((G - Y) + YO) = GO = (G1 G3 G5 G7)
packuswb mm2, mm2 ; mm2 = (G0 G2 G4 G6 ** ** ** **)
packuswb mm3, mm3 ; mm3 = (G1 G3 G5 G7 ** ** ** **)
paddw mm4, mm6 ; mm4 = ((B - Y) + YE) = BE = (B0 B2 B4 B6)
paddw mm5, mm7 ; mm5 = ((B - Y) + YO) = BO = (B1 B3 B5 B7)
packuswb mm4, mm4 ; mm4 = (B0 B2 B4 B6 ** ** ** **)
packuswb mm5, mm5 ; mm5 = (B1 B3 B5 B7 ** ** ** **)
%if RGB_PIXELSIZE == 3 ; ---------------
; NOTE: The values of RGB_RED, RGB_GREEN, and RGB_BLUE determine the
; mapping of components A, B, and C to red, green, and blue.
;
; mmA = (A0 A2 A4 A6 ** ** ** **) = AE
; mmB = (A1 A3 A5 A7 ** ** ** **) = AO
; mmC = (B0 B2 B4 B6 ** ** ** **) = BE
; mmD = (B1 B3 B5 B7 ** ** ** **) = BO
; mmE = (C0 C2 C4 C6 ** ** ** **) = CE
; mmF = (C1 C3 C5 C7 ** ** ** **) = CO
; mmG = (** ** ** ** ** ** ** **)
; mmH = (** ** ** ** ** ** ** **)
punpcklbw mmA, mmC ; mmA = (A0 B0 A2 B2 A4 B4 A6 B6)
punpcklbw mmE, mmB ; mmE = (C0 A1 C2 A3 C4 A5 C6 A7)
punpcklbw mmD, mmF ; mmD = (B1 C1 B3 C3 B5 C5 B7 C7)
movq mmG, mmA
movq mmH, mmA
punpcklwd mmA, mmE ; mmA = (A0 B0 C0 A1 A2 B2 C2 A3)
punpckhwd mmG, mmE ; mmG = (A4 B4 C4 A5 A6 B6 C6 A7)
psrlq mmH, 2 * BYTE_BIT ; mmH = (A2 B2 A4 B4 A6 B6 -- --)
psrlq mmE, 2 * BYTE_BIT ; mmE = (C2 A3 C4 A5 C6 A7 -- --)
movq mmC, mmD
movq mmB, mmD
punpcklwd mmD, mmH ; mmD = (B1 C1 A2 B2 B3 C3 A4 B4)
punpckhwd mmC, mmH ; mmC = (B5 C5 A6 B6 B7 C7 -- --)
psrlq mmB, 2 * BYTE_BIT ; mmB = (B3 C3 B5 C5 B7 C7 -- --)
movq mmF, mmE
punpcklwd mmE, mmB ; mmE = (C2 A3 B3 C3 C4 A5 B5 C5)
punpckhwd mmF, mmB ; mmF = (C6 A7 B7 C7 -- -- -- --)
punpckldq mmA, mmD ; mmA = (A0 B0 C0 A1 B1 C1 A2 B2)
punpckldq mmE, mmG ; mmE = (C2 A3 B3 C3 A4 B4 C4 A5)
punpckldq mmC, mmF ; mmC = (B5 C5 A6 B6 C6 A7 B7 C7)
cmp ecx, byte SIZEOF_MMWORD
jb short .column_st16
movq MMWORD [edi + 0 * SIZEOF_MMWORD], mmA
movq MMWORD [edi + 1 * SIZEOF_MMWORD], mmE
movq MMWORD [edi + 2 * SIZEOF_MMWORD], mmC
sub ecx, byte SIZEOF_MMWORD
jz near .endcolumn
add edi, byte RGB_PIXELSIZE * SIZEOF_MMWORD ; outptr
add esi, byte SIZEOF_MMWORD ; inptr0
dec al ; Yctr
jnz near .Yloop_2nd
add ebx, byte SIZEOF_MMWORD ; inptr1
add edx, byte SIZEOF_MMWORD ; inptr2
jmp near .columnloop
ALIGNX 16, 7
.column_st16:
lea ecx, [ecx + ecx * 2] ; imul ecx, RGB_PIXELSIZE
cmp ecx, byte 2 * SIZEOF_MMWORD
jb short .column_st8
movq MMWORD [edi + 0 * SIZEOF_MMWORD], mmA
movq MMWORD [edi + 1 * SIZEOF_MMWORD], mmE
movq mmA, mmC
sub ecx, byte 2 * SIZEOF_MMWORD
add edi, byte 2 * SIZEOF_MMWORD
jmp short .column_st4
.column_st8:
cmp ecx, byte SIZEOF_MMWORD
jb short .column_st4
movq MMWORD [edi + 0 * SIZEOF_MMWORD], mmA
movq mmA, mmE
sub ecx, byte SIZEOF_MMWORD
add edi, byte SIZEOF_MMWORD
.column_st4:
movd eax, mmA
cmp ecx, byte SIZEOF_DWORD
jb short .column_st2
mov dword [edi + 0 * SIZEOF_DWORD], eax
psrlq mmA, DWORD_BIT
movd eax, mmA
sub ecx, byte SIZEOF_DWORD
add edi, byte SIZEOF_DWORD
.column_st2:
cmp ecx, byte SIZEOF_WORD
jb short .column_st1
mov word [edi + 0 * SIZEOF_WORD], ax
shr eax, WORD_BIT
sub ecx, byte SIZEOF_WORD
add edi, byte SIZEOF_WORD
.column_st1:
cmp ecx, byte SIZEOF_BYTE
jb short .endcolumn
mov byte [edi + 0 * SIZEOF_BYTE], al
%else ; RGB_PIXELSIZE == 4 ; -----------
%ifdef RGBX_FILLER_0XFF
pcmpeqb mm6, mm6 ; mm6 = (X0 X2 X4 X6 ** ** ** **)
pcmpeqb mm7, mm7 ; mm7 = (X1 X3 X5 X7 ** ** ** **)
%else
pxor mm6, mm6 ; mm6 = (X0 X2 X4 X6 ** ** ** **)
pxor mm7, mm7 ; mm7 = (X1 X3 X5 X7 ** ** ** **)
%endif
; NOTE: The values of RGB_RED, RGB_GREEN, and RGB_BLUE determine the
; mapping of components A, B, C, and D to red, green, and blue.
;
; mmA = (A0 A2 A4 A6 ** ** ** **) = AE
; mmB = (A1 A3 A5 A7 ** ** ** **) = AO
; mmC = (B0 B2 B4 B6 ** ** ** **) = BE
; mmD = (B1 B3 B5 B7 ** ** ** **) = BO
; mmE = (C0 C2 C4 C6 ** ** ** **) = CE
; mmF = (C1 C3 C5 C7 ** ** ** **) = CO
; mmG = (D0 D2 D4 D6 ** ** ** **) = DE
; mmH = (D1 D3 D5 D7 ** ** ** **) = DO
punpcklbw mmA, mmC ; mmA = (A0 B0 A2 B2 A4 B4 A6 B6)
punpcklbw mmE, mmG ; mmE = (C0 D0 C2 D2 C4 D4 C6 D6)
punpcklbw mmB, mmD ; mmB = (A1 B1 A3 B3 A5 B5 A7 B7)
punpcklbw mmF, mmH ; mmF = (C1 D1 C3 D3 C5 D5 C7 D7)
movq mmC, mmA
punpcklwd mmA, mmE ; mmA = (A0 B0 C0 D0 A2 B2 C2 D2)
punpckhwd mmC, mmE ; mmC = (A4 B4 C4 D4 A6 B6 C6 D6)
movq mmG, mmB
punpcklwd mmB, mmF ; mmB = (A1 B1 C1 D1 A3 B3 C3 D3)
punpckhwd mmG, mmF ; mmG = (A5 B5 C5 D5 A7 B7 C7 D7)
movq mmD, mmA
punpckldq mmA, mmB ; mmA = (A0 B0 C0 D0 A1 B1 C1 D1)
punpckhdq mmD, mmB ; mmD = (A2 B2 C2 D2 A3 B3 C3 D3)
movq mmH, mmC
punpckldq mmC, mmG ; mmC = (A4 B4 C4 D4 A5 B5 C5 D5)
punpckhdq mmH, mmG ; mmH = (A6 B6 C6 D6 A7 B7 C7 D7)
cmp ecx, byte SIZEOF_MMWORD
jb short .column_st16
movq MMWORD [edi + 0 * SIZEOF_MMWORD], mmA
movq MMWORD [edi + 1 * SIZEOF_MMWORD], mmD
movq MMWORD [edi + 2 * SIZEOF_MMWORD], mmC
movq MMWORD [edi + 3 * SIZEOF_MMWORD], mmH
sub ecx, byte SIZEOF_MMWORD
jz short .endcolumn
add edi, byte RGB_PIXELSIZE * SIZEOF_MMWORD ; outptr
add esi, byte SIZEOF_MMWORD ; inptr0
dec al ; Yctr
jnz near .Yloop_2nd
add ebx, byte SIZEOF_MMWORD ; inptr1
add edx, byte SIZEOF_MMWORD ; inptr2
jmp near .columnloop
ALIGNX 16, 7
.column_st16:
cmp ecx, byte SIZEOF_MMWORD / 2
jb short .column_st8
movq MMWORD [edi + 0 * SIZEOF_MMWORD], mmA
movq MMWORD [edi + 1 * SIZEOF_MMWORD], mmD
movq mmA, mmC
movq mmD, mmH
sub ecx, byte SIZEOF_MMWORD / 2
add edi, byte 2 * SIZEOF_MMWORD
.column_st8:
cmp ecx, byte SIZEOF_MMWORD / 4
jb short .column_st4
movq MMWORD [edi + 0 * SIZEOF_MMWORD], mmA
movq mmA, mmD
sub ecx, byte SIZEOF_MMWORD / 4
add edi, byte 1 * SIZEOF_MMWORD
.column_st4:
cmp ecx, byte SIZEOF_MMWORD / 8
jb short .endcolumn
movd dword [edi + 0 * SIZEOF_DWORD], mmA
%endif ; RGB_PIXELSIZE ; ---------------
.endcolumn:
emms ; empty MMX state
.return:
pop edi
pop esi
; pop edx ; need not be preserved
; pop ecx ; need not be preserved
pop ebx
mov esp, ebp ; esp <- aligned ebp
pop esp ; esp <- original ebp
pop ebp
ret
; --------------------------------------------------------------------------
;
; Upsample and color convert for the case of 2:1 horizontal and 2:1 vertical.
;
; GLOBAL(void)
; jsimd_h2v2_merged_upsample_mmx(JDIMENSION output_width, JSAMPIMAGE input_buf,
; JDIMENSION in_row_group_ctr,
; JSAMPARRAY output_buf)
%define output_width(b) (b) + 8 ; JDIMENSION output_width
%define input_buf(b) (b) + 12 ; JSAMPIMAGE input_buf
%define in_row_group_ctr(b) (b) + 16 ; JDIMENSION in_row_group_ctr
%define output_buf(b) (b) + 20 ; JSAMPARRAY output_buf
align 32
GLOBAL_FUNCTION(jsimd_h2v2_merged_upsample_mmx)
EXTN(jsimd_h2v2_merged_upsample_mmx):
push ebp
mov ebp, esp
push ebx
; push ecx ; need not be preserved
; push edx ; need not be preserved
push esi
push edi
mov eax, JDIMENSION [output_width(ebp)]
mov edi, JSAMPIMAGE [input_buf(ebp)]
mov ecx, JDIMENSION [in_row_group_ctr(ebp)]
mov esi, JSAMPARRAY [edi + 0 * SIZEOF_JSAMPARRAY]
mov ebx, JSAMPARRAY [edi + 1 * SIZEOF_JSAMPARRAY]
mov edx, JSAMPARRAY [edi + 2 * SIZEOF_JSAMPARRAY]
mov edi, JSAMPARRAY [output_buf(ebp)]
lea esi, [esi + ecx * SIZEOF_JSAMPROW]
push edx ; inptr2
push ebx ; inptr1
push esi ; inptr00
mov ebx, esp
push edi ; output_buf (outptr0)
push ecx ; in_row_group_ctr
push ebx ; input_buf
push eax ; output_width
call near EXTN(jsimd_h2v1_merged_upsample_mmx)
add esi, byte SIZEOF_JSAMPROW ; inptr01
add edi, byte SIZEOF_JSAMPROW ; outptr1
mov POINTER [ebx + 0 * SIZEOF_POINTER], esi
mov POINTER [ebx - 1 * SIZEOF_POINTER], edi
call near EXTN(jsimd_h2v1_merged_upsample_mmx)
add esp, byte 7 * SIZEOF_DWORD
pop edi
pop esi
; pop edx ; need not be preserved
; pop ecx ; need not be preserved
pop ebx
pop ebp
ret
; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this.
align 32