Revert "Move cpu_features to libretro-common"

This reverts commit 2b8ff3bf3844e20ba8021f1f40c3e59f64b69772.
2025-01-29 09:32:52 +00:00 · 2016-05-10 09:32:24 +02:00 · 2016-05-10 09:32:24 +02:00 · 35ea37b37f
commit 35ea37b37f
parent 2b8ff3bf38
24 changed files with 65 additions and 102 deletions
--- a/Makefile.common
+++ b/Makefile.common
@ -204,7 +204,7 @@ OBJ += frontend/frontend.o \
       movie.o \
       record/record_driver.o \
       record/drivers/record_null.o \
-       libretro-common/features/cpu_features.o \
+       performance.o \
       performance_counters.o \
       verbosity.o

--- a/audio/audio_dsp_filter.c
+++ b/audio/audio_dsp_filter.c
@ -23,13 +23,13 @@

 #include <file/file_path.h>
 #include <lists/dir_list.h>
-#include <features/cpu_features.h>

 #include "audio_dsp_filter.h"
 #include "audio_filters/dspfilter.h"

 #include "../config_file_userdata.h"
 #include "../frontend/frontend_driver.h"
+#include "../performance.h"
 #include "../performance_counters.h"
 #include "../dynamic.h"

--- a/audio/audio_resampler_driver.c
+++ b/audio/audio_resampler_driver.c
@ -17,11 +17,11 @@
 #include <string.h>

 #include <string/stdstring.h>
-#include <features/cpu_features.h>

 #include "audio_resampler_driver.h"
 #include "../config_file_userdata.h"
 #ifdef RARCH_INTERNAL
+#include "../performance.h"
 #include "../performance_counters.h"
 #endif
 #ifndef DONT_HAVE_STRING_LIST
--- a/audio/audio_utils.c
+++ b/audio/audio_utils.c
@ -23,9 +23,8 @@
 #include <altivec.h>
 #endif

-#include <features/cpu_features.h>
-
 #ifdef RARCH_INTERNAL
+#include "../performance.h"
 #include "../performance_counters.h"
 #endif

--- a/dynamic.c
+++ b/dynamic.c
@ -23,7 +23,6 @@
 #include <compat/posix_string.h>
 #include <dynamic/dylib.h>
 #include <string/stdstring.h>
-#include <features/cpu_features.h>
 #include <retro_assert.h>

 #ifdef HAVE_CONFIG_H
@ -39,6 +38,7 @@
 #include "record/record_driver.h"
 #include "core.h"
 #include "performance_counters.h"
+#include "performance.h"
 #include "system.h"
 #include "gfx/video_context_driver.h"

--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@ -25,7 +25,6 @@
 #endif

 #include <file/config_file.h>
-#include <features/cpu_features.h>

 #include "video_thread_wrapper.h"
 #include "../frontend/frontend_driver.h"
@ -34,6 +33,7 @@
 #include "../config.def.h"
 #include "../retroarch.h"
 #include "../runloop.h"
+#include "../performance.h"
 #include "../performance_counters.h"
 #include "../list_special.h"
 #include "../core.h"
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@ -19,12 +19,12 @@
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 #include <dynamic/dylib.h>
-#include <features/cpu_features.h>

 #include "../frontend/frontend_driver.h"
 #include "../config_file_userdata.h"
 #include "../dynamic.h"
 #include "../general.h"
+#include "../performance.h"
 #include "../performance_counters.h"
 #include "../verbosity.h"
 #include "video_filter.h"
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@ -19,11 +19,11 @@
 #include <limits.h>

 #include <rthreads/rthreads.h>
-#include <features/cpu_features.h>

 #include "video_thread_wrapper.h"
 #include "font_driver.h"
 #include "video_shader_driver.h"
+#include "../performance.h"
 #include "../performance_counters.h"
 #include "../runloop.h"
 #include "../verbosity.h"
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@ -62,7 +62,7 @@ ENCODINGS
 /*============================================================
 PERFORMANCE
 ============================================================ */
-#include "../libretro-common/features/cpu_features.c"
+#include "../performance.c"
 #include "../performance_counters.c"

 /*============================================================
--- a/libretro-common/formats/jpeg/rjpeg.c
+++ b/libretro-common/formats/jpeg/rjpeg.c
@ -1,25 +1,3 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rjpeg.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
 /* Modified version of stb_image's JPEG sources. 
 */

--- a/libretro-common/include/formats/image.h
+++ b/libretro-common/include/formats/image.h
@ -1,23 +1,17 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ * 
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
 *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (image.h).
- * ---------------------------------------------------------------------------------------
+ *  RetroArch 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.
 *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
 */

 #ifndef __RARCH_IMAGE_CONTEXT_H
