diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-06-26 12:59:11 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-06-26 17:05:36 +1000 |
| commit | 7a8f3591d6c0b54c5848b526c419f89eb8b576e7 (patch) | |
| tree | 59d6b0f1ef79e8e6746f9f49d6b6a6a8396723f5 /src/libFLAC/include/private | |
| parent | 936e968c3a6baf1ddfb082721b5fec5d540586e6 (diff) | |
| download | flac-7a8f3591d6c0b54c5848b526c419f89eb8b576e7.tar.gz | |
libFLAC/cpu.c: More cleanup and refactoring
* Split `FLAC__cpu_info` into CPU specific functions. We now have
`ia32_cpi_info` and `x86_64_cpu_info` and a simple obvious way
to add support for other CPUs.
* Improve handling of Android OS.
* Remove more #ifdefs where possible.
* Compile (syntax and type check) DEBUG output code even when debugging
is disabled.
* Remove build support for ancient NetBSD version 1.5 (version 1.6 was
released in 2002).
Diffstat (limited to 'src/libFLAC/include/private')
| -rw-r--r-- | src/libFLAC/include/private/cpu.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libFLAC/include/private/cpu.h b/src/libFLAC/include/private/cpu.h index b1266aef..3ac3a790 100644 --- a/src/libFLAC/include/private/cpu.h +++ b/src/libFLAC/include/private/cpu.h @@ -177,14 +177,10 @@ typedef struct { void FLAC__cpu_info(FLAC__CPUInfo *info); -#ifndef FLAC__NO_ASM -# if defined FLAC__CPU_IA32 && defined FLAC__HAS_NASM FLAC__uint32 FLAC__cpu_have_cpuid_asm_ia32(void); + void FLAC__cpu_info_asm_ia32(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx); -# endif -# if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN + void FLAC__cpu_info_x86(FLAC__uint32 level, FLAC__uint32 *eax, FLAC__uint32 *ebx, FLAC__uint32 *ecx, FLAC__uint32 *edx); -# endif -#endif #endif |