Qt, gcc, and Symbian buildfixes.

This commit is contained in:
Unknown W. Brackets 2016-05-08 14:06:42 -07:00
parent 52517ab609
commit 5dbac165f4
3 changed files with 6 additions and 5 deletions

View File

@ -57,10 +57,10 @@ public:
void SetInstructions(const std::vector<IRInst> &inst, const std::vector<u32> &constants) {
instr_ = new IRInst[inst.size()];
numInstructions_ = (u16)inst.size();
memcpy(instr_, inst.data(), sizeof(IRInst) * inst.size());
memcpy(instr_, &inst[0], sizeof(IRInst) * inst.size());
const_ = new u32[constants.size()];
numConstants_ = (u16)constants.size();
memcpy(const_, constants.data(), sizeof(u32) * constants.size());
memcpy(const_, &constants[0], sizeof(u32) * constants.size());
}
const IRInst *GetInstructions() const { return instr_; }
@ -85,13 +85,13 @@ public:
void InvalidateICache(u32 addess, u32 length);
int GetNumBlocks() const { return (int)blocks_.size(); }
int AllocateBlock(int emAddr) {
blocks_.emplace_back(IRBlock(emAddr));
blocks_.push_back(IRBlock(emAddr));
size_ = (int)blocks_.size();
return (int)blocks_.size() - 1;
}
IRBlock *GetBlock(int i) {
if (i >= 0 && i < size_) {
return blocks_.data() + i;
return &blocks_[i];
} else {
return nullptr;
}

View File

@ -1,3 +1,4 @@
#include <cstring>
#include "Core/MIPS/IR/IRRegCache.h"
#include "Core/MIPS/IR/IRInst.h"

View File

@ -87,7 +87,7 @@ private slots:
// Options
// Core
void dynarecAct() { g_Config.bJit = !g_Config.bJit; }
void dynarecAct() { g_Config.iCpuCore = g_Config.iCpuCore == CPU_CORE_INTERPRETER ? CPU_CORE_JIT : CPU_CORE_INTERPRETER; }
void vertexDynarecAct() { g_Config.bVertexDecoderJit = !g_Config.bVertexDecoderJit; }
void fastmemAct() { g_Config.bFastMemory = !g_Config.bFastMemory; }
void ignoreIllegalAct() { g_Config.bIgnoreBadMemAccess = !g_Config.bIgnoreBadMemAccess; }