From 42cd76b35fbb4381dcd8edcbe540f8ebfe651bf9 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sat, 9 Apr 2016 12:43:22 +0200 Subject: tests: remove any system specific code of ecore This was causing issues with certain builds and was not used for the purpose of testing. --- tests/suite/ecore/src/include/eina_file.h | 6 +++- tests/suite/ecore/src/lib/eina_cpu.c | 54 ------------------------------- 2 files changed, 5 insertions(+), 55 deletions(-) (limited to 'tests') diff --git a/tests/suite/ecore/src/include/eina_file.h b/tests/suite/ecore/src/include/eina_file.h index 40fb4c4adf..b30bf9682b 100644 --- a/tests/suite/ecore/src/include/eina_file.h +++ b/tests/suite/ecore/src/include/eina_file.h @@ -51,6 +51,10 @@ typedef struct _Eina_File_Direct_Info Eina_File_Direct_Info; typedef void (*Eina_File_Dir_List_Cb) (const char *name, const char *path, void *data); +#ifndef _POSIX_PATH_MAX +# define _POSIX_PATH_MAX 256 +#endif + /** * @struct _Eina_File_Direct_Info * A structure to store informations of a path. @@ -62,7 +66,7 @@ struct _Eina_File_Direct_Info { /**< size of the filename/basename component */ size_t name_start; /**< where the filename/basename component starts */ - char path[PATH_MAX]; + char path[_POSIX_PATH_MAX]; /**< the path */ const struct dirent *dirent; /**< the dirent structure of the path */ diff --git a/tests/suite/ecore/src/lib/eina_cpu.c b/tests/suite/ecore/src/lib/eina_cpu.c index ab8686fa2d..bb99f7d8e8 100644 --- a/tests/suite/ecore/src/lib/eina_cpu.c +++ b/tests/suite/ecore/src/lib/eina_cpu.c @@ -54,57 +54,6 @@ *============================================================================*/ /* FIXME this ifdefs should be replaced */ -#if defined(__i386__) || defined(__x86_64__) -/* We save ebx and restore it to be PIC compatible */ -static inline void _x86_cpuid(int op, int *a, int *b, int *c, int *d) -{ - asm volatile ( -#if defined(__x86_64__) - "pushq %%rbx \n\t" /* save %ebx */ -#else - "pushl %%ebx \n\t" /* save %ebx */ -#endif - "cpuid \n\t" "movl %%ebx, %1 \n\t" /* save what cpuid just put in %ebx */ -#if defined(__x86_64__) - "popq %%rbx \n\t" /* restore the old %ebx */ -#else - "popl %%ebx \n\t" /* restore the old %ebx */ -#endif - :"=a" (*a), "=r"(*b), "=c"(*c), "=d"(*d) - :"a"(op) - :"cc"); -} - -static -void _x86_simd(Eina_Cpu_Features * features) -{ - int a, b, c, d; - - _x86_cpuid(1, &a, &b, &c, &d); - /* - * edx - * 18 = PN (Processor Number) - * 19 = CLFlush (Cache Line Flush) - * 23 = MMX - * 25 = SSE - * 26 = SSE2 - * 28 = HTT (Hyper Threading) - * ecx - * 0 = SSE3 - */ - if ((d >> 23) & 1) - *features |= EINA_CPU_MMX; - - if ((d >> 25) & 1) - *features |= EINA_CPU_SSE; - - if ((d >> 26) & 1) - *features |= EINA_CPU_SSE2; - - if (c & 1) - *features |= EINA_CPU_SSE3; -} -#endif /*============================================================================* * Global * @@ -124,9 +73,6 @@ void _x86_simd(Eina_Cpu_Features * features) EAPI Eina_Cpu_Features eina_cpu_features_get(void) { Eina_Cpu_Features ecf = 0; -#if defined(__i386__) || defined(__x86_64__) - _x86_simd(&ecf); -#endif return ecf; } -- cgit v1.2.1