diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:27:17 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:27:17 -0700 |
commit | e0ff940e1adb68d3575705ebf1546d9f07ad3b4a (patch) | |
tree | 792ac6996d1225c0955027050296126bc8ff6e26 /contrib/masmx64 | |
parent | 7df877eccdd826e94df53215f65dee639428e83f (diff) | |
download | zlib-1.2.3.8.tar.gz zlib-1.2.3.8.tar.bz2 zlib-1.2.3.8.zip |
zlib 1.2.3.8v1.2.3.8
Diffstat (limited to 'contrib/masmx64')
-rw-r--r-- | contrib/masmx64/gvmat64.asm | 3 | ||||
-rw-r--r-- | contrib/masmx64/gvmat64.obj | bin | 4119 -> 0 bytes | |||
-rw-r--r-- | contrib/masmx64/inffas8664.c | 4 | ||||
-rw-r--r-- | contrib/masmx64/inffasx64.asm | 4 | ||||
-rw-r--r-- | contrib/masmx64/inffasx64.obj | bin | 5913 -> 0 bytes | |||
-rw-r--r-- | contrib/masmx64/readme.txt | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/contrib/masmx64/gvmat64.asm b/contrib/masmx64/gvmat64.asm index 790d655..d2790cc 100644 --- a/contrib/masmx64/gvmat64.asm +++ b/contrib/masmx64/gvmat64.asm | |||
@@ -406,7 +406,8 @@ LoopCmps: | |||
406 | 406 | ||
407 | add rdx,8+8+8 | 407 | add rdx,8+8+8 |
408 | 408 | ||
409 | jmp short LoopCmps | 409 | jnz short LoopCmps |
410 | jmp short LenMaximum | ||
410 | LeaveLoopCmps16: add rdx,8 | 411 | LeaveLoopCmps16: add rdx,8 |
411 | LeaveLoopCmps8: add rdx,8 | 412 | LeaveLoopCmps8: add rdx,8 |
412 | LeaveLoopCmps: | 413 | LeaveLoopCmps: |
diff --git a/contrib/masmx64/gvmat64.obj b/contrib/masmx64/gvmat64.obj deleted file mode 100644 index a49ca02..0000000 --- a/contrib/masmx64/gvmat64.obj +++ /dev/null | |||
Binary files differ | |||
diff --git a/contrib/masmx64/inffas8664.c b/contrib/masmx64/inffas8664.c index 3af764d..2263d77 100644 --- a/contrib/masmx64/inffas8664.c +++ b/contrib/masmx64/inffas8664.c | |||
@@ -111,11 +111,11 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ | |||
111 | type_ar ar; | 111 | type_ar ar; |
112 | void inffas8664fnc(struct inffast_ar * par); | 112 | void inffas8664fnc(struct inffast_ar * par); |
113 | 113 | ||
114 | 114 | ||
115 | 115 | ||
116 | #if (defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )) || (defined(_MSC_VER) && defined(_M_AMD64)) | 116 | #if (defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )) || (defined(_MSC_VER) && defined(_M_AMD64)) |
117 | #define PAD_AVAIL_IN 6 | 117 | #define PAD_AVAIL_IN 6 |
118 | #define PAD_AVAIL_OUT 258 | 118 | #define PAD_AVAIL_OUT 258 |
119 | #else | 119 | #else |
120 | #define PAD_AVAIL_IN 5 | 120 | #define PAD_AVAIL_IN 5 |
121 | #define PAD_AVAIL_OUT 257 | 121 | #define PAD_AVAIL_OUT 257 |
diff --git a/contrib/masmx64/inffasx64.asm b/contrib/masmx64/inffasx64.asm index b5d93a2..c2ba03f 100644 --- a/contrib/masmx64/inffasx64.asm +++ b/contrib/masmx64/inffasx64.asm | |||
@@ -11,7 +11,7 @@ | |||
11 | ; | 11 | ; |
12 | ; ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK | 12 | ; ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK |
13 | ; | 13 | ; |
14 | ; (you can get Windows 2003 server DDK with ml64 and cl.exe for AMD64 from | 14 | ; (you can get Windows 2003 server DDK with ml64 and cl.exe for AMD64 from |
15 | ; http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price) | 15 | ; http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price) |
16 | ; | 16 | ; |
17 | 17 | ||
@@ -379,7 +379,7 @@ L_break_loop_with_status: | |||
379 | mov r14,[rsp-40] | 379 | mov r14,[rsp-40] |
380 | mov r15,[rsp-48] | 380 | mov r15,[rsp-48] |
381 | mov rbx,[rsp-56] | 381 | mov rbx,[rsp-56] |
382 | 382 | ||
383 | ret 0 | 383 | ret 0 |
384 | ; : | 384 | ; : |
385 | ; : "m" (ar) | 385 | ; : "m" (ar) |
diff --git a/contrib/masmx64/inffasx64.obj b/contrib/masmx64/inffasx64.obj deleted file mode 100644 index 8df5d82..0000000 --- a/contrib/masmx64/inffasx64.obj +++ /dev/null | |||
Binary files differ | |||
diff --git a/contrib/masmx64/readme.txt b/contrib/masmx64/readme.txt index ee03115..cd697c4 100644 --- a/contrib/masmx64/readme.txt +++ b/contrib/masmx64/readme.txt | |||
@@ -24,5 +24,5 @@ run bld_64.bat with Microsoft Macro Assembler (x64) for AMD64 (ml64.exe) | |||
24 | 24 | ||
25 | ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK | 25 | ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK |
26 | 26 | ||
27 | You can get Windows 2003 server DDK with ml64 and cl for AMD64 from | 27 | You can get Windows 2003 server DDK with ml64 and cl for AMD64 from |
28 | http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price) | 28 | http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price) |