From 8ffd954122a1e5dd19ff88abd04eda13b8cdce79 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 1 Oct 2012 23:04:15 +0200 Subject: [PATCH] (Xbox 1) benchmark.c - add Xbox 1 support --- benchmark.c | 17 +++++++++++++++-- console/griffin/griffin.c | 2 +- console/rarch_console_input.h | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/benchmark.c b/benchmark.c index e310d9961a..0c3c6f2681 100644 --- a/benchmark.c +++ b/benchmark.c @@ -26,8 +26,21 @@ unsigned long long rarch_get_performance_counter(void) { -#if defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX360) - unsigned long long time = __mftb(); + unsigned long long time = 0; +#ifdef _XBOX1 +#define rdtsc __asm __emit 0fh __asm __emit 031h + LARGE_INTEGER time_tmp; + rdtsc; + __asm mov time_tmp.LowPart, eax; + __asm mov time_tmp.HighPart, edx; + time = time_tmp.QuadPart; +#elif defined(__i386__) || defined(__i486__) || defined(__x86_64__) + uint64_t lo, hi; + __asm__ __volatile__("rdtsc" : "=a" (lo), "=d" (hi)); + time = ((((uint64 t)hi) << 32) | ((uint64 t)lo) ); +#elif defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX360) + time = __mftb(); #endif + (void)time; return time; } diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index c0d7d54d10..da2d60ba68 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -42,7 +42,7 @@ CONSOLE EXTENSIONS #include "../rarch_console_exec.c" #endif -#if defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX360) +#if defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX) #include "../../benchmark.c" #endif diff --git a/console/rarch_console_input.h b/console/rarch_console_input.h index 7df2adb54a..a85206914c 100644 --- a/console/rarch_console_input.h +++ b/console/rarch_console_input.h @@ -37,7 +37,7 @@ enum enum { - RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_LEFT = RARCH_FIRST_ANALOG_BIND, + RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_LEFT = RARCH_FIRST_CUSTOM_BIND, RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_RIGHT, RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_UP, RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_DOWN,