diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 17:28:05 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 17:28:05 +0200 |
| commit | ace5e90b3dbc33f0fc34ac2f3dc40d3c990a6a11 (patch) | |
| tree | 0b5cda436e04ee29efb5220da5634d04455c65c0 /lzo/asm/i386 | |
| parent | 78172a10165a969b8c002b6bdcf9dc47fa6cd5f3 (diff) | |
Update lzo version
Diffstat (limited to 'lzo/asm/i386')
97 files changed, 1301 insertions, 341 deletions
diff --git a/lzo/asm/i386/00README.TXT b/lzo/asm/i386/00README.TXT index 0d3dcf9f..81b01423 100644 --- a/lzo/asm/i386/00README.TXT +++ b/lzo/asm/i386/00README.TXT @@ -4,7 +4,7 @@ Directory overview: As writing portable assembler sources supporting different operating systems, compilers and assemblers has proven to be extremely painful, -the assembler sources have been converted into a more portable `db' +the assembler sources have been converted into a more portable 'db' format. Use these whenever possible. src_gas sources converted for portable gcc/gas syntax @@ -15,7 +15,7 @@ format. Use these whenever possible. obj pre-assembled object files -Also look `src_XXX/all/asm_all.asm' which contains all assembler +Also look 'src_XXX/all/asm_all.asm' which contains all assembler functions conveniently arranged into a single file. @@ -26,13 +26,13 @@ Notes: running in protected mode - they should work with all i386 32-bit compilers around. -- All functions expect a `cdecl' (C stack based) calling convention. - The function return value will be placed into `eax'. +- All functions expect a 'cdecl' (C stack based) calling convention. + The function return value will be placed into 'eax'. All other registers are preserved. - Prototypes for the assembler functions can be found in <lzo/lzo_asm.h>. -- For reasons of speed all fast assembler decompressors (having `_fast' +- For reasons of speed all fast assembler decompressors (having '_fast' in their name) can access (write to) up to 3 bytes past the end of the decompressed (output) block. Data past the end of the compressed (input) block is never accessed (read from). diff --git a/lzo/asm/i386/obj/coff32/lzo1c_s1.o b/lzo/asm/i386/obj/coff32/lzo1c_s1.o Binary files differindex 51b4bdf2..8379dbe9 100644 --- a/lzo/asm/i386/obj/coff32/lzo1c_s1.o +++ b/lzo/asm/i386/obj/coff32/lzo1c_s1.o diff --git a/lzo/asm/i386/obj/coff32/lzo1c_s2.o b/lzo/asm/i386/obj/coff32/lzo1c_s2.o Binary files differindex cdf10384..6a3fdf9f 100644 --- a/lzo/asm/i386/obj/coff32/lzo1c_s2.o +++ b/lzo/asm/i386/obj/coff32/lzo1c_s2.o diff --git a/lzo/asm/i386/obj/coff32/lzo1f_f1.o b/lzo/asm/i386/obj/coff32/lzo1f_f1.o Binary files differindex 6473b9f1..bce69fa9 100644 --- a/lzo/asm/i386/obj/coff32/lzo1f_f1.o +++ b/lzo/asm/i386/obj/coff32/lzo1f_f1.o diff --git a/lzo/asm/i386/obj/coff32/lzo1f_f2.o b/lzo/asm/i386/obj/coff32/lzo1f_f2.o Binary files differindex ac5b9637..79b5727f 100644 --- a/lzo/asm/i386/obj/coff32/lzo1f_f2.o +++ b/lzo/asm/i386/obj/coff32/lzo1f_f2.o diff --git a/lzo/asm/i386/obj/coff32/lzo1x_f1.o b/lzo/asm/i386/obj/coff32/lzo1x_f1.o Binary files differindex f87ef01a..438d0263 100644 --- a/lzo/asm/i386/obj/coff32/lzo1x_f1.o +++ b/lzo/asm/i386/obj/coff32/lzo1x_f1.o diff --git a/lzo/asm/i386/obj/coff32/lzo1x_f2.o b/lzo/asm/i386/obj/coff32/lzo1x_f2.o Binary files differindex df39b94c..3476817b 100644 --- a/lzo/asm/i386/obj/coff32/lzo1x_f2.o +++ b/lzo/asm/i386/obj/coff32/lzo1x_f2.o diff --git a/lzo/asm/i386/obj/coff32/lzo1x_s1.o b/lzo/asm/i386/obj/coff32/lzo1x_s1.o Binary files differindex 91072f64..b178f0d6 100644 --- a/lzo/asm/i386/obj/coff32/lzo1x_s1.o +++ b/lzo/asm/i386/obj/coff32/lzo1x_s1.o diff --git a/lzo/asm/i386/obj/coff32/lzo1x_s2.o b/lzo/asm/i386/obj/coff32/lzo1x_s2.o Binary files differindex db3f1bea..f45ef13a 100644 --- a/lzo/asm/i386/obj/coff32/lzo1x_s2.o +++ b/lzo/asm/i386/obj/coff32/lzo1x_s2.o diff --git a/lzo/asm/i386/obj/coff32/lzo1y_f1.o b/lzo/asm/i386/obj/coff32/lzo1y_f1.o Binary files differindex c9560d09..f0ddcf98 100644 --- a/lzo/asm/i386/obj/coff32/lzo1y_f1.o +++ b/lzo/asm/i386/obj/coff32/lzo1y_f1.o diff --git a/lzo/asm/i386/obj/coff32/lzo1y_f2.o b/lzo/asm/i386/obj/coff32/lzo1y_f2.o Binary files differindex 015e70ca..0ed51177 100644 --- a/lzo/asm/i386/obj/coff32/lzo1y_f2.o +++ b/lzo/asm/i386/obj/coff32/lzo1y_f2.o diff --git a/lzo/asm/i386/obj/coff32/lzo1y_s1.o b/lzo/asm/i386/obj/coff32/lzo1y_s1.o Binary files differindex 9cb06d2a..0beadb14 100644 --- a/lzo/asm/i386/obj/coff32/lzo1y_s1.o +++ b/lzo/asm/i386/obj/coff32/lzo1y_s1.o diff --git a/lzo/asm/i386/obj/coff32/lzo1y_s2.o b/lzo/asm/i386/obj/coff32/lzo1y_s2.o Binary files differindex 4aa10ff9..efc08299 100644 --- a/lzo/asm/i386/obj/coff32/lzo1y_s2.o +++ b/lzo/asm/i386/obj/coff32/lzo1y_s2.o diff --git a/lzo/asm/i386/obj/elf32/lzo1c_s1.o b/lzo/asm/i386/obj/elf32/lzo1c_s1.o Binary files differindex e13ce334..e32b9531 100644 --- a/lzo/asm/i386/obj/elf32/lzo1c_s1.o +++ b/lzo/asm/i386/obj/elf32/lzo1c_s1.o diff --git a/lzo/asm/i386/obj/elf32/lzo1c_s2.o b/lzo/asm/i386/obj/elf32/lzo1c_s2.o Binary files differindex e4357458..90622c99 100644 --- a/lzo/asm/i386/obj/elf32/lzo1c_s2.o +++ b/lzo/asm/i386/obj/elf32/lzo1c_s2.o diff --git a/lzo/asm/i386/obj/elf32/lzo1f_f1.o b/lzo/asm/i386/obj/elf32/lzo1f_f1.o Binary files differindex d63bd62e..58e67f67 100644 --- a/lzo/asm/i386/obj/elf32/lzo1f_f1.o +++ b/lzo/asm/i386/obj/elf32/lzo1f_f1.o diff --git a/lzo/asm/i386/obj/elf32/lzo1f_f2.o b/lzo/asm/i386/obj/elf32/lzo1f_f2.o Binary files differindex 3a70b2bd..f70f7909 100644 --- a/lzo/asm/i386/obj/elf32/lzo1f_f2.o +++ b/lzo/asm/i386/obj/elf32/lzo1f_f2.o diff --git a/lzo/asm/i386/obj/elf32/lzo1x_f1.o b/lzo/asm/i386/obj/elf32/lzo1x_f1.o Binary files differindex a3c8de0b..eb37ab03 100644 --- a/lzo/asm/i386/obj/elf32/lzo1x_f1.o +++ b/lzo/asm/i386/obj/elf32/lzo1x_f1.o diff --git a/lzo/asm/i386/obj/elf32/lzo1x_f2.o b/lzo/asm/i386/obj/elf32/lzo1x_f2.o Binary files differindex 29ce79ae..bb2e720c 100644 --- a/lzo/asm/i386/obj/elf32/lzo1x_f2.o +++ b/lzo/asm/i386/obj/elf32/lzo1x_f2.o diff --git a/lzo/asm/i386/obj/elf32/lzo1x_s1.o b/lzo/asm/i386/obj/elf32/lzo1x_s1.o Binary files differindex d10769aa..6b8f4199 100644 --- a/lzo/asm/i386/obj/elf32/lzo1x_s1.o +++ b/lzo/asm/i386/obj/elf32/lzo1x_s1.o diff --git a/lzo/asm/i386/obj/elf32/lzo1x_s2.o b/lzo/asm/i386/obj/elf32/lzo1x_s2.o Binary files differindex f9ef19f9..ce5dfc47 100644 --- a/lzo/asm/i386/obj/elf32/lzo1x_s2.o +++ b/lzo/asm/i386/obj/elf32/lzo1x_s2.o diff --git a/lzo/asm/i386/obj/elf32/lzo1y_f1.o b/lzo/asm/i386/obj/elf32/lzo1y_f1.o Binary files differindex 7b8e00a3..431ec4e4 100644 --- a/lzo/asm/i386/obj/elf32/lzo1y_f1.o +++ b/lzo/asm/i386/obj/elf32/lzo1y_f1.o diff --git a/lzo/asm/i386/obj/elf32/lzo1y_f2.o b/lzo/asm/i386/obj/elf32/lzo1y_f2.o Binary files differindex 6cb60ee0..4d510760 100644 --- a/lzo/asm/i386/obj/elf32/lzo1y_f2.o +++ b/lzo/asm/i386/obj/elf32/lzo1y_f2.o diff --git a/lzo/asm/i386/obj/elf32/lzo1y_s1.o b/lzo/asm/i386/obj/elf32/lzo1y_s1.o Binary files differindex bed5c569..dcb71acf 100644 --- a/lzo/asm/i386/obj/elf32/lzo1y_s1.o +++ b/lzo/asm/i386/obj/elf32/lzo1y_s1.o diff --git a/lzo/asm/i386/obj/elf32/lzo1y_s2.o b/lzo/asm/i386/obj/elf32/lzo1y_s2.o Binary files differindex 09c0dbf5..691d4094 100644 --- a/lzo/asm/i386/obj/elf32/lzo1y_s2.o +++ b/lzo/asm/i386/obj/elf32/lzo1y_s2.o diff --git a/lzo/asm/i386/obj/win32/lzo1c_s1.obj b/lzo/asm/i386/obj/win32/lzo1c_s1.obj Binary files differindex e075b53b..b4d47ce2 100644 --- a/lzo/asm/i386/obj/win32/lzo1c_s1.obj +++ b/lzo/asm/i386/obj/win32/lzo1c_s1.obj diff --git a/lzo/asm/i386/obj/win32/lzo1c_s2.obj b/lzo/asm/i386/obj/win32/lzo1c_s2.obj Binary files differindex 25457987..a67fd5c5 100644 --- a/lzo/asm/i386/obj/win32/lzo1c_s2.obj +++ b/lzo/asm/i386/obj/win32/lzo1c_s2.obj diff --git a/lzo/asm/i386/obj/win32/lzo1f_f1.obj b/lzo/asm/i386/obj/win32/lzo1f_f1.obj Binary files differindex 41b0cf9c..231fb2b5 100644 --- a/lzo/asm/i386/obj/win32/lzo1f_f1.obj +++ b/lzo/asm/i386/obj/win32/lzo1f_f1.obj diff --git a/lzo/asm/i386/obj/win32/lzo1f_f2.obj b/lzo/asm/i386/obj/win32/lzo1f_f2.obj Binary files differindex 3ea9d368..7c6263ac 100644 --- a/lzo/asm/i386/obj/win32/lzo1f_f2.obj +++ b/lzo/asm/i386/obj/win32/lzo1f_f2.obj diff --git a/lzo/asm/i386/obj/win32/lzo1x_f1.obj b/lzo/asm/i386/obj/win32/lzo1x_f1.obj Binary files differindex 8760ca76..740ad7c9 100644 --- a/lzo/asm/i386/obj/win32/lzo1x_f1.obj +++ b/lzo/asm/i386/obj/win32/lzo1x_f1.obj diff --git a/lzo/asm/i386/obj/win32/lzo1x_f2.obj b/lzo/asm/i386/obj/win32/lzo1x_f2.obj Binary files differindex ecd4b5f1..6307e9ef 100644 --- a/lzo/asm/i386/obj/win32/lzo1x_f2.obj +++ b/lzo/asm/i386/obj/win32/lzo1x_f2.obj diff --git a/lzo/asm/i386/obj/win32/lzo1x_s1.obj b/lzo/asm/i386/obj/win32/lzo1x_s1.obj Binary files differindex 9939d442..ddd38b07 100644 --- a/lzo/asm/i386/obj/win32/lzo1x_s1.obj +++ b/lzo/asm/i386/obj/win32/lzo1x_s1.obj diff --git a/lzo/asm/i386/obj/win32/lzo1x_s2.obj b/lzo/asm/i386/obj/win32/lzo1x_s2.obj Binary files differindex 6cde95ed..c19f527f 100644 --- a/lzo/asm/i386/obj/win32/lzo1x_s2.obj +++ b/lzo/asm/i386/obj/win32/lzo1x_s2.obj diff --git a/lzo/asm/i386/obj/win32/lzo1y_f1.obj b/lzo/asm/i386/obj/win32/lzo1y_f1.obj Binary files differindex 343f6cf8..828cd062 100644 --- a/lzo/asm/i386/obj/win32/lzo1y_f1.obj +++ b/lzo/asm/i386/obj/win32/lzo1y_f1.obj diff --git a/lzo/asm/i386/obj/win32/lzo1y_f2.obj b/lzo/asm/i386/obj/win32/lzo1y_f2.obj Binary files differindex fb71bb04..75640fdd 100644 --- a/lzo/asm/i386/obj/win32/lzo1y_f2.obj +++ b/lzo/asm/i386/obj/win32/lzo1y_f2.obj diff --git a/lzo/asm/i386/obj/win32/lzo1y_s1.obj b/lzo/asm/i386/obj/win32/lzo1y_s1.obj Binary files differindex a7639f73..5b57c8e0 100644 --- a/lzo/asm/i386/obj/win32/lzo1y_s1.obj +++ b/lzo/asm/i386/obj/win32/lzo1y_s1.obj diff --git a/lzo/asm/i386/obj/win32/lzo1y_s2.obj b/lzo/asm/i386/obj/win32/lzo1y_s2.obj Binary files differindex 2b444fd7..38b025ee 100644 --- a/lzo/asm/i386/obj/win32/lzo1y_s2.obj +++ b/lzo/asm/i386/obj/win32/lzo1y_s2.obj diff --git a/lzo/asm/i386/src/enter.ash b/lzo/asm/i386/src/enter.ash index 49c455d6..c2aa0817 100644 --- a/lzo/asm/i386/src/enter.ash +++ b/lzo/asm/i386/src/enter.ash @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/leave.ash b/lzo/asm/i386/src/leave.ash index 9550b46f..0fdb729f 100644 --- a/lzo/asm/i386/src/leave.ash +++ b/lzo/asm/i386/src/leave.ash @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1c_d.ash b/lzo/asm/i386/src/lzo1c_d.ash index 9969c86a..56622ab5 100644 --- a/lzo/asm/i386/src/lzo1c_d.ash +++ b/lzo/asm/i386/src/lzo1c_d.ash @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1c_s1.S b/lzo/asm/i386/src/lzo1c_s1.S index 59a74410..b68ca293 100644 --- a/lzo/asm/i386/src/lzo1c_s1.S +++ b/lzo/asm/i386/src/lzo1c_s1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1c_s2.S b/lzo/asm/i386/src/lzo1c_s2.S index e74d3f90..f874002e 100644 --- a/lzo/asm/i386/src/lzo1c_s2.S +++ b/lzo/asm/i386/src/lzo1c_s2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1f_d.ash b/lzo/asm/i386/src/lzo1f_d.ash index aa9279e0..97a103c0 100644 --- a/lzo/asm/i386/src/lzo1f_d.ash +++ b/lzo/asm/i386/src/lzo1f_d.ash @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1f_f1.S b/lzo/asm/i386/src/lzo1f_f1.S index 7a4c2f9d..46eb26b2 100644 --- a/lzo/asm/i386/src/lzo1f_f1.S +++ b/lzo/asm/i386/src/lzo1f_f1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1f_f2.S b/lzo/asm/i386/src/lzo1f_f2.S index 876769ea..904a5f31 100644 --- a/lzo/asm/i386/src/lzo1f_f2.S +++ b/lzo/asm/i386/src/lzo1f_f2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1x_d.ash b/lzo/asm/i386/src/lzo1x_d.ash index aa138354..782b47fe 100644 --- a/lzo/asm/i386/src/lzo1x_d.ash +++ b/lzo/asm/i386/src/lzo1x_d.ash @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1x_f1.S b/lzo/asm/i386/src/lzo1x_f1.S index 8cb07f24..ccdb9022 100644 --- a/lzo/asm/i386/src/lzo1x_f1.S +++ b/lzo/asm/i386/src/lzo1x_f1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1x_f2.S b/lzo/asm/i386/src/lzo1x_f2.S index e8b2b594..f9ad6b32 100644 --- a/lzo/asm/i386/src/lzo1x_f2.S +++ b/lzo/asm/i386/src/lzo1x_f2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1x_s1.S b/lzo/asm/i386/src/lzo1x_s1.S index 6cb90ec3..1e901ed6 100644 --- a/lzo/asm/i386/src/lzo1x_s1.S +++ b/lzo/asm/i386/src/lzo1x_s1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1x_s2.S b/lzo/asm/i386/src/lzo1x_s2.S index e4e98ead..aaa294de 100644 --- a/lzo/asm/i386/src/lzo1x_s2.S +++ b/lzo/asm/i386/src/lzo1x_s2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1y_f1.S b/lzo/asm/i386/src/lzo1y_f1.S index 7d9db267..c993beef 100644 --- a/lzo/asm/i386/src/lzo1y_f1.S +++ b/lzo/asm/i386/src/lzo1y_f1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1y_f2.S b/lzo/asm/i386/src/lzo1y_f2.S index 09aa3afd..2dace850 100644 --- a/lzo/asm/i386/src/lzo1y_f2.S +++ b/lzo/asm/i386/src/lzo1y_f2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1y_s1.S b/lzo/asm/i386/src/lzo1y_s1.S index 97b568ea..c57a1c8c 100644 --- a/lzo/asm/i386/src/lzo1y_s1.S +++ b/lzo/asm/i386/src/lzo1y_s1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo1y_s2.S b/lzo/asm/i386/src/lzo1y_s2.S index 808107f6..238c762e 100644 --- a/lzo/asm/i386/src/lzo1y_s2.S +++ b/lzo/asm/i386/src/lzo1y_s2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src/lzo_asm.h b/lzo/asm/i386/src/lzo_asm.h index 55fdf6d1..1188dd60 100644 --- a/lzo/asm/i386/src/lzo_asm.h +++ b/lzo/asm/i386/src/lzo_asm.h @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -52,17 +55,17 @@ #else /* manual configuration - see defaults below */ # if defined(__ELF__) -# define MFX_ASM_HAVE_TYPE -# define MFX_ASM_NAME_NO_UNDERSCORES +# define MFX_ASM_HAVE_TYPE 1 +# define MFX_ASM_NAME_NO_UNDERSCORES 1 # elif defined(__linux__) /* Linux a.out */ -# define MFX_ASM_ALIGN_PTWO +# define MFX_ASM_ALIGN_PTWO 1 # elif defined(__DJGPP__) -# define MFX_ASM_ALIGN_PTWO +# define MFX_ASM_ALIGN_PTWO 1 # elif defined(__GO32__) /* djgpp v1 */ -# define MFX_ASM_CANNOT_USE_EBP +# define MFX_ASM_CANNOT_USE_EBP 1 # elif defined(__EMX__) -# define MFX_ASM_ALIGN_PTWO -# define MFX_ASM_CANNOT_USE_EBP +# define MFX_ASM_ALIGN_PTWO 1 +# define MFX_ASM_CANNOT_USE_EBP 1 # endif #endif #endif @@ -123,7 +126,7 @@ ************************************************************************/ #if !defined(MFX_ASM_ALIGN_BYTES) && !defined(MFX_ASM_ALIGN_PTWO) -# define MFX_ASM_ALIGN_BYTES +# define MFX_ASM_ALIGN_BYTES 1 #endif #if !defined(LZO_ASM_ALIGN) @@ -145,10 +148,10 @@ #if !defined(MFX_ASM_CANNOT_USE_EBP) # if 1 && !defined(N_3_EBP) && !defined(N_255_EBP) -# define N_3_EBP +# define N_3_EBP 1 # endif # if 0 && !defined(N_3_EBP) && !defined(N_255_EBP) -# define N_255_EBP +# define N_255_EBP 1 # endif #endif diff --git a/lzo/asm/i386/src_gas/all/asm_all.S b/lzo/asm/i386/src_gas/all/asm_all.S index d8dd80d7..cb859427 100644 --- a/lzo/asm/i386/src_gas/all/asm_all.S +++ b/lzo/asm/i386/src_gas/all/asm_all.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,28 +38,34 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ -#ifndef F -# define F(name) name +#if defined(__MACH__) && defined(__APPLE__) +# define NAME1(x) _ ## x +#else +# define NAME1(x) _ ## x +# define NAME2(x) x #endif -#ifndef global -# define global(x) .globl x +#ifndef p2align +# define p2align(x) .p2align x +#endif +#ifndef globalf +# define globalf(x) .globl x #endif #ifndef typef -# ifdef __ELF__ +# if defined(__ELF__) # define typef(x) .type x,@function # else # define typef(x) # endif #endif -#ifndef size -# ifdef __ELF__ -# define size(x,s) .size x,s +#ifndef sizef +# if defined(__ELF__) +# define sizef(x,s) .size x,s # else -# define size(x,s) +# define sizef(x,s) # endif #endif #ifndef db @@ -66,13 +75,26 @@ .section .note.GNU-stack,"",@progbits #endif .text +p2align(4) -typef(_lzo1c_decompress_asm) -typef(F(lzo1c_decompress_asm)) -global(_lzo1c_decompress_asm) -global(F(lzo1c_decompress_asm)) -_lzo1c_decompress_asm: -F(lzo1c_decompress_asm): +#ifdef NAME1 +typef(NAME1(lzo1c_decompress_asm)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1c_decompress_asm)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1c_decompress_asm)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1c_decompress_asm)) +#endif +#ifdef NAME1 +NAME1(lzo1c_decompress_asm): +#endif +#ifdef NAME2 +NAME2(lzo1c_decompress_asm): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,144,49,192,138,6,70,60,32,115 db 15,8,192,116,51,137,193,243,164,138,6,70,60,32,114,72 @@ -91,15 +113,31 @@ db 149,192,139,84,36,40,3,84,36,44,57,214,119,38,114,29 db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90 db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0 db 0,0,235,220,184,4,0,0,0,235,213,144,141,116,38,0 -size(_lzo1c_decompress_asm,.-_lzo1c_decompress_asm) -size(F(lzo1c_decompress_asm),.-F(lzo1c_decompress_asm)) +#ifdef NAME1 +sizef(NAME1(lzo1c_decompress_asm),.-NAME1(lzo1c_decompress_asm)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1c_decompress_asm),.-NAME2(lzo1c_decompress_asm)) +#endif -typef(_lzo1c_decompress_asm_safe) -typef(F(lzo1c_decompress_asm_safe)) -global(_lzo1c_decompress_asm_safe) -global(F(lzo1c_decompress_asm_safe)) -_lzo1c_decompress_asm_safe: -F(lzo1c_decompress_asm_safe): +#ifdef NAME1 +typef(NAME1(lzo1c_decompress_asm_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1c_decompress_asm_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1c_decompress_asm_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1c_decompress_asm_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1c_decompress_asm_safe): +#endif +#ifdef NAME2 +NAME2(lzo1c_decompress_asm_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0 @@ -129,15 +167,31 @@ db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93 db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184 db 4,0,0,0,235,213,184,5,0,0,0,235,206,184,6,0 db 0,0,235,199,141,182,0,0,0,0,141,191,0,0,0,0 -size(_lzo1c_decompress_asm_safe,.-_lzo1c_decompress_asm_safe) -size(F(lzo1c_decompress_asm_safe),.-F(lzo1c_decompress_asm_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1c_decompress_asm_safe),.-NAME1(lzo1c_decompress_asm_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1c_decompress_asm_safe),.-NAME2(lzo1c_decompress_asm_safe)) +#endif -typef(_lzo1f_decompress_asm_fast) -typef(F(lzo1f_decompress_asm_fast)) -global(_lzo1f_decompress_asm_fast) -global(F(lzo1f_decompress_asm_fast)) -_lzo1f_decompress_asm_fast: -F(lzo1f_decompress_asm_fast): +#ifdef NAME1 +typef(NAME1(lzo1f_decompress_asm_fast)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1f_decompress_asm_fast)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1f_decompress_asm_fast)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1f_decompress_asm_fast)) +#endif +#ifdef NAME1 +NAME1(lzo1f_decompress_asm_fast): +#endif +#ifdef NAME2 +NAME2(lzo1f_decompress_asm_fast): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,144,49,192,138,6,70,60,31,119 db 51,8,192,137,193,117,19,138,6,70,8,192,117,8,129,193 @@ -158,15 +212,31 @@ db 40,3,84,36,44,57,214,119,38,114,29,43,124,36,48,139 db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93 db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184 db 4,0,0,0,235,213,141,118,0,141,188,39,0,0,0,0 -size(_lzo1f_decompress_asm_fast,.-_lzo1f_decompress_asm_fast) -size(F(lzo1f_decompress_asm_fast),.-F(lzo1f_decompress_asm_fast)) +#ifdef NAME1 +sizef(NAME1(lzo1f_decompress_asm_fast),.-NAME1(lzo1f_decompress_asm_fast)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1f_decompress_asm_fast),.-NAME2(lzo1f_decompress_asm_fast)) +#endif -typef(_lzo1f_decompress_asm_fast_safe) -typef(F(lzo1f_decompress_asm_fast_safe)) -global(_lzo1f_decompress_asm_fast_safe) -global(F(lzo1f_decompress_asm_fast_safe)) -_lzo1f_decompress_asm_fast_safe: -F(lzo1f_decompress_asm_fast_safe): +#ifdef NAME1 +typef(NAME1(lzo1f_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1f_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1f_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1f_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1f_decompress_asm_fast_safe): +#endif +#ifdef NAME2 +NAME2(lzo1f_decompress_asm_fast_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0 @@ -194,15 +264,31 @@ db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90 db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0 db 0,0,235,220,184,4,0,0,0,235,213,184,5,0,0,0 db 235,206,184,6,0,0,0,235,199,141,180,38,0,0,0,0 -size(_lzo1f_decompress_asm_fast_safe,.-_lzo1f_decompress_asm_fast_safe) -size(F(lzo1f_decompress_asm_fast_safe),.-F(lzo1f_decompress_asm_fast_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1f_decompress_asm_fast_safe),.-NAME1(lzo1f_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1f_decompress_asm_fast_safe),.-NAME2(lzo1f_decompress_asm_fast_safe)) +#endif -typef(_lzo1x_decompress_asm_fast) -typef(F(lzo1x_decompress_asm_fast)) -global(_lzo1x_decompress_asm_fast) -global(F(lzo1x_decompress_asm_fast)) -_lzo1x_decompress_asm_fast: -F(lzo1x_decompress_asm_fast): +#ifdef NAME1 +typef(NAME1(lzo1x_decompress_asm_fast)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1x_decompress_asm_fast)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_fast)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_fast)) +#endif +#ifdef NAME1 +NAME1(lzo1x_decompress_asm_fast): +#endif +#ifdef NAME2 +NAME2(lzo1x_decompress_asm_fast): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,27 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244 @@ -231,15 +317,31 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144 -size(_lzo1x_decompress_asm_fast,.-_lzo1x_decompress_asm_fast) -size(F(lzo1x_decompress_asm_fast),.-F(lzo1x_decompress_asm_fast)) +#ifdef NAME1 +sizef(NAME1(lzo1x_decompress_asm_fast),.-NAME1(lzo1x_decompress_asm_fast)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1x_decompress_asm_fast),.-NAME2(lzo1x_decompress_asm_fast)) +#endif -typef(_lzo1x_decompress_asm_fast_safe) -typef(F(lzo1x_decompress_asm_fast_safe)) -global(_lzo1x_decompress_asm_fast_safe) -global(F(lzo1x_decompress_asm_fast_safe)) -_lzo1x_decompress_asm_fast_safe: -F(lzo1x_decompress_asm_fast_safe): +#ifdef NAME1 +typef(NAME1(lzo1x_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1x_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1x_decompress_asm_fast_safe): +#endif +#ifdef NAME2 +NAME2(lzo1x_decompress_asm_fast_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -283,15 +385,31 @@ db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137 db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0 db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0 db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199 -size(_lzo1x_decompress_asm_fast_safe,.-_lzo1x_decompress_asm_fast_safe) -size(F(lzo1x_decompress_asm_fast_safe),.-F(lzo1x_decompress_asm_fast_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1x_decompress_asm_fast_safe),.-NAME1(lzo1x_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1x_decompress_asm_fast_safe),.-NAME2(lzo1x_decompress_asm_fast_safe)) +#endif -typef(_lzo1x_decompress_asm) -typef(F(lzo1x_decompress_asm)) -global(_lzo1x_decompress_asm) -global(F(lzo1x_decompress_asm)) -_lzo1x_decompress_asm: -F(lzo1x_decompress_asm): +#ifdef NAME1 +typef(NAME1(lzo1x_decompress_asm)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1x_decompress_asm)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm)) +#endif +#ifdef NAME1 +NAME1(lzo1x_decompress_asm): +#endif +#ifdef NAME2 +NAME2(lzo1x_decompress_asm): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,35 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138 @@ -322,15 +440,31 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0 -size(_lzo1x_decompress_asm,.-_lzo1x_decompress_asm) -size(F(lzo1x_decompress_asm),.-F(lzo1x_decompress_asm)) +#ifdef NAME1 +sizef(NAME1(lzo1x_decompress_asm),.-NAME1(lzo1x_decompress_asm)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1x_decompress_asm),.-NAME2(lzo1x_decompress_asm)) +#endif -typef(_lzo1x_decompress_asm_safe) -typef(F(lzo1x_decompress_asm_safe)) -global(_lzo1x_decompress_asm_safe) -global(F(lzo1x_decompress_asm_safe)) -_lzo1x_decompress_asm_safe: -F(lzo1x_decompress_asm_safe): +#ifdef NAME1 +typef(NAME1(lzo1x_decompress_asm_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1x_decompress_asm_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1x_decompress_asm_safe): +#endif +#ifdef NAME2 +NAME2(lzo1x_decompress_asm_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -377,15 +511,31 @@ db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89 db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0 db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235 db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0 -size(_lzo1x_decompress_asm_safe,.-_lzo1x_decompress_asm_safe) -size(F(lzo1x_decompress_asm_safe),.-F(lzo1x_decompress_asm_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1x_decompress_asm_safe),.-NAME1(lzo1x_decompress_asm_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1x_decompress_asm_safe),.-NAME2(lzo1x_decompress_asm_safe)) +#endif -typef(_lzo1y_decompress_asm_fast) -typef(F(lzo1y_decompress_asm_fast)) -global(_lzo1y_decompress_asm_fast) -global(F(lzo1y_decompress_asm_fast)) -_lzo1y_decompress_asm_fast: -F(lzo1y_decompress_asm_fast): +#ifdef NAME1 +typef(NAME1(lzo1y_decompress_asm_fast)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1y_decompress_asm_fast)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_fast)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_fast)) +#endif +#ifdef NAME1 +NAME1(lzo1y_decompress_asm_fast): +#endif +#ifdef NAME2 +NAME2(lzo1y_decompress_asm_fast): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,27 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244 @@ -414,15 +564,31 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144 -size(_lzo1y_decompress_asm_fast,.-_lzo1y_decompress_asm_fast) -size(F(lzo1y_decompress_asm_fast),.-F(lzo1y_decompress_asm_fast)) +#ifdef NAME1 +sizef(NAME1(lzo1y_decompress_asm_fast),.-NAME1(lzo1y_decompress_asm_fast)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1y_decompress_asm_fast),.-NAME2(lzo1y_decompress_asm_fast)) +#endif -typef(_lzo1y_decompress_asm_fast_safe) -typef(F(lzo1y_decompress_asm_fast_safe)) -global(_lzo1y_decompress_asm_fast_safe) -global(F(lzo1y_decompress_asm_fast_safe)) -_lzo1y_decompress_asm_fast_safe: -F(lzo1y_decompress_asm_fast_safe): +#ifdef NAME1 +typef(NAME1(lzo1y_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1y_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1y_decompress_asm_fast_safe): +#endif +#ifdef NAME2 +NAME2(lzo1y_decompress_asm_fast_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -466,15 +632,31 @@ db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137 db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0 db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0 db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199 -size(_lzo1y_decompress_asm_fast_safe,.-_lzo1y_decompress_asm_fast_safe) -size(F(lzo1y_decompress_asm_fast_safe),.-F(lzo1y_decompress_asm_fast_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1y_decompress_asm_fast_safe),.-NAME1(lzo1y_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1y_decompress_asm_fast_safe),.-NAME2(lzo1y_decompress_asm_fast_safe)) +#endif -typef(_lzo1y_decompress_asm) -typef(F(lzo1y_decompress_asm)) -global(_lzo1y_decompress_asm) -global(F(lzo1y_decompress_asm)) -_lzo1y_decompress_asm: -F(lzo1y_decompress_asm): +#ifdef NAME1 +typef(NAME1(lzo1y_decompress_asm)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1y_decompress_asm)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm)) +#endif +#ifdef NAME1 +NAME1(lzo1y_decompress_asm): +#endif +#ifdef NAME2 +NAME2(lzo1y_decompress_asm): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,35 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138 @@ -505,15 +687,31 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0 -size(_lzo1y_decompress_asm,.-_lzo1y_decompress_asm) -size(F(lzo1y_decompress_asm),.-F(lzo1y_decompress_asm)) +#ifdef NAME1 +sizef(NAME1(lzo1y_decompress_asm),.-NAME1(lzo1y_decompress_asm)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1y_decompress_asm),.-NAME2(lzo1y_decompress_asm)) +#endif -typef(_lzo1y_decompress_asm_safe) -typef(F(lzo1y_decompress_asm_safe)) -global(_lzo1y_decompress_asm_safe) -global(F(lzo1y_decompress_asm_safe)) -_lzo1y_decompress_asm_safe: -F(lzo1y_decompress_asm_safe): +#ifdef NAME1 +typef(NAME1(lzo1y_decompress_asm_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1y_decompress_asm_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1y_decompress_asm_safe): +#endif +#ifdef NAME2 +NAME2(lzo1y_decompress_asm_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -560,6 +758,10 @@ db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89 db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0 db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235 db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0 -size(_lzo1y_decompress_asm_safe,.-_lzo1y_decompress_asm_safe) -size(F(lzo1y_decompress_asm_safe),.-F(lzo1y_decompress_asm_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1y_decompress_asm_safe),.-NAME1(lzo1y_decompress_asm_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1y_decompress_asm_safe),.-NAME2(lzo1y_decompress_asm_safe)) +#endif diff --git a/lzo/asm/i386/src_gas/asminit.def b/lzo/asm/i386/src_gas/asminit.def index 942b7b3c..154b8a52 100644 --- a/lzo/asm/i386/src_gas/asminit.def +++ b/lzo/asm/i386/src_gas/asminit.def @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,26 +38,33 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ -#ifndef F -# define F(name) name +#if defined(__MACH__) && defined(__APPLE__) +# define NAME1(x) _ ## x +#else +# define NAME1(x) _ ## x +# define NAME2(x) x #endif -#ifndef global -# define global(x) .globl x + +#ifndef p2align +# define p2align(x) .p2align x +#endif +#ifndef globalf +# define globalf(x) .globl x #endif #ifndef typef -# ifdef __ELF__ +# if defined(__ELF__) # define typef(x) .type x,@function # else # define typef(x) # endif #endif -#ifndef size -# ifdef __ELF__ -# define size(x,s) .size x,s +#ifndef sizef +# if defined(__ELF__) +# define sizef(x,s) .size x,s # else -# define size(x,s) +# define sizef(x,s) # endif #endif #ifndef db @@ -65,3 +75,4 @@ .section .note.GNU-stack,"",@progbits #endif .text +p2align(4) diff --git a/lzo/asm/i386/src_gas/lzo1c_s1.S b/lzo/asm/i386/src_gas/lzo1c_s1.S index 3db16c1c..8b01a3b0 100644 --- a/lzo/asm/i386/src_gas/lzo1c_s1.S +++ b/lzo/asm/i386/src_gas/lzo1c_s1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1c_decompress_asm) -typef(F(lzo1c_decompress_asm)) -global(_lzo1c_decompress_asm) -global(F(lzo1c_decompress_asm)) -_lzo1c_decompress_asm: -F(lzo1c_decompress_asm): +#ifdef NAME1 +typef(NAME1(lzo1c_decompress_asm)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1c_decompress_asm)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1c_decompress_asm)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1c_decompress_asm)) +#endif +#ifdef NAME1 +NAME1(lzo1c_decompress_asm): +#endif +#ifdef NAME2 +NAME2(lzo1c_decompress_asm): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,144,49,192,138,6,70,60,32,115 db 15,8,192,116,51,137,193,243,164,138,6,70,60,32,114,72 @@ -64,5 +79,9 @@ db 149,192,139,84,36,40,3,84,36,44,57,214,119,38,114,29 db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90 db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0 db 0,0,235,220,184,4,0,0,0,235,213,144,141,116,38,0 -size(_lzo1c_decompress_asm,.-_lzo1c_decompress_asm) -size(F(lzo1c_decompress_asm),.-F(lzo1c_decompress_asm)) +#ifdef NAME1 +sizef(NAME1(lzo1c_decompress_asm),.-NAME1(lzo1c_decompress_asm)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1c_decompress_asm),.-NAME2(lzo1c_decompress_asm)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1c_s2.S b/lzo/asm/i386/src_gas/lzo1c_s2.S index 91213b98..1797cc34 100644 --- a/lzo/asm/i386/src_gas/lzo1c_s2.S +++ b/lzo/asm/i386/src_gas/lzo1c_s2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1c_decompress_asm_safe) -typef(F(lzo1c_decompress_asm_safe)) -global(_lzo1c_decompress_asm_safe) -global(F(lzo1c_decompress_asm_safe)) -_lzo1c_decompress_asm_safe: -F(lzo1c_decompress_asm_safe): +#ifdef NAME1 +typef(NAME1(lzo1c_decompress_asm_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1c_decompress_asm_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1c_decompress_asm_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1c_decompress_asm_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1c_decompress_asm_safe): +#endif +#ifdef NAME2 +NAME2(lzo1c_decompress_asm_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0 @@ -75,5 +90,9 @@ db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93 db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184 db 4,0,0,0,235,213,184,5,0,0,0,235,206,184,6,0 db 0,0,235,199,141,182,0,0,0,0,141,191,0,0,0,0 -size(_lzo1c_decompress_asm_safe,.-_lzo1c_decompress_asm_safe) -size(F(lzo1c_decompress_asm_safe),.-F(lzo1c_decompress_asm_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1c_decompress_asm_safe),.-NAME1(lzo1c_decompress_asm_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1c_decompress_asm_safe),.-NAME2(lzo1c_decompress_asm_safe)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1f_f1.S b/lzo/asm/i386/src_gas/lzo1f_f1.S index 0020839c..e3f5ccf8 100644 --- a/lzo/asm/i386/src_gas/lzo1f_f1.S +++ b/lzo/asm/i386/src_gas/lzo1f_f1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1f_decompress_asm_fast) -typef(F(lzo1f_decompress_asm_fast)) -global(_lzo1f_decompress_asm_fast) -global(F(lzo1f_decompress_asm_fast)) -_lzo1f_decompress_asm_fast: -F(lzo1f_decompress_asm_fast): +#ifdef NAME1 +typef(NAME1(lzo1f_decompress_asm_fast)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1f_decompress_asm_fast)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1f_decompress_asm_fast)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1f_decompress_asm_fast)) +#endif +#ifdef NAME1 +NAME1(lzo1f_decompress_asm_fast): +#endif +#ifdef NAME2 +NAME2(lzo1f_decompress_asm_fast): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,144,49,192,138,6,70,60,31,119 db 51,8,192,137,193,117,19,138,6,70,8,192,117,8,129,193 @@ -66,5 +81,9 @@ db 40,3,84,36,44,57,214,119,38,114,29,43,124,36,48,139 db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93 db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184 db 4,0,0,0,235,213,141,118,0,141,188,39,0,0,0,0 -size(_lzo1f_decompress_asm_fast,.-_lzo1f_decompress_asm_fast) -size(F(lzo1f_decompress_asm_fast),.-F(lzo1f_decompress_asm_fast)) +#ifdef NAME1 +sizef(NAME1(lzo1f_decompress_asm_fast),.-NAME1(lzo1f_decompress_asm_fast)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1f_decompress_asm_fast),.-NAME2(lzo1f_decompress_asm_fast)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1f_f2.S b/lzo/asm/i386/src_gas/lzo1f_f2.S index 0c721049..f2041bc7 100644 --- a/lzo/asm/i386/src_gas/lzo1f_f2.S +++ b/lzo/asm/i386/src_gas/lzo1f_f2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1f_decompress_asm_fast_safe) -typef(F(lzo1f_decompress_asm_fast_safe)) -global(_lzo1f_decompress_asm_fast_safe) -global(F(lzo1f_decompress_asm_fast_safe)) -_lzo1f_decompress_asm_fast_safe: -F(lzo1f_decompress_asm_fast_safe): +#ifdef NAME1 +typef(NAME1(lzo1f_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1f_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1f_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1f_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1f_decompress_asm_fast_safe): +#endif +#ifdef NAME2 +NAME2(lzo1f_decompress_asm_fast_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0 @@ -73,5 +88,9 @@ db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90 db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0 db 0,0,235,220,184,4,0,0,0,235,213,184,5,0,0,0 db 235,206,184,6,0,0,0,235,199,141,180,38,0,0,0,0 -size(_lzo1f_decompress_asm_fast_safe,.-_lzo1f_decompress_asm_fast_safe) -size(F(lzo1f_decompress_asm_fast_safe),.-F(lzo1f_decompress_asm_fast_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1f_decompress_asm_fast_safe),.-NAME1(lzo1f_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1f_decompress_asm_fast_safe),.-NAME2(lzo1f_decompress_asm_fast_safe)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1x_f1.S b/lzo/asm/i386/src_gas/lzo1x_f1.S index 4137f899..26f42e91 100644 --- a/lzo/asm/i386/src_gas/lzo1x_f1.S +++ b/lzo/asm/i386/src_gas/lzo1x_f1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1x_decompress_asm_fast) -typef(F(lzo1x_decompress_asm_fast)) -global(_lzo1x_decompress_asm_fast) -global(F(lzo1x_decompress_asm_fast)) -_lzo1x_decompress_asm_fast: -F(lzo1x_decompress_asm_fast): +#ifdef NAME1 +typef(NAME1(lzo1x_decompress_asm_fast)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1x_decompress_asm_fast)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_fast)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_fast)) +#endif +#ifdef NAME1 +NAME1(lzo1x_decompress_asm_fast): +#endif +#ifdef NAME2 +NAME2(lzo1x_decompress_asm_fast): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,27 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244 @@ -74,5 +89,9 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144 -size(_lzo1x_decompress_asm_fast,.-_lzo1x_decompress_asm_fast) -size(F(lzo1x_decompress_asm_fast),.-F(lzo1x_decompress_asm_fast)) +#ifdef NAME1 +sizef(NAME1(lzo1x_decompress_asm_fast),.-NAME1(lzo1x_decompress_asm_fast)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1x_decompress_asm_fast),.-NAME2(lzo1x_decompress_asm_fast)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1x_f2.S b/lzo/asm/i386/src_gas/lzo1x_f2.S index eb3a744c..0ded30ee 100644 --- a/lzo/asm/i386/src_gas/lzo1x_f2.S +++ b/lzo/asm/i386/src_gas/lzo1x_f2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1x_decompress_asm_fast_safe) -typef(F(lzo1x_decompress_asm_fast_safe)) -global(_lzo1x_decompress_asm_fast_safe) -global(F(lzo1x_decompress_asm_fast_safe)) -_lzo1x_decompress_asm_fast_safe: -F(lzo1x_decompress_asm_fast_safe): +#ifdef NAME1 +typef(NAME1(lzo1x_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1x_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1x_decompress_asm_fast_safe): +#endif +#ifdef NAME2 +NAME2(lzo1x_decompress_asm_fast_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -89,5 +104,9 @@ db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137 db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0 db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0 db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199 -size(_lzo1x_decompress_asm_fast_safe,.-_lzo1x_decompress_asm_fast_safe) -size(F(lzo1x_decompress_asm_fast_safe),.-F(lzo1x_decompress_asm_fast_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1x_decompress_asm_fast_safe),.-NAME1(lzo1x_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1x_decompress_asm_fast_safe),.-NAME2(lzo1x_decompress_asm_fast_safe)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1x_s1.S b/lzo/asm/i386/src_gas/lzo1x_s1.S index 28095c6b..a18a7319 100644 --- a/lzo/asm/i386/src_gas/lzo1x_s1.S +++ b/lzo/asm/i386/src_gas/lzo1x_s1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1x_decompress_asm) -typef(F(lzo1x_decompress_asm)) -global(_lzo1x_decompress_asm) -global(F(lzo1x_decompress_asm)) -_lzo1x_decompress_asm: -F(lzo1x_decompress_asm): +#ifdef NAME1 +typef(NAME1(lzo1x_decompress_asm)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1x_decompress_asm)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm)) +#endif +#ifdef NAME1 +NAME1(lzo1x_decompress_asm): +#endif +#ifdef NAME2 +NAME2(lzo1x_decompress_asm): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,35 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138 @@ -76,5 +91,9 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0 -size(_lzo1x_decompress_asm,.-_lzo1x_decompress_asm) -size(F(lzo1x_decompress_asm),.-F(lzo1x_decompress_asm)) +#ifdef NAME1 +sizef(NAME1(lzo1x_decompress_asm),.-NAME1(lzo1x_decompress_asm)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1x_decompress_asm),.-NAME2(lzo1x_decompress_asm)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1x_s2.S b/lzo/asm/i386/src_gas/lzo1x_s2.S index 33e15258..46d60aa0 100644 --- a/lzo/asm/i386/src_gas/lzo1x_s2.S +++ b/lzo/asm/i386/src_gas/lzo1x_s2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1x_decompress_asm_safe) -typef(F(lzo1x_decompress_asm_safe)) -global(_lzo1x_decompress_asm_safe) -global(F(lzo1x_decompress_asm_safe)) -_lzo1x_decompress_asm_safe: -F(lzo1x_decompress_asm_safe): +#ifdef NAME1 +typef(NAME1(lzo1x_decompress_asm_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1x_decompress_asm_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1x_decompress_asm_safe): +#endif +#ifdef NAME2 +NAME2(lzo1x_decompress_asm_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -92,5 +107,9 @@ db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89 db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0 db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235 db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0 -size(_lzo1x_decompress_asm_safe,.-_lzo1x_decompress_asm_safe) -size(F(lzo1x_decompress_asm_safe),.-F(lzo1x_decompress_asm_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1x_decompress_asm_safe),.-NAME1(lzo1x_decompress_asm_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1x_decompress_asm_safe),.-NAME2(lzo1x_decompress_asm_safe)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1y_f1.S b/lzo/asm/i386/src_gas/lzo1y_f1.S index 28b4826a..e13fd08d 100644 --- a/lzo/asm/i386/src_gas/lzo1y_f1.S +++ b/lzo/asm/i386/src_gas/lzo1y_f1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1y_decompress_asm_fast) -typef(F(lzo1y_decompress_asm_fast)) -global(_lzo1y_decompress_asm_fast) -global(F(lzo1y_decompress_asm_fast)) -_lzo1y_decompress_asm_fast: -F(lzo1y_decompress_asm_fast): +#ifdef NAME1 +typef(NAME1(lzo1y_decompress_asm_fast)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1y_decompress_asm_fast)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_fast)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_fast)) +#endif +#ifdef NAME1 +NAME1(lzo1y_decompress_asm_fast): +#endif +#ifdef NAME2 +NAME2(lzo1y_decompress_asm_fast): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,27 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244 @@ -74,5 +89,9 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144 -size(_lzo1y_decompress_asm_fast,.-_lzo1y_decompress_asm_fast) -size(F(lzo1y_decompress_asm_fast),.-F(lzo1y_decompress_asm_fast)) +#ifdef NAME1 +sizef(NAME1(lzo1y_decompress_asm_fast),.-NAME1(lzo1y_decompress_asm_fast)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1y_decompress_asm_fast),.-NAME2(lzo1y_decompress_asm_fast)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1y_f2.S b/lzo/asm/i386/src_gas/lzo1y_f2.S index d95b2c38..de28ace9 100644 --- a/lzo/asm/i386/src_gas/lzo1y_f2.S +++ b/lzo/asm/i386/src_gas/lzo1y_f2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1y_decompress_asm_fast_safe) -typef(F(lzo1y_decompress_asm_fast_safe)) -global(_lzo1y_decompress_asm_fast_safe) -global(F(lzo1y_decompress_asm_fast_safe)) -_lzo1y_decompress_asm_fast_safe: -F(lzo1y_decompress_asm_fast_safe): +#ifdef NAME1 +typef(NAME1(lzo1y_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1y_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_fast_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1y_decompress_asm_fast_safe): +#endif +#ifdef NAME2 +NAME2(lzo1y_decompress_asm_fast_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -89,5 +104,9 @@ db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137 db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0 db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0 db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199 -size(_lzo1y_decompress_asm_fast_safe,.-_lzo1y_decompress_asm_fast_safe) -size(F(lzo1y_decompress_asm_fast_safe),.-F(lzo1y_decompress_asm_fast_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1y_decompress_asm_fast_safe),.-NAME1(lzo1y_decompress_asm_fast_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1y_decompress_asm_fast_safe),.-NAME2(lzo1y_decompress_asm_fast_safe)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1y_s1.S b/lzo/asm/i386/src_gas/lzo1y_s1.S index 65528017..269955b0 100644 --- a/lzo/asm/i386/src_gas/lzo1y_s1.S +++ b/lzo/asm/i386/src_gas/lzo1y_s1.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1y_decompress_asm) -typef(F(lzo1y_decompress_asm)) -global(_lzo1y_decompress_asm) -global(F(lzo1y_decompress_asm)) -_lzo1y_decompress_asm: -F(lzo1y_decompress_asm): +#ifdef NAME1 +typef(NAME1(lzo1y_decompress_asm)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1y_decompress_asm)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm)) +#endif +#ifdef NAME1 +NAME1(lzo1y_decompress_asm): +#endif +#ifdef NAME2 +NAME2(lzo1y_decompress_asm): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,35 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138 @@ -76,5 +91,9 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0 -size(_lzo1y_decompress_asm,.-_lzo1y_decompress_asm) -size(F(lzo1y_decompress_asm),.-F(lzo1y_decompress_asm)) +#ifdef NAME1 +sizef(NAME1(lzo1y_decompress_asm),.-NAME1(lzo1y_decompress_asm)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1y_decompress_asm),.-NAME2(lzo1y_decompress_asm)) +#endif diff --git a/lzo/asm/i386/src_gas/lzo1y_s2.S b/lzo/asm/i386/src_gas/lzo1y_s2.S index 6682c490..4da81a3c 100644 --- a/lzo/asm/i386/src_gas/lzo1y_s2.S +++ b/lzo/asm/i386/src_gas/lzo1y_s2.S @@ -2,6 +2,9 @@ This file is part of the LZO real-time data compression library. + Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -35,17 +38,29 @@ Markus F.X.J. Oberhumer <markus@oberhumer.com> http://www.oberhumer.com/opensource/lzo/ -*/ + */ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ #include "asminit.def" -typef(_lzo1y_decompress_asm_safe) -typef(F(lzo1y_decompress_asm_safe)) -global(_lzo1y_decompress_asm_safe) -global(F(lzo1y_decompress_asm_safe)) -_lzo1y_decompress_asm_safe: -F(lzo1y_decompress_asm_safe): +#ifdef NAME1 +typef(NAME1(lzo1y_decompress_asm_safe)) +#endif +#ifdef NAME2 +typef(NAME2(lzo1y_decompress_asm_safe)) +#endif +#ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_safe)) +#endif +#ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_safe)) +#endif +#ifdef NAME1 +NAME1(lzo1y_decompress_asm_safe): +#endif +#ifdef NAME2 +NAME2(lzo1y_decompress_asm_safe): +#endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -92,5 +107,9 @@ db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89 db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0 db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235 db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0 -size(_lzo1y_decompress_asm_safe,.-_lzo1y_decompress_asm_safe) -size(F(lzo1y_decompress_asm_safe),.-F(lzo1y_decompress_asm_safe)) +#ifdef NAME1 +sizef(NAME1(lzo1y_decompress_asm_safe),.-NAME1(lzo1y_decompress_asm_safe)) +#endif +#ifdef NAME2 +sizef(NAME2(lzo1y_decompress_asm_safe),.-NAME2(lzo1y_decompress_asm_safe)) +#endif diff --git a/lzo/asm/i386/src_masm/all/asm_all.asm b/lzo/asm/i386/src_masm/all/asm_all.asm index e45522c0..ae982219 100644 --- a/lzo/asm/i386/src_masm/all/asm_all.asm +++ b/lzo/asm/i386/src_masm/all/asm_all.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/asminit.def b/lzo/asm/i386/src_masm/asminit.def index 9cfb7a9e..df0455f3 100644 --- a/lzo/asm/i386/src_masm/asminit.def +++ b/lzo/asm/i386/src_masm/asminit.def @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1c_s1.asm b/lzo/asm/i386/src_masm/lzo1c_s1.asm index 88e816a5..38910181 100644 --- a/lzo/asm/i386/src_masm/lzo1c_s1.asm +++ b/lzo/asm/i386/src_masm/lzo1c_s1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1c_s2.asm b/lzo/asm/i386/src_masm/lzo1c_s2.asm index 9ecc0734..08dfb401 100644 --- a/lzo/asm/i386/src_masm/lzo1c_s2.asm +++ b/lzo/asm/i386/src_masm/lzo1c_s2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1f_f1.asm b/lzo/asm/i386/src_masm/lzo1f_f1.asm index eba922ee..5a24d791 100644 --- a/lzo/asm/i386/src_masm/lzo1f_f1.asm +++ b/lzo/asm/i386/src_masm/lzo1f_f1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1f_f2.asm b/lzo/asm/i386/src_masm/lzo1f_f2.asm index f9e7d106..7ec00573 100644 --- a/lzo/asm/i386/src_masm/lzo1f_f2.asm +++ b/lzo/asm/i386/src_masm/lzo1f_f2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1x_f1.asm b/lzo/asm/i386/src_masm/lzo1x_f1.asm index 29ce326a..62fe70da 100644 --- a/lzo/asm/i386/src_masm/lzo1x_f1.asm +++ b/lzo/asm/i386/src_masm/lzo1x_f1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1x_f2.asm b/lzo/asm/i386/src_masm/lzo1x_f2.asm index 1c9e9202..5994e2de 100644 --- a/lzo/asm/i386/src_masm/lzo1x_f2.asm +++ b/lzo/asm/i386/src_masm/lzo1x_f2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1x_s1.asm b/lzo/asm/i386/src_masm/lzo1x_s1.asm index b1060fe0..58edebc1 100644 --- a/lzo/asm/i386/src_masm/lzo1x_s1.asm +++ b/lzo/asm/i386/src_masm/lzo1x_s1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1x_s2.asm b/lzo/asm/i386/src_masm/lzo1x_s2.asm index 68f074e9..7316e55b 100644 --- a/lzo/asm/i386/src_masm/lzo1x_s2.asm +++ b/lzo/asm/i386/src_masm/lzo1x_s2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1y_f1.asm b/lzo/asm/i386/src_masm/lzo1y_f1.asm index 278d7450..8ef5c407 100644 --- a/lzo/asm/i386/src_masm/lzo1y_f1.asm +++ b/lzo/asm/i386/src_masm/lzo1y_f1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1y_f2.asm b/lzo/asm/i386/src_masm/lzo1y_f2.asm index 5e75a387..daf67e5a 100644 --- a/lzo/asm/i386/src_masm/lzo1y_f2.asm +++ b/lzo/asm/i386/src_masm/lzo1y_f2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1y_s1.asm b/lzo/asm/i386/src_masm/lzo1y_s1.asm index 87c46a6a..18afd548 100644 --- a/lzo/asm/i386/src_masm/lzo1y_s1.asm +++ b/lzo/asm/i386/src_masm/lzo1y_s1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_masm/lzo1y_s2.asm b/lzo/asm/i386/src_masm/lzo1y_s2.asm index 59989670..c7ac80e2 100644 --- a/lzo/asm/i386/src_masm/lzo1y_s2.asm +++ b/lzo/asm/i386/src_masm/lzo1y_s2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer diff --git a/lzo/asm/i386/src_nasm/all/asm_all.asm b/lzo/asm/i386/src_nasm/all/asm_all.asm index e37965aa..2751256a 100644 --- a/lzo/asm/i386/src_nasm/all/asm_all.asm +++ b/lzo/asm/i386/src_nasm/all/asm_all.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -39,26 +42,56 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ -%define F(name) name +%ifidni __OUTPUT_FORMAT__,macho +%define NAME1(x) _ %+ x +%elifidni __OUTPUT_FORMAT__,macho32 +%define NAME1(x) _ %+ x +%elifidni __OUTPUT_FORMAT__,macho64 +%define NAME1(x) _ %+ x +%else +%define NAME1(x) _ %+ x +%define NAME2(x) x +%endif %ifidni __OUTPUT_FORMAT__,elf -%define globalf(x) global x:function +%define globalf(x) global x:function (x %+ _end - x) +%define globalf_end(x) x %+ _end: +%elifidni __OUTPUT_FORMAT__,elf32 +%define globalf(x) global x:function (x %+ _end - x) +%define globalf_end(x) x %+ _end: +%elifidni __OUTPUT_FORMAT__,elf64 +%define globalf(x) global x:function (x %+ _end - x) +%define globalf_end(x) x %+ _end: %else -%define globalf(x) global x +%define globalf(x) global x +%define globalf_end(x) %endif bits 32 %ifidni __OUTPUT_FORMAT__,elf section .note.GNU-stack noalloc noexec nowrite progbits +%elifidni __OUTPUT_FORMAT__,elf32 +section .note.GNU-stack noalloc noexec nowrite progbits +%elifidni __OUTPUT_FORMAT__,elf64 +section .note.GNU-stack noalloc noexec nowrite progbits %endif %ifidni __OUTPUT_FORMAT__,obj segment _TEXT class=CODE public use32 flat align=16 %else section .text %endif +align 16 -globalf(_lzo1c_decompress_asm) -globalf(F(lzo1c_decompress_asm)) -_lzo1c_decompress_asm: -F(lzo1c_decompress_asm): +%ifdef NAME1 +globalf(NAME1(lzo1c_decompress_asm)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1c_decompress_asm)) +%endif +%ifdef NAME1 +NAME1(lzo1c_decompress_asm): +%endif +%ifdef NAME2 +NAME2(lzo1c_decompress_asm): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,144,49,192,138,6,70,60,32,115 db 15,8,192,116,51,137,193,243,164,138,6,70,60,32,114,72 @@ -77,11 +110,25 @@ db 149,192,139,84,36,40,3,84,36,44,57,214,119,38,114,29 db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90 db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0 db 0,0,235,220,184,4,0,0,0,235,213,144,141,116,38,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1c_decompress_asm)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1c_decompress_asm)) +%endif -globalf(_lzo1c_decompress_asm_safe) -globalf(F(lzo1c_decompress_asm_safe)) -_lzo1c_decompress_asm_safe: -F(lzo1c_decompress_asm_safe): +%ifdef NAME1 +globalf(NAME1(lzo1c_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1c_decompress_asm_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1c_decompress_asm_safe): +%endif +%ifdef NAME2 +NAME2(lzo1c_decompress_asm_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0 @@ -111,11 +158,25 @@ db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93 db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184 db 4,0,0,0,235,213,184,5,0,0,0,235,206,184,6,0 db 0,0,235,199,141,182,0,0,0,0,141,191,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1c_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1c_decompress_asm_safe)) +%endif -globalf(_lzo1f_decompress_asm_fast) -globalf(F(lzo1f_decompress_asm_fast)) -_lzo1f_decompress_asm_fast: -F(lzo1f_decompress_asm_fast): +%ifdef NAME1 +globalf(NAME1(lzo1f_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1f_decompress_asm_fast)) +%endif +%ifdef NAME1 +NAME1(lzo1f_decompress_asm_fast): +%endif +%ifdef NAME2 +NAME2(lzo1f_decompress_asm_fast): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,144,49,192,138,6,70,60,31,119 db 51,8,192,137,193,117,19,138,6,70,8,192,117,8,129,193 @@ -136,11 +197,25 @@ db 40,3,84,36,44,57,214,119,38,114,29,43,124,36,48,139 db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93 db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184 db 4,0,0,0,235,213,141,118,0,141,188,39,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1f_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1f_decompress_asm_fast)) +%endif -globalf(_lzo1f_decompress_asm_fast_safe) -globalf(F(lzo1f_decompress_asm_fast_safe)) -_lzo1f_decompress_asm_fast_safe: -F(lzo1f_decompress_asm_fast_safe): +%ifdef NAME1 +globalf(NAME1(lzo1f_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1f_decompress_asm_fast_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1f_decompress_asm_fast_safe): +%endif +%ifdef NAME2 +NAME2(lzo1f_decompress_asm_fast_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0 @@ -168,11 +243,25 @@ db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90 db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0 db 0,0,235,220,184,4,0,0,0,235,213,184,5,0,0,0 db 235,206,184,6,0,0,0,235,199,141,180,38,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1f_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1f_decompress_asm_fast_safe)) +%endif -globalf(_lzo1x_decompress_asm_fast) -globalf(F(lzo1x_decompress_asm_fast)) -_lzo1x_decompress_asm_fast: -F(lzo1x_decompress_asm_fast): +%ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_fast)) +%endif +%ifdef NAME1 +NAME1(lzo1x_decompress_asm_fast): +%endif +%ifdef NAME2 +NAME2(lzo1x_decompress_asm_fast): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,27 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244 @@ -201,11 +290,25 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144 +%ifdef NAME1 +globalf_end(NAME1(lzo1x_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1x_decompress_asm_fast)) +%endif -globalf(_lzo1x_decompress_asm_fast_safe) -globalf(F(lzo1x_decompress_asm_fast_safe)) -_lzo1x_decompress_asm_fast_safe: -F(lzo1x_decompress_asm_fast_safe): +%ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_fast_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1x_decompress_asm_fast_safe): +%endif +%ifdef NAME2 +NAME2(lzo1x_decompress_asm_fast_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -249,11 +352,25 @@ db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137 db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0 db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0 db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199 +%ifdef NAME1 +globalf_end(NAME1(lzo1x_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1x_decompress_asm_fast_safe)) +%endif -globalf(_lzo1x_decompress_asm) -globalf(F(lzo1x_decompress_asm)) -_lzo1x_decompress_asm: -F(lzo1x_decompress_asm): +%ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm)) +%endif +%ifdef NAME1 +NAME1(lzo1x_decompress_asm): +%endif +%ifdef NAME2 +NAME2(lzo1x_decompress_asm): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,35 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138 @@ -284,11 +401,25 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1x_decompress_asm)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1x_decompress_asm)) +%endif -globalf(_lzo1x_decompress_asm_safe) -globalf(F(lzo1x_decompress_asm_safe)) -_lzo1x_decompress_asm_safe: -F(lzo1x_decompress_asm_safe): +%ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1x_decompress_asm_safe): +%endif +%ifdef NAME2 +NAME2(lzo1x_decompress_asm_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -335,11 +466,25 @@ db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89 db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0 db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235 db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1x_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1x_decompress_asm_safe)) +%endif -globalf(_lzo1y_decompress_asm_fast) -globalf(F(lzo1y_decompress_asm_fast)) -_lzo1y_decompress_asm_fast: -F(lzo1y_decompress_asm_fast): +%ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_fast)) +%endif +%ifdef NAME1 +NAME1(lzo1y_decompress_asm_fast): +%endif +%ifdef NAME2 +NAME2(lzo1y_decompress_asm_fast): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,27 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244 @@ -368,11 +513,25 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144 +%ifdef NAME1 +globalf_end(NAME1(lzo1y_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1y_decompress_asm_fast)) +%endif -globalf(_lzo1y_decompress_asm_fast_safe) -globalf(F(lzo1y_decompress_asm_fast_safe)) -_lzo1y_decompress_asm_fast_safe: -F(lzo1y_decompress_asm_fast_safe): +%ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_fast_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1y_decompress_asm_fast_safe): +%endif +%ifdef NAME2 +NAME2(lzo1y_decompress_asm_fast_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -416,11 +575,25 @@ db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137 db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0 db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0 db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199 +%ifdef NAME1 +globalf_end(NAME1(lzo1y_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1y_decompress_asm_fast_safe)) +%endif -globalf(_lzo1y_decompress_asm) -globalf(F(lzo1y_decompress_asm)) -_lzo1y_decompress_asm: -F(lzo1y_decompress_asm): +%ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm)) +%endif +%ifdef NAME1 +NAME1(lzo1y_decompress_asm): +%endif +%ifdef NAME2 +NAME2(lzo1y_decompress_asm): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,35 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138 @@ -451,11 +624,25 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1y_decompress_asm)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1y_decompress_asm)) +%endif -globalf(_lzo1y_decompress_asm_safe) -globalf(F(lzo1y_decompress_asm_safe)) -_lzo1y_decompress_asm_safe: -F(lzo1y_decompress_asm_safe): +%ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1y_decompress_asm_safe): +%endif +%ifdef NAME2 +NAME2(lzo1y_decompress_asm_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -502,4 +689,10 @@ db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89 db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0 db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235 db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1y_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1y_decompress_asm_safe)) +%endif diff --git a/lzo/asm/i386/src_nasm/asminit.def b/lzo/asm/i386/src_nasm/asminit.def index 6942a816..3f2e0d6e 100644 --- a/lzo/asm/i386/src_nasm/asminit.def +++ b/lzo/asm/i386/src_nasm/asminit.def @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -37,19 +40,42 @@ ; http://www.oberhumer.com/opensource/lzo/ ; -%define F(name) name +%ifidni __OUTPUT_FORMAT__,macho +%define NAME1(x) _ %+ x +%elifidni __OUTPUT_FORMAT__,macho32 +%define NAME1(x) _ %+ x +%elifidni __OUTPUT_FORMAT__,macho64 +%define NAME1(x) _ %+ x +%else +%define NAME1(x) _ %+ x +%define NAME2(x) x +%endif + %ifidni __OUTPUT_FORMAT__,elf -%define globalf(x) global x:function +%define globalf(x) global x:function (x %+ _end - x) +%define globalf_end(x) x %+ _end: +%elifidni __OUTPUT_FORMAT__,elf32 +%define globalf(x) global x:function (x %+ _end - x) +%define globalf_end(x) x %+ _end: +%elifidni __OUTPUT_FORMAT__,elf64 +%define globalf(x) global x:function (x %+ _end - x) +%define globalf_end(x) x %+ _end: %else -%define globalf(x) global x +%define globalf(x) global x +%define globalf_end(x) %endif bits 32 %ifidni __OUTPUT_FORMAT__,elf section .note.GNU-stack noalloc noexec nowrite progbits +%elifidni __OUTPUT_FORMAT__,elf32 +section .note.GNU-stack noalloc noexec nowrite progbits +%elifidni __OUTPUT_FORMAT__,elf64 +section .note.GNU-stack noalloc noexec nowrite progbits %endif %ifidni __OUTPUT_FORMAT__,obj segment _TEXT class=CODE public use32 flat align=16 %else section .text %endif +align 16 diff --git a/lzo/asm/i386/src_nasm/lzo1c_s1.asm b/lzo/asm/i386/src_nasm/lzo1c_s1.asm index b693a592..c9bb264a 100644 --- a/lzo/asm/i386/src_nasm/lzo1c_s1.asm +++ b/lzo/asm/i386/src_nasm/lzo1c_s1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1c_decompress_asm) -globalf(F(lzo1c_decompress_asm)) -_lzo1c_decompress_asm: -F(lzo1c_decompress_asm): +%ifdef NAME1 +globalf(NAME1(lzo1c_decompress_asm)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1c_decompress_asm)) +%endif +%ifdef NAME1 +NAME1(lzo1c_decompress_asm): +%endif +%ifdef NAME2 +NAME2(lzo1c_decompress_asm): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,144,49,192,138,6,70,60,32,115 db 15,8,192,116,51,137,193,243,164,138,6,70,60,32,114,72 @@ -62,3 +73,9 @@ db 149,192,139,84,36,40,3,84,36,44,57,214,119,38,114,29 db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90 db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0 db 0,0,235,220,184,4,0,0,0,235,213,144,141,116,38,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1c_decompress_asm)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1c_decompress_asm)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1c_s2.asm b/lzo/asm/i386/src_nasm/lzo1c_s2.asm index addc8ae0..89fa7367 100644 --- a/lzo/asm/i386/src_nasm/lzo1c_s2.asm +++ b/lzo/asm/i386/src_nasm/lzo1c_s2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1c_decompress_asm_safe) -globalf(F(lzo1c_decompress_asm_safe)) -_lzo1c_decompress_asm_safe: -F(lzo1c_decompress_asm_safe): +%ifdef NAME1 +globalf(NAME1(lzo1c_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1c_decompress_asm_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1c_decompress_asm_safe): +%endif +%ifdef NAME2 +NAME2(lzo1c_decompress_asm_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0 @@ -73,3 +84,9 @@ db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93 db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184 db 4,0,0,0,235,213,184,5,0,0,0,235,206,184,6,0 db 0,0,235,199,141,182,0,0,0,0,141,191,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1c_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1c_decompress_asm_safe)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1f_f1.asm b/lzo/asm/i386/src_nasm/lzo1f_f1.asm index 51b4d960..cdbaade2 100644 --- a/lzo/asm/i386/src_nasm/lzo1f_f1.asm +++ b/lzo/asm/i386/src_nasm/lzo1f_f1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1f_decompress_asm_fast) -globalf(F(lzo1f_decompress_asm_fast)) -_lzo1f_decompress_asm_fast: -F(lzo1f_decompress_asm_fast): +%ifdef NAME1 +globalf(NAME1(lzo1f_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1f_decompress_asm_fast)) +%endif +%ifdef NAME1 +NAME1(lzo1f_decompress_asm_fast): +%endif +%ifdef NAME2 +NAME2(lzo1f_decompress_asm_fast): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,144,49,192,138,6,70,60,31,119 db 51,8,192,137,193,117,19,138,6,70,8,192,117,8,129,193 @@ -64,3 +75,9 @@ db 40,3,84,36,44,57,214,119,38,114,29,43,124,36,48,139 db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93 db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184 db 4,0,0,0,235,213,141,118,0,141,188,39,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1f_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1f_decompress_asm_fast)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1f_f2.asm b/lzo/asm/i386/src_nasm/lzo1f_f2.asm index e0de4298..70d6f36b 100644 --- a/lzo/asm/i386/src_nasm/lzo1f_f2.asm +++ b/lzo/asm/i386/src_nasm/lzo1f_f2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1f_decompress_asm_fast_safe) -globalf(F(lzo1f_decompress_asm_fast_safe)) -_lzo1f_decompress_asm_fast_safe: -F(lzo1f_decompress_asm_fast_safe): +%ifdef NAME1 +globalf(NAME1(lzo1f_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1f_decompress_asm_fast_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1f_decompress_asm_fast_safe): +%endif +%ifdef NAME2 +NAME2(lzo1f_decompress_asm_fast_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0 @@ -71,3 +82,9 @@ db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90 db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0 db 0,0,235,220,184,4,0,0,0,235,213,184,5,0,0,0 db 235,206,184,6,0,0,0,235,199,141,180,38,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1f_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1f_decompress_asm_fast_safe)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1x_f1.asm b/lzo/asm/i386/src_nasm/lzo1x_f1.asm index 23a18feb..a54585fa 100644 --- a/lzo/asm/i386/src_nasm/lzo1x_f1.asm +++ b/lzo/asm/i386/src_nasm/lzo1x_f1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1x_decompress_asm_fast) -globalf(F(lzo1x_decompress_asm_fast)) -_lzo1x_decompress_asm_fast: -F(lzo1x_decompress_asm_fast): +%ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_fast)) +%endif +%ifdef NAME1 +NAME1(lzo1x_decompress_asm_fast): +%endif +%ifdef NAME2 +NAME2(lzo1x_decompress_asm_fast): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,27 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244 @@ -72,3 +83,9 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144 +%ifdef NAME1 +globalf_end(NAME1(lzo1x_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1x_decompress_asm_fast)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1x_f2.asm b/lzo/asm/i386/src_nasm/lzo1x_f2.asm index e41de81e..ada1b886 100644 --- a/lzo/asm/i386/src_nasm/lzo1x_f2.asm +++ b/lzo/asm/i386/src_nasm/lzo1x_f2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1x_decompress_asm_fast_safe) -globalf(F(lzo1x_decompress_asm_fast_safe)) -_lzo1x_decompress_asm_fast_safe: -F(lzo1x_decompress_asm_fast_safe): +%ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_fast_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1x_decompress_asm_fast_safe): +%endif +%ifdef NAME2 +NAME2(lzo1x_decompress_asm_fast_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -87,3 +98,9 @@ db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137 db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0 db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0 db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199 +%ifdef NAME1 +globalf_end(NAME1(lzo1x_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1x_decompress_asm_fast_safe)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1x_s1.asm b/lzo/asm/i386/src_nasm/lzo1x_s1.asm index f41f7f91..00d4f4e6 100644 --- a/lzo/asm/i386/src_nasm/lzo1x_s1.asm +++ b/lzo/asm/i386/src_nasm/lzo1x_s1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1x_decompress_asm) -globalf(F(lzo1x_decompress_asm)) -_lzo1x_decompress_asm: -F(lzo1x_decompress_asm): +%ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm)) +%endif +%ifdef NAME1 +NAME1(lzo1x_decompress_asm): +%endif +%ifdef NAME2 +NAME2(lzo1x_decompress_asm): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,35 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138 @@ -74,3 +85,9 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1x_decompress_asm)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1x_decompress_asm)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1x_s2.asm b/lzo/asm/i386/src_nasm/lzo1x_s2.asm index 7b3acc4f..5c655583 100644 --- a/lzo/asm/i386/src_nasm/lzo1x_s2.asm +++ b/lzo/asm/i386/src_nasm/lzo1x_s2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1x_decompress_asm_safe) -globalf(F(lzo1x_decompress_asm_safe)) -_lzo1x_decompress_asm_safe: -F(lzo1x_decompress_asm_safe): +%ifdef NAME1 +globalf(NAME1(lzo1x_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1x_decompress_asm_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1x_decompress_asm_safe): +%endif +%ifdef NAME2 +NAME2(lzo1x_decompress_asm_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -90,3 +101,9 @@ db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89 db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0 db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235 db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1x_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1x_decompress_asm_safe)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1y_f1.asm b/lzo/asm/i386/src_nasm/lzo1y_f1.asm index c423de3a..1c42cda8 100644 --- a/lzo/asm/i386/src_nasm/lzo1y_f1.asm +++ b/lzo/asm/i386/src_nasm/lzo1y_f1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1y_decompress_asm_fast) -globalf(F(lzo1y_decompress_asm_fast)) -_lzo1y_decompress_asm_fast: -F(lzo1y_decompress_asm_fast): +%ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_fast)) +%endif +%ifdef NAME1 +NAME1(lzo1y_decompress_asm_fast): +%endif +%ifdef NAME2 +NAME2(lzo1y_decompress_asm_fast): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,27 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244 @@ -72,3 +83,9 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144 +%ifdef NAME1 +globalf_end(NAME1(lzo1y_decompress_asm_fast)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1y_decompress_asm_fast)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1y_f2.asm b/lzo/asm/i386/src_nasm/lzo1y_f2.asm index 38644444..9e6b37c5 100644 --- a/lzo/asm/i386/src_nasm/lzo1y_f2.asm +++ b/lzo/asm/i386/src_nasm/lzo1y_f2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1y_decompress_asm_fast_safe) -globalf(F(lzo1y_decompress_asm_fast_safe)) -_lzo1y_decompress_asm_fast_safe: -F(lzo1y_decompress_asm_fast_safe): +%ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_fast_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1y_decompress_asm_fast_safe): +%endif +%ifdef NAME2 +NAME2(lzo1y_decompress_asm_fast_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -87,3 +98,9 @@ db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137 db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0 db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0 db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199 +%ifdef NAME1 +globalf_end(NAME1(lzo1y_decompress_asm_fast_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1y_decompress_asm_fast_safe)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1y_s1.asm b/lzo/asm/i386/src_nasm/lzo1y_s1.asm index 902f5a93..f7e42782 100644 --- a/lzo/asm/i386/src_nasm/lzo1y_s1.asm +++ b/lzo/asm/i386/src_nasm/lzo1y_s1.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1y_decompress_asm) -globalf(F(lzo1y_decompress_asm)) -_lzo1y_decompress_asm: -F(lzo1y_decompress_asm): +%ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm)) +%endif +%ifdef NAME1 +NAME1(lzo1y_decompress_asm): +%endif +%ifdef NAME2 +NAME2(lzo1y_decompress_asm): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,49,192,49,219,172,60,17,118,35 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138 @@ -74,3 +85,9 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1y_decompress_asm)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1y_decompress_asm)) +%endif diff --git a/lzo/asm/i386/src_nasm/lzo1y_s2.asm b/lzo/asm/i386/src_nasm/lzo1y_s2.asm index 72224e8c..065508cb 100644 --- a/lzo/asm/i386/src_nasm/lzo1y_s2.asm +++ b/lzo/asm/i386/src_nasm/lzo1y_s2.asm @@ -2,6 +2,9 @@ ; ; This file is part of the LZO real-time data compression library. ; +; Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer ; Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer @@ -40,10 +43,18 @@ ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ %include "asminit.def" -globalf(_lzo1y_decompress_asm_safe) -globalf(F(lzo1y_decompress_asm_safe)) -_lzo1y_decompress_asm_safe: -F(lzo1y_decompress_asm_safe): +%ifdef NAME1 +globalf(NAME1(lzo1y_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf(NAME2(lzo1y_decompress_asm_safe)) +%endif +%ifdef NAME1 +NAME1(lzo1y_decompress_asm_safe): +%endif +%ifdef NAME2 +NAME2(lzo1y_decompress_asm_safe): +%endif db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124 db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68 db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49 @@ -90,3 +101,9 @@ db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89 db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0 db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235 db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0 +%ifdef NAME1 +globalf_end(NAME1(lzo1y_decompress_asm_safe)) +%endif +%ifdef NAME2 +globalf_end(NAME2(lzo1y_decompress_asm_safe)) +%endif |