From 54155441e9ba9941e85d80c4834a66376a11e791 Mon Sep 17 00:00:00 2001 From: Firehawke Date: Wed, 13 Dec 2017 21:01:10 -0700 Subject: Revert "Merge branch 'master' of https://github.com/mamedev/mame" This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5. --- src/osd/eigccx86.h | 10 ++++++---- src/osd/eivc.h | 4 ++-- src/osd/modules/file/posixdir.cpp | 1 - src/osd/modules/file/posixfile.cpp | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/osd') diff --git a/src/osd/eigccx86.h b/src/osd/eigccx86.h index b3831d21524..b67b646451e 100644 --- a/src/osd/eigccx86.h +++ b/src/osd/eigccx86.h @@ -474,12 +474,13 @@ _count_leading_zeros(uint32_t value) __asm__ ( " bsrl %[value], %[result] ;" " cmovzl %[bias], %[result] ;" + " xorl $31, %[result] ;" : [result] "=&r" (result) // result can be in any register : [value] "rm" (value) // 'value' can be register or memory - , [bias] "rm" (~uint32_t(0)) // 'bias' can be register or memory + , [bias] "rm" (uint32_t(63)) // 'bias' can be register or memory : "cc" // clobbers condition codes ); - return 31U - result; + return result; } @@ -496,12 +497,13 @@ _count_leading_ones(uint32_t value) __asm__ ( " bsrl %[value], %[result] ;" " cmovzl %[bias], %[result] ;" + " xorl $31, %[result] ;" : [result] "=&r" (result) // result can be in any register : [value] "rm" (~value) // 'value' can be register or memory - , [bias] "rm" (~uint32_t(0)) // 'bias' can be register or memory + , [bias] "rm" (uint32_t(63)) // 'bias' can be register or memory : "cc" // clobbers condition codes ); - return 31U - result; + return result; } #endif // MAME_OSD_EIGCCX86_H diff --git a/src/osd/eivc.h b/src/osd/eivc.h index 3fa34f51b3c..de4ea809a28 100644 --- a/src/osd/eivc.h +++ b/src/osd/eivc.h @@ -31,7 +31,7 @@ inline uint8_t _count_leading_zeros(uint32_t value) { unsigned long index; - return _BitScanReverse(&index, value) ? (31U - index) : 32U; + return _BitScanReverse(&index, value) ? (index ^ 31) : 32; } #endif @@ -46,7 +46,7 @@ inline uint8_t _count_leading_zeros(uint32_t value) inline uint8_t _count_leading_ones(uint32_t value) { unsigned long index; - return _BitScanReverse(&index, ~value) ? (31U - index) : 32U; + return _BitScanReverse(&index, ~value) ? (index ^ 31) : 32; } #endif diff --git a/src/osd/modules/file/posixdir.cpp b/src/osd/modules/file/posixdir.cpp index be18239ebf5..113c5068963 100644 --- a/src/osd/modules/file/posixdir.cpp +++ b/src/osd/modules/file/posixdir.cpp @@ -158,7 +158,6 @@ const osd::directory::entry *posix_directory::read() case DT_REG: m_entry.type = entry::entry_type::FILE; break; - case DT_UNKNOWN: case DT_LNK: if (stat_err) m_entry.type = entry::entry_type::OTHER; diff --git a/src/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp index 967202eb61c..3cc122342dd 100644 --- a/src/osd/modules/file/posixfile.cpp +++ b/src/osd/modules/file/posixfile.cpp @@ -446,7 +446,7 @@ bool osd_is_absolute_path(std::string const &path) if (!path.empty() && is_path_separator(path[0])) return true; #if !defined(WIN32) - else if (!path.empty() && (path[0] == '.') && (!path[1] || is_path_separator(path[1]))) // FIXME: why is this even here? foo/./bar is a valid way to refer to foo/bar + else if (!path.empty() && (path[0] == '.')) return true; #elif !defined(UNDER_CE) else if ((path.length() > 1) && (path[1] == ':')) -- cgit v1.2.3-70-g09d2