comparison src/hermes/x86p_16.asm @ 1199:2d6dc7de1145

From: Mike Frysinger <vapier@gentoo.org> To: sdl@libsdl.org Date: Sun, 11 Dec 2005 22:57:37 -0500 Subject: [SDL] exec stack in libsdl update i posted back in September a patch to remove executable stacks: http://www.devolution.com/pipermail/sdl/2005-September/070626.html later in November, a similar patch was merged it seems: http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/src/hermes/mmx_main.asm however, this lacks the additional output format checks that i posted in my patch ... this isnt a problem if the hermes asm code is only ever used to produce ELF objects, but if this is not true, then the additional checks in my original patch will need to be merged -mike
author Ryan C. Gordon <icculus@icculus.org>
date Mon, 12 Dec 2005 09:13:12 +0000
parents da33b7e6d181
children 393092a3ebf6
comparison
equal deleted inserted replaced
1198:b616ac4f39d1 1199:2d6dc7de1145
25 GLOBAL _ConvertX86p16_8RGB332 25 GLOBAL _ConvertX86p16_8RGB332
26 26
27 EXTERN _ConvertX86 27 EXTERN _ConvertX86
28 EXTERN _x86return 28 EXTERN _x86return
29 29
30 SECTION .note.GNU-stack noalloc progbits noexec nowrite
31 SECTION .text 30 SECTION .text
32
33
34 31
35 _ConvertX86p16_16BGR565: 32 _ConvertX86p16_16BGR565:
36 33
37 ; check short 34 ; check short
38 cmp ecx,BYTE 16 35 cmp ecx,BYTE 16
492 jnz .L6 489 jnz .L6
493 490
494 .L7 pop ebp 491 .L7 pop ebp
495 jmp _x86return 492 jmp _x86return
496 493
494 %ifidn __OUTPUT_FORMAT__,elf
495 section .note.GNU-stack noalloc noexec nowrite progbits
496 %endif