ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6568 from leoetlino/dead 

Remove dead code
This commit is contained in:
Mat M 2018-03-31 14:02:40 -04:00 committed by GitHub
parent df0d1c8138 c82da2b978
commit a6f1c6e2e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 0 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Android/jni/MainAndroid.cpp
View File

@ -281,14 +281,6 @@ static std::string GetTitle(std::string filename)
if (titles.empty()) if (titles.empty())
titles = pVolume->GetShortNames(); titles = pVolume->GetShortNames();
/*
const bool is_wii_title = DiscIO::IsWii(pVolume->GetVolumeType());
DiscIO::Language language = SConfig::GetInstance().GetCurrentLanguage(is_wii_title);
auto it = titles.find(language);
if (it != end)
return it->second;*/
auto end = titles.end(); auto end = titles.end();
// English tends to be a good fallback when the requested language isn't available // English tends to be a good fallback when the requested language isn't available
@ -322,14 +314,6 @@ static std::string GetDescription(std::string filename)
{ {
std::map<DiscIO::Language, std::string> descriptions = volume->GetDescriptions(); std::map<DiscIO::Language, std::string> descriptions = volume->GetDescriptions();
/*
const bool is_wii_title = DiscIO::IsWii(pVolume->GetVolumeType());
DiscIO::Language language = SConfig::GetInstance().GetCurrentLanguage(is_wii_title);
auto it = descriptions.find(language);
if (it != end)
return it->second;*/
auto end = descriptions.end(); auto end = descriptions.end();
// English tends to be a good fallback when the requested language isn't available // English tends to be a good fallback when the requested language isn't available

6
Source/Core/Core/DSP/DSPAssembler.cpp
View File

@ -597,12 +597,6 @@ bool DSPAssembler::VerifyParams(const DSPOPCTemplate* opc, param_t* par, size_t
} }
} }
break; break;
/* case P_ACCM_D: //P_ACC_MID:
if ((int)par[i].val < 0x1e || (int)par[i].val > 0x1f)
{
ShowError(ERR_WRONG_PARAMETER_MID_ACC);
}
break;*/
} }
continue; continue;
} }

9
Source/Core/Core/DSP/Jit/x64/DSPEmitter.cpp
View File

@ -208,15 +208,6 @@ void DSPEmitter::Compile(u16 start_addr)
const u8* entryPoint = AlignCode16(); const u8* entryPoint = AlignCode16();
/*
// Check for other exceptions
if (dsp_SR_is_flag_set(SR_INT_ENABLE))
return;
if (g_dsp.exceptions == 0)
return;
*/
m_gpr.LoadRegs(); m_gpr.LoadRegs();
m_block_link_entry = GetCodePtr(); m_block_link_entry = GetCodePtr();

8
Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
View File

@ -379,14 +379,6 @@ void WiimoteDevice::ReceiveConnectionReq(u8 _Ident, u8* _pData, u32 _Size)
DEBUG_LOG(IOS_WIIMOTE, "[L2CAP] SendConnectionResponse"); DEBUG_LOG(IOS_WIIMOTE, "[L2CAP] SendConnectionResponse");
SendCommandToACL(_Ident, L2CAP_CONNECT_RSP, sizeof(l2cap_con_rsp_cp), (u8*)&Rsp); SendCommandToACL(_Ident, L2CAP_CONNECT_RSP, sizeof(l2cap_con_rsp_cp), (u8*)&Rsp);
// update state machine
/*
if (rChannel.PSM == L2CAP_PSM_HID_CNTL)
m_HIDControlChannel_Connected = true;
else if (rChannel.PSM == L2CAP_PSM_HID_INTR)
m_HIDInterruptChannel_Connected = true;
*/
} }
void WiimoteDevice::ReceiveConnectionResponse(u8 _Ident, u8* _pData, u32 _Size) void WiimoteDevice::ReceiveConnectionResponse(u8 _Ident, u8* _pData, u32 _Size)

24
Source/Core/Core/PowerPC/GDBStub.cpp
View File

@ -489,24 +489,6 @@ static void gdb_read_registers()
} }
bufptr += 32 * 8; bufptr += 32 * 8;
/*
for (i = 0; i < 32; i++)
{
wbe32hex(bufptr + i*8, riPS0(i));
}
bufptr += 32 * 8;
wbe32hex(bufptr, PC); bufptr += 4;
wbe32hex(bufptr, MSR); bufptr += 4;
wbe32hex(bufptr, PowerPC::GetCR()); bufptr += 4;
wbe32hex(bufptr, LR); bufptr += 4;
wbe32hex(bufptr, CTR); bufptr += 4;
wbe32hex(bufptr, PowerPC::ppcState.spr[SPR_XER]); bufptr += 4;
// MQ register not used.
wbe32hex(bufptr, 0x0BADC0DE); bufptr += 4;
*/
gdb_reply((char*)bfr); gdb_reply((char*)bfr);
} }
@ -839,12 +821,6 @@ void gdb_init(u32 port)
(sockaddr*)&saddr_client, &client_addrlen); (sockaddr*)&saddr_client, &client_addrlen);
saddr_client.sin_addr.s_addr = ntohl(saddr_client.sin_addr.s_addr); saddr_client.sin_addr.s_addr = ntohl(saddr_client.sin_addr.s_addr);
/*if (((saddr_client.sin_addr.s_addr >> 24) & 0xff) != 127 ||
* ((saddr_client.sin_addr.s_addr >> 16) & 0xff) != 0 ||
* ((saddr_client.sin_addr.s_addr >> 8) & 0xff) != 0 ||
* ((saddr_client.sin_addr.s_addr >> 0) & 0xff) != 1)
* ERROR_LOG(GDB_STUB, "gdb: incoming connection not from localhost");
*/
} }
static void gdb_init_generic(int domain, const sockaddr* server_addr, socklen_t server_addrlen, static void gdb_init_generic(int domain, const sockaddr* server_addr, socklen_t server_addrlen,

16
Source/Core/Core/PowerPC/PPCAnalyst.cpp
View File

@ -135,22 +135,6 @@ bool AnalyzeFunction(u32 startAddr, Symbol& func, int max_size)
func.flags |= FFLAG_STRAIGHT; func.flags |= FFLAG_STRAIGHT;
return true; return true;
} }
/*
else if ((instr.hex & 0xFC000000) == (0x4b000000 & 0xFC000000) && !instr.LK)
{
u32 target = addr + SignExt26(instr.LI << 2);
if (target < startAddr || (max_size && target > max_size+startAddr))
{
//block ends by branching away. We're done!
func.size *= 4; // into bytes
func.address = startAddr;
func.analyzed = 1;
func.hash = HashSignatureDB::ComputeCodeChecksum(startAddr, addr);
if (numInternalBranches == 0)
func.flags |= FFLAG_STRAIGHT;
return true;
}
}*/
else if (instr.hex == 0x4e800021 || instr.hex == 0x4e800420 || instr.hex == 0x4e800421) else if (instr.hex == 0x4e800021 || instr.hex == 0x4e800420 || instr.hex == 0x4e800421)
{ {
func.flags &= ~FFLAG_LEAF; func.flags &= ~FFLAG_LEAF;