--- a/libretro-common/include/formats/jsonsax.h
+++ b/libretro-common/include/formats/jsonsax.h
@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
+/* Copyright  (C) 2010-2015 The RetroArch team
 *
 * ---------------------------------------------------------------------------------------
 * The following license statement only applies to this file (jsonsax.h).
--- a/libretro-common/include/formats/rjpeg.h
+++ b/libretro-common/include/formats/rjpeg.h
@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
+/* Copyright  (C) 2010-2015 The RetroArch team
 *
 * ---------------------------------------------------------------------------------------
 * The following license statement only applies to this file (rjpeg.h).
--- a/libretro-common/include/formats/rpng.h
+++ b/libretro-common/include/formats/rpng.h
@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
+/* Copyright  (C) 2010-2015 The RetroArch team
 *
 * ---------------------------------------------------------------------------------------
 * The following license statement only applies to this file (rpng.h).
--- a/libretro-common/include/formats/rxml.h
+++ b/libretro-common/include/formats/rxml.h
@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
+/* Copyright  (C) 2010-2015 The RetroArch team
 *
 * ---------------------------------------------------------------------------------------
 * The following license statement only applies to this file (rxml.h).
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@ -18,8 +18,6 @@
 #include <compat/strl.h>
 #include <string/stdstring.h>

-#include <features/cpu_features.h>
-
 #include "menu_generic.h"

 #include "../menu_driver.h"
@ -30,6 +28,7 @@
 #include "../menu_entries.h"

 #include "../../configuration.h"
+#include "../../performance.h"
 #include "../../performance_counters.h"
 #include "../../input/input_autodetect.h"
 #include "../../input/input_config.h"
--- a/menu/menu_animation.c
+++ b/menu/menu_animation.c
@ -16,14 +16,13 @@

 #include <math.h>
 #include <string.h>
-
 #include <compat/strl.h>
 #include <encodings/utf.h>
 #include <retro_miscellaneous.h>
-#include <features/cpu_features.h>

 #include "menu_animation.h"
 #include "../configuration.h"
+#include "../performance.h"
 #include "../performance_counters.h"

 #define IDEAL_DELTA_TIME (1.0 / 60.0 * 1000000.0)
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <string.h>

-#include <features/cpu_features.h>
-
 #include "menu_driver.h"
 #include "menu_input.h"
 #include "menu_animation.h"
@ -41,6 +39,7 @@

 #include "../general.h"
 #include "../managers/cheat_manager.h"
+#include "../performance.h"
 #include "../performance_counters.h"
 #include "../core.h"
 #include "../input/input_joypad_driver.h"
--- a/network/net_http_special.c
+++ b/network/net_http_special.c
@ -17,8 +17,8 @@
 #include <stdlib.h>

 #include <net/net_http.h>
-#include <features/cpu_features.h>

+#include "../performance.h"
 #include "../performance_counters.h"
 #include "net_http_special.h"

--- a/libretro-common/features/cpu_features.c
+++ b/libretro-common/features/cpu_features.c
@ -1,29 +1,31 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
 *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (cpu_features.c).
- * ---------------------------------------------------------------------------------------
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
 *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *  RetroArch 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.
 *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
 */

 #include <stdio.h>
+#include "libretro.h"
+#include "performance.h"
+#include "general.h"
+#include "compat/strl.h"
+#include "verbosity.h"

-#include <compat/strl.h>
-#include <features/cpu_features.h>
+#ifdef _WIN32
+#define PERF_LOG_FMT "[PERF]: Avg (%s): %I64u ticks, %I64u runs.\n"
+#else
+#define PERF_LOG_FMT "[PERF]: Avg (%s): %llu ticks, %llu runs.\n"
+#endif

 #if defined(_WIN32)
 #include <direct.h>
--- a/libretro-common/include/features/cpu_features.h
+++ b/libretro-common/include/features/cpu_features.h
@ -1,23 +1,17 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
+ * 
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
 *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (cpu_features.h).
- * ---------------------------------------------------------------------------------------
+ *  RetroArch 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.
 *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
 */

 #ifndef _LIBRETRO_SDK_CPU_INFO_H
--- a/performance_counters.c
+++ b/performance_counters.c
@ -17,8 +17,7 @@
 #include <stdio.h>
 #include <string.h>

-#include <features/cpu_features.h>
-
+#include "performance.h"
 #include "performance_counters.h"

 #include "general.h"
--- a/retroarch.c
+++ b/retroarch.c
@ -42,7 +42,6 @@
 #include <file/file_path.h>
 #include <retro_stat.h>
 #include <retro_assert.h>
-#include <features/cpu_features.h>

 #include "content.h"
 #include "core_type.h"
@ -59,6 +58,7 @@
 #include "configuration.h"
 #include "general.h"
 #include "runloop.h"
+#include "performance.h"
 #include "managers/cheat_manager.h"
 #include "system.h"

--- a/runloop.c
+++ b/runloop.c
@ -23,7 +23,6 @@
 #include <file/file_path.h>
 #include <retro_inline.h>
 #include <retro_assert.h>
-#include <features/cpu_features.h>
 #include <queues/message_queue.h>
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
@ -39,6 +38,7 @@
 #include "autosave.h"
 #include "core_info.h"
 #include "configuration.h"
+#include "performance.h"
 #include "movie.h"
 #include "retroarch.h"
 #include "runloop.h"