6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00
Code Issues Projects Releases Wiki Activity

Resolves final set of build warnings.

Browse Source
This commit is contained in:
Thomas Harte 2019-06-13 10:55:29 -04:00
parent bf4889f238
commit 59a94943aa
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Processors/68000/Implementation/68000Implementation.hpp
View File

@ -1569,7 +1569,7 @@ template <class T, bool dtack_is_implicit, bool signal_will_perform> void Proces
} else { \ } else { \
destination = decltype(destination)(\ destination = decltype(destination)(\
(value >> shift_count) | \ (value >> shift_count) | \
((value & (1 << (size - 1)) ? 0xffffffff : 0x000000000) << (size - shift_count)) \ ((value & decltype(value)(1 << (size - 1)) ? 0xffffffff : 0x000000000) << (size - shift_count)) \
); \ ); \
extend_flag_ = carry_flag_ = decltype(carry_flag_)(value) & decltype(carry_flag_)(1 << (shift_count - 1)); \ extend_flag_ = carry_flag_ = decltype(carry_flag_)(value) & decltype(carry_flag_)(1 << (shift_count - 1)); \
} \ } \
@ -1704,7 +1704,7 @@ template <class T, bool dtack_is_implicit, bool signal_will_perform> void Proces
destination = decltype(destination)(\ destination = decltype(destination)(\
(value << shift_count) | \ (value << shift_count) | \
(value >> (size + 1 - shift_count)) | \ (value >> (size + 1 - shift_count)) | \
((extend_flag_ ? (1 << (size - 1)) : 0) >> (size - shift_count))\ ((extend_flag_ ? decltype(destination)(1 << (size - 1)) : 0) >> (size - shift_count))\
); \ ); \
carry_flag_ = extend_flag_ = (value >> (size - shift_count))&1; \ carry_flag_ = extend_flag_ = (value >> (size - shift_count))&1; \
} \ } \
@ -1731,11 +1731,10 @@ template <class T, bool dtack_is_implicit, bool signal_will_perform> void Proces
carry_flag_ = extend_flag_; \ carry_flag_ = extend_flag_; \
} else { \ } else { \
shift_count %= (size + 1); \ shift_count %= (size + 1); \
destination = decltype(destination)(\ destination = \
(value >> shift_count) | \ decltype(destination)(value >> shift_count) | \
(value << (size + 1 - shift_count)) | \ decltype(destination)(value << (size + 1 - shift_count)) | \
((extend_flag_ ? 1 : 0) << (size - shift_count)) \ decltype(destination)((extend_flag_ ? 1 : 0) << (size - shift_count)); \
); \
carry_flag_ = extend_flag_ = value & (1 << shift_count); \ carry_flag_ = extend_flag_ = value & (1 << shift_count); \
} \ } \
\ \