diff options
| author | Eric Blossom <eb@comsec.com> | 2010-12-21 13:31:58 -0800 |
|---|---|---|
| committer | Eric Blossom <eb@comsec.com> | 2010-12-21 13:31:58 -0800 |
| commit | 75b650ef2506fe5c607517a3d5188b0705f60fde (patch) | |
| tree | 99cb6fd6adc3e91edc832cbaee236d2fe30fa3fd /volk/lib/assembly.h | |
| parent | 1984aab345857296564e174395cf3af1375e1469 (diff) | |
| parent | ed78ba5d9999bbe50507373a1aa2877ef0da64c6 (diff) | |
Merge branch 'next' into guile.
Passes distcheck.
* next: (32 commits)
volk: Fix for popcnt's 64/32-bit issues.
Using a copy of config.guess and config.sub instead of sym links.
Including time header to qa files.
Changed python env variable to more globally usable version.
gr_uhd: Quick fix for make distcheck failures if UHD is not installed.
PFB resampler: fix it this way to avoid the signed/unsigned warning.
PFB resampler: fixes bug where filter could be looking past the number of inputs.
resampler PFB: Sets relative rate when rate is changed.
Create method to set rate on pfb_arb_resamp after it has been created. Allow it to be called from GRC.
volk: fix for running 32-bit OS on 64-bit processor. System is correctly identified as 32-bit and compiles with the correct flags.
volk: changing the path variables again. This works on my various systems tested. Using abs_ path names failed on Ubuntu 8.04 32-bit.
volk: May be a hack, but it was required for my 32-bit Fedora 13 to work.
volk: Removing unnecessary shell script; last commit takes care if its functions.
volk: Fixing build system to handle making volk_mktables, volk_tables.h, and volk_config.h instead of a standalone shell script.
volk: readding 16sc_magnitude_32f_sse with fix for SSE hadd_ps error.
volk: Adding a few more generic-only test cases.
volk: adding generic QA test for 16sc_magnitude_32f.
volk: modified the configure scripts to output which architectures it will be building based on the configure tests.
uhd: update notes in grc blocks for addressing scheme
volk: Removing erroneous SSE function that actually usese an SSE3 intrin (mm_hadd_ps).
...
Diffstat (limited to 'volk/lib/assembly.h')
| -rw-r--r-- | volk/lib/assembly.h | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/volk/lib/assembly.h b/volk/lib/assembly.h new file mode 100644 index 0000000000..8a99aa07c5 --- /dev/null +++ b/volk/lib/assembly.h @@ -0,0 +1,67 @@ +/* -*- c++ -*- */ +/* + * Copyright 2002 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef _ASSEMBLY_H_ +#define _ASSEMBLY_H_ + +#if defined (__APPLE__) && defined (__APPLE_CC__) + +// XCode ignores the .scl and .type functions in XCode 2.2.1 and 2.3, +// but creates an error in XCode 2.4. Just ignore them. + +#define GLOB_SYMB(f) _ ## f + +#define DEF_FUNC_HEAD(f) /* none */ + +#define FUNC_TAIL(f) /* none*/ + +#elif !defined (__ELF__) + +/* + * Too bad, the following define does not work as expected --SF + * #define GLOB_SYMB(f) __USER_LABEL_PREFIX__ ## f + */ +#define GLOB_SYMB(f) _ ## f + +#define DEF_FUNC_HEAD(f) \ + .def GLOB_SYMB(f); .scl 2; .type 32; .endef + +#define FUNC_TAIL(f) /* none */ + + +#else /* !__ELF__ */ + + +#define GLOB_SYMB(f) f + +#define DEF_FUNC_HEAD(f) \ + .type GLOB_SYMB(f),@function \ + +#define FUNC_TAIL(f) \ + .Lfe1: \ + .size GLOB_SYMB(f),.Lfe1-GLOB_SYMB(f) + + +#endif /* !__ELF__ */ + + +#endif /* _ASSEMBLY_H_ */ |