thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More signed compare warnings.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-03-02 14:58:58 -08:00
parent a3f93ed203
commit 62ab4b7f51
8 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Core/HLE/sceKernelThread.cpp
View file

@ -155,22 +155,21 @@ struct ThreadWaitInfo {
class MipsCallManager {
public:
MipsCallManager() : idGen_(0) {}
int add(MipsCall *call) {
int id = genId();
u32 add(MipsCall *call) {
u32 id = genId();
calls_.insert(std::pair<int, MipsCall *>(id, call));
return id;
}
MipsCall *get(int id) {
MipsCall *get(u32 id) {
return calls_[id];
}
MipsCall *pop(int id) {
MipsCall *pop(u32 id) {
MipsCall *temp = calls_[id];
calls_.erase(id);
return temp;
}
void clear() {
std::map<int, MipsCall *>::iterator it, end;
for (it = calls_.begin(), end = calls_.end(); it != end; ++it) {
for (auto it = calls_.begin(), end = calls_.end(); it != end; ++it) {
delete it->second;
}
calls_.clear();
@ -204,10 +203,10 @@ public:
}
private:
int genId() { return ++idGen_; }
std::map<int, MipsCall *> calls_;
u32 genId() { return ++idGen_; }
std::map<u32, MipsCall *> calls_;
std::vector<ActionCreator> types_;
int idGen_;
u32 idGen_;
};
class ActionAfterMipsCall : public Action
@ -425,7 +424,7 @@ public:
std::set<SceUID> registeredCallbacks[THREAD_CALLBACK_NUM_TYPES];
std::list<SceUID> readyCallbacks[THREAD_CALLBACK_NUM_TYPES];
std::list<int> pendingMipsCalls;
std::list<u32> pendingMipsCalls;
u32 stackBlock;
};
@ -492,7 +491,7 @@ struct ThreadList
}
};
void __KernelExecuteMipsCallOnCurrentThread(int callId, bool reschedAfter);
void __KernelExecuteMipsCallOnCurrentThread(u32 callId, bool reschedAfter);
Thread *__KernelCreateThread(SceUID &id, SceUID moduleID, const char *name, u32 entryPoint, u32 priority, int stacksize, u32 attr);
@ -1757,7 +1756,7 @@ int sceKernelTerminateDeleteThread(int threadno)
}
}
int sceKernelTerminateThread(u32 threadID)
int sceKernelTerminateThread(SceUID threadID)
{
if (threadID != currentThread)
{
@ -2256,7 +2255,7 @@ void Thread::setReturnValue(u32 retval)
{
if (this->GetUID() == currentThread) {
if (g_inCbCount) {
int callId = this->currentCallbackId;
u32 callId = this->currentCallbackId;
MipsCall *call = mipsCalls.get(callId);
if (call) {
call->setReturnValue(retval);
@ -2342,7 +2341,7 @@ ThreadWaitInfo Thread::getWaitInfo()
void __KernelSwitchContext(Thread *target, const char *reason)
{
u32 oldPC = 0;
u32 oldUID = 0;
SceUID oldUID = 0;
const char *oldName = "(none)";
Thread *cur = __GetCurrentThread();
@ -2448,7 +2447,7 @@ void __KernelCallAddress(Thread *thread, u32 entryPoint, Action *afterAction, co
call->tag = "callAddress";
call->cbId = cbId;
int callId = mipsCalls.add(call);
u32 callId = mipsCalls.add(call);
bool called = false;
if (!thread || thread == __GetCurrentThread()) {
@ -2475,7 +2474,7 @@ void __KernelDirectMipsCall(u32 entryPoint, Action *afterAction, u32 args[], int
__KernelCallAddress(__GetCurrentThread(), entryPoint, afterAction, args, numargs, reschedAfter, 0);
}
void __KernelExecuteMipsCallOnCurrentThread(int callId, bool reschedAfter)
void __KernelExecuteMipsCallOnCurrentThread(u32 callId, bool reschedAfter)
{
Thread *cur = __GetCurrentThread();
if (cur == NULL)
@ -2524,7 +2523,7 @@ void __KernelReturnFromMipsCall()
return;
}
int callId = cur->currentCallbackId;
u32 callId = cur->currentCallbackId;
if (currentMIPS->r[MIPS_REG_CALL_ID] != callId)
WARN_LOG(HLE, "__KernelReturnFromMipsCall(): s0 is %08x != %08x", currentMIPS->r[MIPS_REG_CALL_ID], callId);
@ -2576,7 +2575,7 @@ bool __KernelExecutePendingMipsCalls(bool reschedAfter)
if (__CanExecuteCallbackNow(thread))
{
// Pop off the first pending mips call
int callId = thread->pendingMipsCalls.front();
u32 callId = thread->pendingMipsCalls.front();
thread->pendingMipsCalls.pop_front();
__KernelExecuteMipsCallOnCurrentThread(callId, reschedAfter);
return true;