diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/file_util.cpp | 18 | ||||
| -rw-r--r-- | src/common/x64/cpu_detect.cpp | 12 |
2 files changed, 16 insertions, 14 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index df234c225..5ab036b34 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -118,8 +118,7 @@ bool IsDirectory(const std::string& filename) { #endif if (result < 0) { - LOG_WARNING(Common_Filesystem, "stat failed on %s: %s", filename.c_str(), - GetLastErrorMsg()); + LOG_DEBUG(Common_Filesystem, "stat failed on %s: %s", filename.c_str(), GetLastErrorMsg()); return false; } @@ -129,12 +128,12 @@ bool IsDirectory(const std::string& filename) { // Deletes a given filename, return true on success // Doesn't supports deleting a directory bool Delete(const std::string& filename) { - LOG_INFO(Common_Filesystem, "file %s", filename.c_str()); + LOG_TRACE(Common_Filesystem, "file %s", filename.c_str()); // Return true because we care about the file no // being there, not the actual delete. if (!Exists(filename)) { - LOG_WARNING(Common_Filesystem, "%s does not exist", filename.c_str()); + LOG_DEBUG(Common_Filesystem, "%s does not exist", filename.c_str()); return true; } @@ -169,8 +168,7 @@ bool CreateDir(const std::string& path) { return true; DWORD error = GetLastError(); if (error == ERROR_ALREADY_EXISTS) { - LOG_WARNING(Common_Filesystem, "CreateDirectory failed on %s: already exists", - path.c_str()); + LOG_DEBUG(Common_Filesystem, "CreateDirectory failed on %s: already exists", path.c_str()); return true; } LOG_ERROR(Common_Filesystem, "CreateDirectory failed on %s: %i", path.c_str(), error); @@ -182,7 +180,7 @@ bool CreateDir(const std::string& path) { int err = errno; if (err == EEXIST) { - LOG_WARNING(Common_Filesystem, "mkdir failed on %s: already exists", path.c_str()); + LOG_DEBUG(Common_Filesystem, "mkdir failed on %s: already exists", path.c_str()); return true; } @@ -197,7 +195,7 @@ bool CreateFullPath(const std::string& fullPath) { LOG_TRACE(Common_Filesystem, "path %s", fullPath.c_str()); if (FileUtil::Exists(fullPath)) { - LOG_WARNING(Common_Filesystem, "path exists %s", fullPath.c_str()); + LOG_DEBUG(Common_Filesystem, "path exists %s", fullPath.c_str()); return true; } @@ -229,7 +227,7 @@ bool CreateFullPath(const std::string& fullPath) { // Deletes a directory filename, returns true on success bool DeleteDir(const std::string& filename) { - LOG_INFO(Common_Filesystem, "directory %s", filename.c_str()); + LOG_TRACE(Common_Filesystem, "directory %s", filename.c_str()); // check if a directory if (!FileUtil::IsDirectory(filename)) { @@ -693,6 +691,8 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string& new paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; if (!FileUtil::IsDirectory(paths[D_USER_IDX])) { paths[D_USER_IDX] = AppDataRoamingDirectory() + DIR_SEP EMU_DATA_DIR DIR_SEP; + } else { + LOG_INFO(Common_Filesystem, "Using the local user directory"); } paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP; diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp index 370ae2c80..2cb3ab9cc 100644 --- a/src/common/x64/cpu_detect.cpp +++ b/src/common/x64/cpu_detect.cpp @@ -8,9 +8,9 @@ #include "common/common_types.h" #include "cpu_detect.h" -namespace Common { - -#ifndef _MSC_VER +#ifdef _MSC_VER +#include <intrin.h> +#else #if defined(__DragonFly__) || defined(__FreeBSD__) // clang-format off @@ -37,13 +37,15 @@ static inline void __cpuid(int info[4], int function_id) { } #define _XCR_XFEATURE_ENABLED_MASK 0 -static u64 _xgetbv(u32 index) { +static inline u64 _xgetbv(u32 index) { u32 eax, edx; __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index)); return ((u64)edx << 32) | eax; } -#endif // ifndef _MSC_VER +#endif // _MSC_VER + +namespace Common { // Detects the various CPU features static CPUCaps Detect() { |