Android: Silence a few warnings
This commit is contained in:
parent
9e2b9e2471
commit
dc79755303
|
@ -17,7 +17,7 @@ using namespace ArmGen;
|
||||||
// 1) It's really necessary. We don't know anything about the context.
|
// 1) It's really necessary. We don't know anything about the context.
|
||||||
// 2) It doesn't really hurt. Only instructions that access I/O will get these, and there won't be
|
// 2) It doesn't really hurt. Only instructions that access I/O will get these, and there won't be
|
||||||
// that many of them in a typical program/game.
|
// that many of them in a typical program/game.
|
||||||
bool DisamLoadStore(const u32 inst, ARMReg &rD, u8 &accessSize, bool &Store)
|
static bool DisamLoadStore(const u32 inst, ARMReg &rD, u8 &accessSize, bool &Store)
|
||||||
{
|
{
|
||||||
u8 op = (inst >> 20) & 0xFF;
|
u8 op = (inst >> 20) & 0xFF;
|
||||||
rD = (ARMReg)((inst >> 12) & 0xF);
|
rD = (ARMReg)((inst >> 12) & 0xF);
|
||||||
|
|
|
@ -168,32 +168,32 @@ void JitArm::subfic(UGeckoInstruction inst)
|
||||||
// This instruction has no RC flag
|
// This instruction has no RC flag
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 Add(u32 a, u32 b)
|
static u32 Add(u32 a, u32 b)
|
||||||
{
|
{
|
||||||
return a + b;
|
return a + b;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 Sub(u32 a, u32 b)
|
static u32 Sub(u32 a, u32 b)
|
||||||
{
|
{
|
||||||
return a - b;
|
return a - b;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 Mul(u32 a, u32 b)
|
static u32 Mul(u32 a, u32 b)
|
||||||
{
|
{
|
||||||
return a * b;
|
return a * b;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 Or (u32 a, u32 b)
|
static u32 Or (u32 a, u32 b)
|
||||||
{
|
{
|
||||||
return a | b;
|
return a | b;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 And(u32 a, u32 b)
|
static u32 And(u32 a, u32 b)
|
||||||
{
|
{
|
||||||
return a & b;
|
return a & b;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 Xor(u32 a, u32 b)
|
static u32 Xor(u32 a, u32 b)
|
||||||
{
|
{
|
||||||
return a ^ b;
|
return a ^ b;
|
||||||
}
|
}
|
||||||
|
|
|
@ -133,7 +133,7 @@ static inline u32 GetPixel(u32 *buffer, unsigned int x, unsigned int y) {
|
||||||
return buffer[y * 192 + x];
|
return buffer[y * 192 + x];
|
||||||
}
|
}
|
||||||
|
|
||||||
bool LoadBanner(std::string filename, u32 *Banner)
|
static bool LoadBanner(std::string filename, u32 *Banner)
|
||||||
{
|
{
|
||||||
DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
|
DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
|
||||||
|
|
||||||
|
@ -188,7 +188,8 @@ bool LoadBanner(std::string filename, u32 *Banner)
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
std::string GetName(std::string filename)
|
|
||||||
|
static std::string GetName(std::string filename)
|
||||||
{
|
{
|
||||||
if (!m_names.empty())
|
if (!m_names.empty())
|
||||||
return m_names[0];
|
return m_names[0];
|
||||||
|
@ -202,7 +203,7 @@ std::string GetName(std::string filename)
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string GetJString(JNIEnv *env, jstring jstr)
|
static std::string GetJString(JNIEnv *env, jstring jstr)
|
||||||
{
|
{
|
||||||
std::string result = "";
|
std::string result = "";
|
||||||
if (!jstr)
|
if (!jstr)
|
||||||
|
|
Loading…
Reference in New Issue