diff options
Diffstat (limited to '')
44 files changed, 101 insertions, 208 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index b0aa1e561..250df59f8 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -32,17 +32,14 @@ void EmuThread::run() { while (true) { - for (int tight_loop = 0; tight_loop < 10000; ++tight_loop) + if (cpu_running || exec_cpu_step) { - if (cpu_running || exec_cpu_step) - { - if (exec_cpu_step) - exec_cpu_step = false; - - Core::SingleStep(); - if (!cpu_running) - emit CPUStepped(); - } + if (exec_cpu_step) + exec_cpu_step = false; + + Core::SingleStep(); + if (!cpu_running) + emit CPUStepped(); } } diff --git a/src/common/atomic.h b/src/common/atomic.h index ff2fb23d3..941f5ad5e 100644 --- a/src/common/atomic.h +++ b/src/common/atomic.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _ATOMIC_H_ -#define _ATOMIC_H_ +#pragma once #ifdef _WIN32 @@ -15,5 +14,3 @@ #include "common/atomic_gcc.h" #endif - -#endif diff --git a/src/common/atomic_gcc.h b/src/common/atomic_gcc.h index 953c82c6c..117e342f6 100644 --- a/src/common/atomic_gcc.h +++ b/src/common/atomic_gcc.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _ATOMIC_GCC_H_ -#define _ATOMIC_GCC_H_ +#pragma once #include "common/common.h" @@ -109,5 +108,3 @@ LONG SyncInterlockedExchange(LONG *Dest, LONG Val) #endif } #endif - -#endif diff --git a/src/common/atomic_win32.h b/src/common/atomic_win32.h index f8ec80520..0808905f0 100644 --- a/src/common/atomic_win32.h +++ b/src/common/atomic_win32.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _ATOMIC_WIN32_H_ -#define _ATOMIC_WIN32_H_ +#pragma once #include "common/common.h" #include <intrin.h> @@ -68,5 +67,3 @@ inline void AtomicStoreRelease(volatile u32& dest, u32 value) { } } - -#endif diff --git a/src/common/break_points.h b/src/common/break_points.h index da14ca7f3..cf3884fbc 100644 --- a/src/common/break_points.h +++ b/src/common/break_points.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DEBUGGER_BREAKPOINTS_H -#define _DEBUGGER_BREAKPOINTS_H +#pragma once #include <vector> #include <string> @@ -98,5 +97,3 @@ public: void Clear() { m_MemChecks.clear(); }; }; - -#endif diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h index 8c9f839da..2b0f120e6 100644 --- a/src/common/chunk_file.h +++ b/src/common/chunk_file.h @@ -15,8 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _POINTERWRAP_H_ -#define _POINTERWRAP_H_ +#pragma once // Extremely simple serialization framework. @@ -871,5 +870,3 @@ private: char GitVersion[32]; }; }; */ - -#endif // _POINTERWRAP_H_ diff --git a/src/common/common.h b/src/common/common.h index 09027cae1..cb69eabe4 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -2,15 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _COMMON_H_ -#define _COMMON_H_ +#pragma once // DO NOT EVER INCLUDE <windows.h> directly _or indirectly_ from this file // since it slows down the build a lot. -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> // Force enable logging in the right modes. For some reason, something had changed // so that debugfast no longer logged. @@ -200,5 +199,3 @@ inline double bswapd(double f) { } #include "swap.h" - -#endif // _COMMON_H_ diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index dca4dc47f..c18afe119 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _COMMONFUNCS_H_ -#define _COMMONFUNCS_H_ +#pragma once #ifdef _WIN32 #define SLEEP(x) Sleep(x) @@ -233,5 +232,3 @@ inline T FromBigEndian(T data) } } // Namespace Common - -#endif // _COMMONFUNCS_H_ diff --git a/src/common/common_paths.h b/src/common/common_paths.h index 252e93fa9..a36de9227 100644 --- a/src/common/common_paths.h +++ b/src/common/common_paths.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _COMMON_PATHS_H_ -#define _COMMON_PATHS_H_ +#pragma once // Make sure we pick up USER_DIR if set in config.h #include "common/common.h" @@ -75,5 +74,3 @@ // Files in the directory returned by GetUserPath(D_SYSCONF_IDX) #define SYSCONF "SYSCONF" - -#endif // _COMMON_PATHS_H_ diff --git a/src/common/common_types.h b/src/common/common_types.h index 402410507..9d41e5971 100644 --- a/src/common/common_types.h +++ b/src/common/common_types.h @@ -24,7 +24,7 @@ #pragma once -#include <math.h> +#include <cmath> #include <xmmintrin.h> // data_types__m128.cpp #ifdef _WIN32 diff --git a/src/common/console_listener.cpp b/src/common/console_listener.cpp index db48abbf6..27697ef1f 100644 --- a/src/common/console_listener.cpp +++ b/src/common/console_listener.cpp @@ -2,15 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include <algorithm> // min -#include <string> // System: To be able to add strings with "+" -#include <stdio.h> -#include <math.h> +#include <algorithm> +#include <cmath> +#include <cstdio> +#include <string> #ifdef _WIN32 #include <windows.h> #include <array> #else -#include <stdarg.h> +#include <cstdarg> #endif #include "common/common.h" diff --git a/src/common/console_listener.h b/src/common/console_listener.h index 224d17017..3c0e420c6 100644 --- a/src/common/console_listener.h +++ b/src/common/console_listener.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CONSOLELISTENER_H -#define _CONSOLELISTENER_H +#pragma once #include "common/log_manager.h" @@ -37,5 +36,3 @@ private: #endif bool bUseColor; }; - -#endif // _CONSOLELISTENER_H diff --git a/src/common/cpu_detect.h b/src/common/cpu_detect.h index e93cf333a..def6afdee 100644 --- a/src/common/cpu_detect.h +++ b/src/common/cpu_detect.h @@ -4,8 +4,7 @@ // Detect the cpu, so we'll know which optimizations to use -#ifndef _CPUDETECT_H_ -#define _CPUDETECT_H_ +#pragma once #include <string> @@ -77,5 +76,3 @@ private: }; extern CPUInfo cpu_info; - -#endif // _CPUDETECT_H_ diff --git a/src/common/debug_interface.h b/src/common/debug_interface.h index 49cc54a80..32f55cb59 100644 --- a/src/common/debug_interface.h +++ b/src/common/debug_interface.h @@ -1,8 +1,7 @@ -#ifndef _DEBUGINTERFACE_H -#define _DEBUGINTERFACE_H +#pragma once +#include <cstring> #include <string> -#include <string.h> class DebugInterface { @@ -35,5 +34,3 @@ public: virtual int getColor(unsigned int /*address*/){return 0xFFFFFFFF;} virtual std::string getDescription(unsigned int /*address*/) = 0; }; - -#endif diff --git a/src/common/extended_trace.cpp b/src/common/extended_trace.cpp index 0a1c6a67a..66dae4935 100644 --- a/src/common/extended_trace.cpp +++ b/src/common/extended_trace.cpp @@ -13,9 +13,8 @@ // -------------------------------------------------------------------------------------- #if defined(WIN32) - +#include <cstdio> #include <windows.h> -#include <stdio.h> #include "common/extended_trace.h" #include "common/string_util.h" using namespace std; diff --git a/src/common/extended_trace.h b/src/common/extended_trace.h index 1552e901b..ed3113a24 100644 --- a/src/common/extended_trace.h +++ b/src/common/extended_trace.h @@ -12,8 +12,7 @@ // // ---------------------------------------------------------------------------------------- -#ifndef _EXTENDEDTRACE_H_INCLUDED_ -#define _EXTENDEDTRACE_H_INCLUDED_ +#pragma once #if defined(WIN32) @@ -49,5 +48,3 @@ extern char g_uefbuf[UEFBUFSIZE]; #define STACKTRACE2(file, eip, esp, ebp) ((void)0) #endif // WIN32 - -#endif // _EXTENDEDTRACE_H_INCLUDED_ diff --git a/src/common/fifo_queue.h b/src/common/fifo_queue.h index 4e80f53b4..78a8f561d 100644 --- a/src/common/fifo_queue.h +++ b/src/common/fifo_queue.h @@ -1,6 +1,4 @@ - -#ifndef _FIFO_QUEUE_H_ -#define _FIFO_QUEUE_H_ +#pragma once // a simple lockless thread-safe, // single reader, single writer queue @@ -111,5 +109,3 @@ private: }; } - -#endif diff --git a/src/common/file_search.h b/src/common/file_search.h index 2a9ff801f..f966a008d 100644 --- a/src/common/file_search.h +++ b/src/common/file_search.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _FILESEARCH_H_ -#define _FILESEARCH_H_ +#pragma once #include <string> #include <vector> @@ -23,6 +21,3 @@ private: XStringVector m_FileNames; }; - -#endif // _FILESEARCH_H_ - diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 47ad964db..b6ff2e40b 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -16,11 +16,11 @@ #include <io.h> #include <direct.h> // getcwd #else +#include <cerrno> +#include <cstdlib> #include <sys/param.h> #include <sys/types.h> #include <dirent.h> -#include <errno.h> -#include <stdlib.h> #endif #if defined(__APPLE__) diff --git a/src/common/file_util.h b/src/common/file_util.h index 5edb43f6a..0871734d4 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _FILEUTIL_H_ -#define _FILEUTIL_H_ +#pragma once #include <fstream> #include <cstdio> @@ -220,5 +218,3 @@ void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmod fstream.open(filename.c_str(), openmode); #endif } - -#endif diff --git a/src/common/fixed_size_queue.h b/src/common/fixed_size_queue.h index 1f507f4ae..1e3a5dea6 100644 --- a/src/common/fixed_size_queue.h +++ b/src/common/fixed_size_queue.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _FIXED_SIZE_QUEUE_H_ -#define _FIXED_SIZE_QUEUE_H_ +#pragma once // STL-look-a-like interface, but name is mixed case to distinguish it clearly from the // real STL classes. @@ -70,6 +68,3 @@ public: return count; } }; - -#endif // _FIXED_SIZE_QUEUE_H_ - diff --git a/src/common/hash.h b/src/common/hash.h index c69908415..29f699d7f 100644 --- a/src/common/hash.h +++ b/src/common/hash.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _HASH_H_ -#define _HASH_H_ +#pragma once #include "common/common.h" @@ -17,4 +15,3 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples); u64 GetMurmurHash3(const u8 *src, int len, u32 samples); u64 GetHash64(const u8 *src, int len, u32 samples); void SetHash64Function(bool useHiresTextures); -#endif // _HASH_H_ diff --git a/src/common/linear_disk_cache.h b/src/common/linear_disk_cache.h index a24687615..96dce3155 100644 --- a/src/common/linear_disk_cache.h +++ b/src/common/linear_disk_cache.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _LINEAR_DISKCACHE -#define _LINEAR_DISKCACHE +#pragma once #include "common/common.h" #include <fstream> @@ -187,5 +185,3 @@ private: std::fstream m_file; u32 m_num_entries; }; - -#endif // _LINEAR_DISKCACHE diff --git a/src/common/log.h b/src/common/log.h index e923224ed..f1f6ffae6 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _LOG_H_ -#define _LOG_H_ +#pragma once #define LOGGING @@ -160,5 +159,3 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int #else // GEKKO #define _assert_msg_(_t_, _a_, _fmt_, ...) #endif - -#endif // _LOG_H_ diff --git a/src/common/log_manager.h b/src/common/log_manager.h index 6d3d7c7ff..81d808825 100644 --- a/src/common/log_manager.h +++ b/src/common/log_manager.h @@ -2,16 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _LOGMANAGER_H_ -#define _LOGMANAGER_H_ +#pragma once #include "common/log.h" #include "common/string_util.h" #include "common/thread.h" #include "common/file_util.h" +#include <cstring> #include <set> -#include <string.h> #define MAX_MESSAGES 8000 #define MAX_MSGLEN 1024 @@ -165,5 +164,3 @@ public: static void Init(); static void Shutdown(); }; - -#endif // _LOGMANAGER_H_ diff --git a/src/common/math_util.h b/src/common/math_util.h index 9167d2012..65220fbdf 100644 --- a/src/common/math_util.h +++ b/src/common/math_util.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _MATH_UTIL_H_ -#define _MATH_UTIL_H_ +#pragma once #include "common/common.h" @@ -196,5 +194,3 @@ public: float data[16]; }; - -#endif // _MATH_UTIL_H_ diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp index b918eb568..b76ac92d3 100644 --- a/src/common/mem_arena.cpp +++ b/src/common/mem_arena.cpp @@ -19,6 +19,7 @@ #include "common/memory_util.h" #include "common/mem_arena.h" +#include "common/string_util.h" #ifndef _WIN32 #include <sys/stat.h> @@ -98,15 +99,7 @@ int ashmem_unpin_region(int fd, size_t offset, size_t len) #endif // Android - -#ifndef _WIN32 -// do not make this "static" -#if defined(MAEMO) || defined(MEEGO_EDITION_HARMATTAN) -std::string ram_temp_file = "/home/user/gc_mem.tmp"; -#else -std::string ram_temp_file = "/tmp/gc_mem.tmp"; -#endif -#elif !defined(_XBOX) +#if defined(_WIN32) && !defined(_XBOX) SYSTEM_INFO sysInfo; #endif @@ -145,20 +138,26 @@ void MemArena::GrabLowMemSpace(size_t size) return; } #else - mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; - fd = open(ram_temp_file.c_str(), O_RDWR | O_CREAT, mode); - if (fd < 0) - { - ERROR_LOG(MEMMAP, "Failed to grab memory space as a file: %s of size: %08x errno: %d", ram_temp_file.c_str(), (int)size, (int)(errno)); - return; - } - // delete immediately, we keep the fd so it still lives - unlink(ram_temp_file.c_str()); - if (ftruncate(fd, size) != 0) + // Try to find a non-existing filename for our shared memory. + // In most cases the first one will be available, but it's nicer to search + // a bit more. + for (int i = 0; i < 10000; i++) { - ERROR_LOG(MEMMAP, "Failed to ftruncate %d to size %08x", (int)fd, (int)size); + std::string file_name = StringFromFormat("/citramem.%d", i); + fd = shm_open(file_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600); + if (fd != -1) + { + shm_unlink(file_name.c_str()); + break; + } + else if (errno != EEXIST) + { + ERROR_LOG(MEMMAP, "shm_open failed: %s", strerror(errno)); + return; + } } - return; + if (ftruncate(fd, size) < 0) + ERROR_LOG(MEMMAP, "Failed to allocate low memory space"); #endif } @@ -198,12 +197,12 @@ void *MemArena::CreateView(s64 offset, size_t size, void *base) #elif defined(__FreeBSD__) MAP_NOSYNC | #endif - ((base == 0) ? 0 : MAP_FIXED), fd, offset); + ((base == nullptr) ? 0 : MAP_FIXED), fd, offset); if (retval == MAP_FAILED) { - NOTICE_LOG(MEMMAP, "mmap on %s (fd: %d) failed", ram_temp_file.c_str(), (int)fd); - return 0; + NOTICE_LOG(MEMMAP, "mmap failed"); + return nullptr; } return retval; #endif diff --git a/src/common/mem_arena.h b/src/common/mem_arena.h index 667efbea9..b5f0aa890 100644 --- a/src/common/mem_arena.h +++ b/src/common/mem_arena.h @@ -15,8 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _MEMARENA_H_ -#define _MEMARENA_H_ +#pragma once #ifdef _WIN32 #include <windows.h> @@ -77,5 +76,3 @@ struct MemoryView // a passed-in list of MemoryView structures. u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena *arena); void MemoryMap_Shutdown(const MemoryView *views, int num_views, u32 flags, MemArena *arena); - -#endif // _MEMARENA_H_ diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index 5cc869aea..e01e63175 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp @@ -11,8 +11,8 @@ #include <windows.h> #include <psapi.h> #else -#include <errno.h> -#include <stdio.h> +#include <cerrno> +#include <cstdio> #endif #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) diff --git a/src/common/memory_util.h b/src/common/memory_util.h index 49b2589da..922bd44b2 100644 --- a/src/common/memory_util.h +++ b/src/common/memory_util.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _MEMORYUTIL_H -#define _MEMORYUTIL_H +#pragma once #ifndef _WIN32 #include <sys/mman.h> @@ -21,5 +19,3 @@ void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute = false); std::string MemUsage(); inline int GetPageSize() { return 4096; } - -#endif diff --git a/src/common/msg_handler.cpp b/src/common/msg_handler.cpp index c1386cdaa..3e02ec4d7 100644 --- a/src/common/msg_handler.cpp +++ b/src/common/msg_handler.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include <stdio.h> // System +#include <cstdio> #include "common/common.h" // Local #include "common/string_util.h" diff --git a/src/common/msg_handler.h b/src/common/msg_handler.h index bde2808fa..7c5319ec3 100644 --- a/src/common/msg_handler.h +++ b/src/common/msg_handler.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _MSGHANDLER_H_ -#define _MSGHANDLER_H_ +#pragma once #include <string> @@ -69,5 +68,3 @@ void SetEnableAlert(bool enable); #define AskYesNoT(format, ...) ; #define CriticalAlertT(format, ...) ; #endif - -#endif // _MSGHANDLER_H_ diff --git a/src/common/platform.h b/src/common/platform.h index b02b52cd2..d9f095433 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -22,8 +22,7 @@ * http://code.google.com/p/gekko-gc-emu/ */ -#ifndef COMMON_PLATFORM_H_ -#define COMMON_PLATFORM_H_ +#pragma once #include "common/common_types.h" @@ -110,5 +109,3 @@ typedef void EXCEPTION_POINTERS; #define GCC_VERSION_AVAILABLE(major, minor) (defined(__GNUC__) && (__GNUC__ > (major) || \ (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))) - -#endif // COMMON_PLATFORM_H_ diff --git a/src/common/std_condition_variable.h b/src/common/std_condition_variable.h index 8964b4f6f..ad2022f5a 100644 --- a/src/common/std_condition_variable.h +++ b/src/common/std_condition_variable.h @@ -1,6 +1,5 @@ -#ifndef CONDITION_VARIABLE_H_ -#define CONDITION_VARIABLE_H_ +#pragma once #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) @@ -167,4 +166,3 @@ private: } #endif -#endif diff --git a/src/common/std_mutex.h b/src/common/std_mutex.h index 26eb58b62..5711d791b 100644 --- a/src/common/std_mutex.h +++ b/src/common/std_mutex.h @@ -1,6 +1,4 @@ - -#ifndef MUTEX_H_ -#define MUTEX_H_ +#pragma once #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) @@ -362,4 +360,3 @@ void swap(unique_lock<Mutex>& x, unique_lock<Mutex>& y) } #endif -#endif diff --git a/src/common/std_thread.h b/src/common/std_thread.h index 9ed0072c3..ce1336ee7 100644 --- a/src/common/std_thread.h +++ b/src/common/std_thread.h @@ -1,6 +1,4 @@ - -#ifndef STD_THREAD_H_ -#define STD_THREAD_H_ +#pragma once #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) @@ -314,4 +312,3 @@ inline thread::id get_id() #undef THREAD_HANDLE #endif -#endif diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index e5a9ba322..c1f22bda3 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include <stdlib.h> -#include <stdio.h> #include <algorithm> +#include <cstdlib> +#include <cstdio> #include "common/common.h" #include "common/common_paths.h" @@ -13,8 +13,8 @@ #ifdef _WIN32 #include <Windows.h> #else + #include <cerrno> #include <iconv.h> - #include <errno.h> #endif /// Make a string lowercase diff --git a/src/common/string_util.h b/src/common/string_util.h index b3c99a807..ba4cd363e 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -2,15 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _STRINGUTIL_H_ -#define _STRINGUTIL_H_ +#pragma once -#include <stdarg.h> - -#include <vector> +#include <cstdarg> +#include <iomanip> #include <string> #include <sstream> -#include <iomanip> +#include <vector> #include "common/common.h" @@ -113,5 +111,3 @@ inline std::string UTF8ToTStr(const std::string& str) #endif #endif - -#endif // _STRINGUTIL_H_ diff --git a/src/common/thread.h b/src/common/thread.h index d72ac7b47..dbb9da53b 100644 --- a/src/common/thread.h +++ b/src/common/thread.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _THREAD_H_ -#define _THREAD_H_ +#pragma once #include "common/std_condition_variable.h" #include "common/std_mutex.h" @@ -11,8 +10,8 @@ // Don't include common.h here as it will break LogManager #include "common/common_types.h" -#include <stdio.h> -#include <string.h> +#include <cstdio> +#include <cstring> // This may not be defined outside _WIN32 #ifndef _WIN32 @@ -152,5 +151,3 @@ inline void YieldCPU() void SetCurrentThreadName(const char *name); } // namespace Common - -#endif // _THREAD_H_ diff --git a/src/common/thunk.h b/src/common/thunk.h index 2c2f23cd0..90c8be888 100644 --- a/src/common/thunk.h +++ b/src/common/thunk.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _THUNK_H_ -#define _THUNK_H_ +#pragma once #include <map> @@ -41,5 +40,3 @@ private: void Shutdown(); void Reset(); }; - -#endif // _THUNK_H_ diff --git a/src/common/timer.h b/src/common/timer.h index cfa5cf609..86418e7a7 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TIMER_H_ -#define _TIMER_H_ +#pragma once #include "common/common.h" #include <string> @@ -42,5 +41,3 @@ private: }; } // Namespace Common - -#endif // _TIMER_H_ diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp index fe5270183..c83824d35 100644 --- a/src/common/utf8.cpp +++ b/src/common/utf8.cpp @@ -18,10 +18,10 @@ #undef max #endif -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <stdarg.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> +#include <cstdarg> #include <algorithm> #include <string> diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 19f717bd2..8720bed31 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -5,6 +5,7 @@ #include <map> #include <string> +#include "common/string_util.h" #include "common/symbols.h" #include "core/mem_map.h" @@ -220,9 +221,7 @@ Result CreateThread(u32 priority, u32 entry_point, u32 arg, u32 stack_top, u32 p TSymbol symbol = Symbols::GetSymbol(entry_point); name = symbol.name; } else { - char buff[100]; - sprintf(buff, "%s", "unknown-%08X", entry_point); - name = buff; + name = StringFromFormat("unknown-%08x", entry_point); } Handle thread = Kernel::CreateThread(name.c_str(), entry_point, priority, arg, processor_id, diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 5772cca52..ecdaa06d7 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -289,11 +289,15 @@ void Write64(const u32 addr, const u64 data) { void WriteBlock(const u32 addr, const u8* data, const int size) { int offset = 0; - while (offset < (size & ~3)) - Write32(addr + offset, *(u32*)&data[offset += 4]); + while (offset < (size & ~3)) { + Write32(addr + offset, *(u32*)&data[offset]); + offset += 4; + } - if (size & 2) - Write16(addr + offset, *(u16*)&data[offset += 2]); + if (size & 2) { + Write16(addr + offset, *(u16*)&data[offset]); + offset += 2; + } if (size & 1) Write8(addr + offset, data[offset]); |