piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 21:30:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix most ARM warnings

Browse Source
This commit is contained in:
Ryan Houdek
2013-07-05 19:56:15 -05:00
parent cdfd7905a0
commit 7d6b36bf73
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/AudioCommon/Src/OpenSLESStream.cpp
View File

@ -41,7 +41,8 @@ static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) {
// Comment from sample code: // Comment from sample code:
// the most likely other result is SL_RESULT_BUFFER_INSUFFICIENT, // the most likely other result is SL_RESULT_BUFFER_INSUFFICIENT,
// which for this code example would indicate a programming error // which for this code example would indicate a programming error
assert(SL_RESULT_SUCCESS == result); _assert_msg_(AUDIO, SL_RESULT_SUCCESS == result, "Couldn't enqueue audio stream.");
curBuffer ^= 1; // Switch buffer curBuffer ^= 1; // Switch buffer
// Render to the fresh buffer // Render to the fresh buffer

2
Source/Core/Common/Src/ArmEmitter.cpp
View File

@ -86,7 +86,7 @@ bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated)
Operand2 AssumeMakeOperand2(u32 imm) { Operand2 AssumeMakeOperand2(u32 imm) {
Operand2 op2; Operand2 op2;
bool result = TryMakeOperand2(imm, op2); bool result = TryMakeOperand2(imm, op2);
_dbg_assert_msg_(JIT, result, "Could not make assumed Operand2."); _assert_msg_(DYNA_REC, result, "Could not make assumed Operand2.");
return op2; return op2;
} }

2
Source/Core/Core/Src/GeckoCode.cpp
View File

@ -83,7 +83,7 @@ bool GeckoCode::Compare(GeckoCode compare) const
if (codes.size() != compare.codes.size()) if (codes.size() != compare.codes.size())
return false; return false;
int exist = 0; unsigned int exist = 0;
std::vector<GeckoCode::Code>::const_iterator std::vector<GeckoCode::Code>::const_iterator
codes_iter = codes.begin(), codes_iter = codes.begin(),
codes_end = codes.end(); codes_end = codes.end();

10
Source/Core/Core/Src/HW/Memmap.cpp
View File

@ -113,18 +113,18 @@ void HW_Default_Write(const T _Data, const u32 _Address){ ERROR_LOG(MASTER_LOG,
template <class T> template <class T>
void HW_Default_Read(T _Data, const u32 _Address){ ERROR_LOG(MASTER_LOG, "Illegal HW Read%lu %08x", (unsigned long)sizeof(T)*8, _Address); _dbg_assert_(MEMMAP, 0);} void HW_Default_Read(T _Data, const u32 _Address){ ERROR_LOG(MASTER_LOG, "Illegal HW Read%lu %08x", (unsigned long)sizeof(T)*8, _Address); _dbg_assert_(MEMMAP, 0);}
#define PAGE_SHIFT 10 #define HW_PAGE_SHIFT 10
#define PAGE_SIZE (1 << PAGE_SHIFT) #define HW_PAGE_SIZE (1 << HW_PAGE_SHIFT)
#define PAGE_MASK (PAGE_SHIFT - 1) #define HW_PAGE_MASK (HW_PAGE_SHIFT - 1)
template <class T, u8 *P> void HW_Read_Memory(T &_Data, const u32 _Address) template <class T, u8 *P> void HW_Read_Memory(T &_Data, const u32 _Address)
{ {
_Data = *(T *)&P[_Address & PAGE_MASK]; _Data = *(T *)&P[_Address & HW_PAGE_MASK];
} }
template <class T, u8 *P> void HW_Write_Memory(T _Data, const u32 _Address) template <class T, u8 *P> void HW_Write_Memory(T _Data, const u32 _Address)
{ {
*(T *)&P[_Address & PAGE_MASK] = _Data; *(T *)&P[_Address & HW_PAGE_MASK] = _Data;
} }
// Create shortcuts to the hardware devices' read and write functions. // Create shortcuts to the hardware devices' read and write functions.

4
Source/Core/VideoCommon/Src/DriverDetails.cpp
View File

@ -40,7 +40,7 @@ namespace DriverDetails
switch(m_vendor) switch(m_vendor)
{ {
case VENDOR_QUALCOMM: case VENDOR_QUALCOMM:
for (int a = 0; a < (sizeof(m_qualcommbugs) / sizeof(BugInfo)); ++a) for (unsigned int a = 0; a < (sizeof(m_qualcommbugs) / sizeof(BugInfo)); ++a)
m_bugs[std::make_pair(m_vendor, m_qualcommbugs[a].m_bug)] = m_qualcommbugs[a]; m_bugs[std::make_pair(m_vendor, m_qualcommbugs[a].m_bug)] = m_qualcommbugs[a];
break; break;
default: default:
@ -61,7 +61,7 @@ namespace DriverDetails
it->second.m_hasbug = true; it->second.m_hasbug = true;
} }
const bool HasBug(Bug bug) bool HasBug(Bug bug)
{ {
auto it = m_bugs.find(std::make_pair(m_vendor, bug)); auto it = m_bugs.find(std::make_pair(m_vendor, bug));
if (it == m_bugs.end()) if (it == m_bugs.end())

2
Source/Core/VideoCommon/Src/DriverDetails.h
View File

@ -68,5 +68,5 @@ namespace DriverDetails
void Init(Vendor vendor, const u32 devfamily, const double version); void Init(Vendor vendor, const u32 devfamily, const double version);
// Once Vendor and driver version is set, this will return if it has the applicable bug passed to it. // Once Vendor and driver version is set, this will return if it has the applicable bug passed to it.
const bool HasBug(Bug bug); bool HasBug(Bug bug);
} }