From d6677ef42fee4f9ef6885ca627766debb0ed4ffc Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 26 Jul 2016 17:17:36 +0000 Subject: [PATCH] apply suggestions from #1570 --- desmume/src/MMU_timing.h | 4 ++-- desmume/src/ctrlssdl.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desmume/src/MMU_timing.h b/desmume/src/MMU_timing.h index 9da0a09df..a9520c10f 100644 --- a/desmume/src/MMU_timing.h +++ b/desmume/src/MMU_timing.h @@ -155,8 +155,8 @@ private: enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT }; enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT }; enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT }; - enum { TAGMASK = (u32)(~0 << TAGSHIFT) }; - enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) }; + enum { TAGMASK = (u32)(~0U << TAGSHIFT) }; + enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) }; enum { WORDSIZE = sizeof(u32) }; enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE }; enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY }; diff --git a/desmume/src/ctrlssdl.cpp b/desmume/src/ctrlssdl.cpp index 8ae5d5cfb..de87aac1e 100644 --- a/desmume/src/ctrlssdl.cpp +++ b/desmume/src/ctrlssdl.cpp @@ -200,7 +200,7 @@ u16 get_joy_key(int index) { break; case SDL_JOYAXISMOTION: /* Dead zone of 50% */ - if( (abs(event.jaxis.value) >> 14) != 0 ) + if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) { key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); if (event.jaxis.value > 0) { @@ -370,7 +370,7 @@ do_process_joystick_events( u16 *keypad, SDL_Event *event) { Note: button constants have a 1bit offset. */ case SDL_JOYAXISMOTION: key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); - if( (abs(event->jaxis.value) >> 14) != 0 ) + if( (u32)(abs(event->jaxis.value) >> 14) != 0 ) { if (event->jaxis.value > 0) key_code |= 1;