summaryrefslogtreecommitdiff
path: root/zlib/contrib/masmx86
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2012-11-16 18:35:05 +0000
committerMatthias Klose <doko@gcc.gnu.org>2012-11-16 18:35:05 +0000
commit9acb8ddf3e7cf312de229eae11e0a1df29548ec9 (patch)
tree134aeb9aadb88e8719595edaaa40522b99d2a56a /zlib/contrib/masmx86
parent50605a7f19869692a6c29cead0a1366a420e0e65 (diff)
2012-11-16 Matthias Klose <doko@ubuntu.com>
* Imported zlib 1.2.7; merged local changes. From-SVN: r193574
Diffstat (limited to 'zlib/contrib/masmx86')
-rw-r--r--zlib/contrib/masmx86/inffas32.asm9
-rw-r--r--zlib/contrib/masmx86/match686.asm1
2 files changed, 4 insertions, 6 deletions
diff --git a/zlib/contrib/masmx86/inffas32.asm b/zlib/contrib/masmx86/inffas32.asm
index 92ac22ad9d9..03d20f838bf 100644
--- a/zlib/contrib/masmx86/inffas32.asm
+++ b/zlib/contrib/masmx86/inffas32.asm
@@ -73,11 +73,6 @@ inflate_fast_use_mmx:
_TEXT segment
-PUBLIC _inflate_fast
-
-ALIGN 4
-_inflate_fast:
- jmp inflate_fast_entry
@@ -163,7 +158,8 @@ distbits_state equ (76+4+zlib1222sup) ;/* state->distbits */
;SECTION .text
ALIGN 4
-inflate_fast_entry:
+_inflate_fast proc near
+.FPO (16, 4, 0, 0, 1, 0)
push edi
push esi
push ebp
@@ -1078,6 +1074,7 @@ L_done:
pop esi
pop edi
ret
+_inflate_fast endp
_TEXT ends
end
diff --git a/zlib/contrib/masmx86/match686.asm b/zlib/contrib/masmx86/match686.asm
index 1eaf555026f..3b09212f8a2 100644
--- a/zlib/contrib/masmx86/match686.asm
+++ b/zlib/contrib/masmx86/match686.asm
@@ -195,6 +195,7 @@ dsNiceMatch equ 136+zlib1222add
ELSE
_longest_match proc near
ENDIF
+.FPO (9, 4, 0, 0, 1, 0)
;;; Save registers that the compiler may be using, and adjust esp to
;;; make room for our stack frame.