Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-02 11:43:31 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MIPS: Fix build so we can compile this again.

Browse Source
This commit is contained in:
Sacha 2015-10-29 02:46:07 +00:00
parent 76b96d8785
commit bbc4f64999
10 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/HLE/ReplaceTables.cpp
View File

@ -1032,7 +1032,7 @@ static int Hook_youkosohitsujimura_download_frame() {
#elif defined(_M_X64) || defined(_M_IX86)
#define JITFUNC(f) (&MIPSComp::Jit::f)
#elif defined(MIPS)
#define JITFUNC(f) (&MIPSComp::Jit::f)
#define JITFUNC(f) (&MIPSComp::MipsJit::f)
#else
#define JITFUNC(f) (&MIPSComp::FakeJit::f)
#endif

4
Core/MIPS/JitCommon/JitCommon.cpp
View File

@ -34,8 +34,10 @@ namespace MIPSComp {
ArmJit *jit;
#elif defined(ARM64)
Arm64Jit *jit;
#elif defined(_M_IX86) || defined(_M_X64) || defined(MIPS)
#elif defined(_M_IX86) || defined(_M_X64)
Jit *jit;
#elif defined(MIPS)
MipsJit *jit;
#else
FakeJit *jit;
#endif

4
Core/MIPS/MIPS.cpp
View File

@ -216,7 +216,7 @@ void MIPSState::Init() {
#elif defined(_M_IX86) || defined(_M_X64)
MIPSComp::jit = new MIPSComp::Jit(this);
#elif defined(MIPS)
MIPSComp::jit = new MIPSComp::Jit(this);
MIPSComp::jit = new MIPSComp::MipsJit(this);
#else
MIPSComp::jit = new MIPSComp::FakeJit(this);
#endif
@ -246,7 +246,7 @@ void MIPSState::UpdateCore(CPUCore desired) {
#elif defined(_M_IX86) || defined(_M_X64)
MIPSComp::jit = new MIPSComp::Jit(this);
#elif defined(MIPS)
MIPSComp::jit = new MIPSComp::Jit(this);
MIPSComp::jit = new MIPSComp::MipsJit(this);
#else
MIPSComp::jit = new MIPSComp::FakeJit(this);
#endif

5
Core/MIPS/MIPS/MipsJit.h
View File

@ -17,6 +17,9 @@
#pragma once
#include "Common/MipsEmitter.h"
using namespace MIPSGen;
#include "Core/MIPS/JitCommon/JitState.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "../MIPSVFPUUtils.h"
@ -123,6 +126,8 @@ public:
void Comp_ColorConv(MIPSOpcode op) {}
int Replace_fabsf() { return 0; }
void Comp_Vbfy(MIPSOpcode op) {}
JitBlockCache *GetBlockCache() { return &blocks; }
void ClearCache();

2
Core/MIPS/MIPSTables.cpp
View File

@ -88,7 +88,7 @@ struct MIPSInstruction {
#elif defined(_M_X64) || defined(_M_IX86)
#define JITFUNC(f) (&Jit::f)
#elif defined(MIPS)
#define JITFUNC(f) (&Jit::f)
#define JITFUNC(f) (&MipsJit::f)
#else
#define JITFUNC(f) (&FakeJit::f)
#endif

1
Core/MIPS/fake/FakeJit.cpp
View File

@ -29,6 +29,7 @@
#include "Core/MIPS/MIPSTables.h"
#include "Core/HLE/ReplaceTables.h"
#include "FakeEmitter.h"
#include "FakeJit.h"
#include "CPUDetect.h"

1
Core/MIPS/fake/FakeJit.h
View File

@ -17,6 +17,7 @@
#pragma once
#include "Common/FakeEmitter.h"
#include "Core/MIPS/JitCommon/JitState.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "../MIPSVFPUUtils.h"

2
GPU/Common/VertexDecoderCommon.cpp
View File

@ -1145,6 +1145,8 @@ std::string VertexDecoder::GetString(DebugShaderStringType stringType) {
lines = DisassembleArm64((const u8 *)jitted_, jittedSize_);
#elif defined(ARM)
lines = DisassembleArm2((const u8 *)jitted_, jittedSize_);
#elif defined(MIPS)
// No MIPS disassembler defined
#else
lines = DisassembleX86((const u8 *)jitted_, jittedSize_);
#endif

2
GPU/Common/VertexDecoderFake.cpp
View File

@ -93,7 +93,7 @@ static const JitLookup jitLookup[] = {
{&VertexDecoder::Step_Color5551Morph, &VertexDecoderJitCache::Jit_Color5551Morph},
};
JittedVertexDecoder VertexDecoderJitCache::Compile(const VertexDecoder &dec) {
JittedVertexDecoder VertexDecoderJitCache::Compile(const VertexDecoder &dec, int32_t *jittedSize) {
dec_ = &dec;
//const u8 *start = AlignCode16();

4
Qt/Core.pro
View File

@ -18,6 +18,10 @@ else:i86 {
SOURCES += $$P/Core/MIPS/x86/*.cpp
HEADERS += $$P/Core/MIPS/x86/*.h
}
else:mips {
SOURCES += $$P/Core/MIPS/MIPS/*.cpp
HEADERS += $$P/Core/MIPS/MIPS/*.h
}
else {
SOURCES += $$P/Core/MIPS/fake/*.cpp
HEADERS += $$P/Core/MIPS/fake/*.h