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

Clean out includes from regular JitCommon.

This commit is contained in:
Lioncash 2013-10-18 01:55:16 -04:00
parent 3360ec013f
commit 80b4cb6cf3
7 changed files with 32 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp
View File

@ -2,24 +2,13 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "x64ABI.h"
#include "CPUDetect.h"
#include "x64Emitter.h"
#include "../../HW/Memmap.h"
#include "../PowerPC.h"
#include "../../CoreTiming.h"
#include "MemoryUtil.h"
#include "x64ABI.h"
#include "../JitCommon/JitCache.h"
#include "../../HW/GPFifo.h"
#include "../../Core.h"
#include "JitAsmCommon.h" #include "JitAsmCommon.h"
#include "JitBase.h" #include "JitBase.h"
#include "CPUDetect.h"
#include "MemoryUtil.h"
#define QUANTIZED_REGS_TO_SAVE (ABI_ALL_CALLEE_SAVED & ~((1 << RAX) | (1 << RCX) | (1 << RDX) | \ #define QUANTIZED_REGS_TO_SAVE (ABI_ALL_CALLEE_SAVED & ~((1 << RAX) | (1 << RCX) | (1 << RDX) | \
(1 << XMM0) | (1 << XMM1))) (1 << XMM0) | (1 << XMM1)))
@ -150,7 +139,8 @@ static void WriteDual32(u32 address)
} }
// See comment in header for in/outs. // See comment in header for in/outs.
void CommonAsmRoutines::GenQuantizedStores() { void CommonAsmRoutines::GenQuantizedStores()
{
const u8* storePairedIllegal = AlignCode4(); const u8* storePairedIllegal = AlignCode4();
UD2(); UD2();
const u8* storePairedFloat = AlignCode4(); const u8* storePairedFloat = AlignCode4();
@ -289,7 +279,8 @@ void CommonAsmRoutines::GenQuantizedStores() {
} }
// See comment in header for in/outs. // See comment in header for in/outs.
void CommonAsmRoutines::GenQuantizedSingleStores() { void CommonAsmRoutines::GenQuantizedSingleStores()
{
const u8* storeSingleIllegal = AlignCode4(); const u8* storeSingleIllegal = AlignCode4();
UD2(); UD2();
@ -365,7 +356,8 @@ void CommonAsmRoutines::GenQuantizedSingleStores() {
singleStoreQuantized[7] = storeSingleS16; singleStoreQuantized[7] = storeSingleS16;
} }
void CommonAsmRoutines::GenQuantizedLoads() { void CommonAsmRoutines::GenQuantizedLoads()
{
const u8* loadPairedIllegal = AlignCode4(); const u8* loadPairedIllegal = AlignCode4();
UD2(); UD2();

2
Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h
View File

@ -5,7 +5,7 @@
#ifndef _JITASMCOMMON_H #ifndef _JITASMCOMMON_H
#define _JITASMCOMMON_H #define _JITASMCOMMON_H
#include "../JitCommon/Jit_Util.h" #include "Jit_Util.h"
class CommonAsmRoutinesBase { class CommonAsmRoutinesBase {
public: public:

10
Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp
View File

@ -6,14 +6,8 @@
#include "Common.h" #include "Common.h"
#include "disasm.h" #include "disasm.h"
#include "../JitCommon/JitBase.h" #include "JitBase.h"
#include "../JitCommon/JitBackpatch.h" #include "JitBackpatch.h"
#include "../../HW/Memmap.h"
#include "x64Emitter.h"
#include "x64ABI.h"
#include "x64Analyzer.h"
#include "StringUtil.h" #include "StringUtil.h"
#ifdef _WIN32 #ifdef _WIN32

14
Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
View File

@ -9,11 +9,21 @@
//#define JIT_LOG_GPR // Enables logging of the PPC general purpose regs //#define JIT_LOG_GPR // Enables logging of the PPC general purpose regs
//#define JIT_LOG_FPR // Enables logging of the PPC floating point regs //#define JIT_LOG_FPR // Enables logging of the PPC floating point regs
#include "../CPUCoreBase.h" #include "JitAsmCommon.h"
#include "JitCache.h" #include "JitCache.h"
#include "Jit_Util.h" // for EmuCodeBlock #include "Jit_Util.h" // for EmuCodeBlock
#include "JitBackpatch.h" // for EmuCodeBlock #include "JitBackpatch.h" // for EmuCodeBlock
#include "JitAsmCommon.h" #include "x64ABI.h"
#include "x64Analyzer.h"
#include "x64Emitter.h"
#include "../CPUCoreBase.h"
#include "../PowerPC.h"
#include "../PPCAnalyst.h"
#include "../PPCTables.h"
#include "../../Core.h"
#include "../../CoreTiming.h"
#include "../../HW/GPFifo.h"
#include "../../HW/Memmap.h"
#include <set> #include <set>

16
Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp
View File

@ -15,22 +15,12 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "../../Core.h"
#include "MemoryUtil.h"
#include "../../HW/Memmap.h"
#include "../JitInterface.h"
#include "../../CoreTiming.h"
#include "../PowerPC.h"
#include "../PPCTables.h"
#include "../PPCAnalyst.h"
#include "JitCache.h"
#include "JitBase.h" #include "JitBase.h"
#include "MemoryUtil.h"
#include "disasm.h" #include "disasm.h"
#include "../JitInterface.h"
#if defined USE_OPROFILE && USE_OPROFILE #if defined USE_OPROFILE && USE_OPROFILE
#include <opagent.h> #include <opagent.h>

7
Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
View File

@ -5,13 +5,6 @@
#include "Common.h" #include "Common.h"
#include "CPUDetect.h" #include "CPUDetect.h"
#include "../PowerPC.h"
#include "../../Core.h"
#include "../../HW/GPFifo.h"
#include "../../HW/Memmap.h"
#include "../PPCTables.h"
#include "x64Emitter.h"
#include "x64ABI.h"
#include "JitBase.h" #include "JitBase.h"
#include "Jit_Util.h" #include "Jit_Util.h"

3
Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h
View File

@ -9,7 +9,8 @@
#include <unordered_map> #include <unordered_map>
// Like XCodeBlock but has some utilities for memory access. // Like XCodeBlock but has some utilities for memory access.
class EmuCodeBlock : public Gen::XCodeBlock { class EmuCodeBlock : public Gen::XCodeBlock
{
public: public:
void UnsafeLoadRegToReg(Gen::X64Reg reg_addr, Gen::X64Reg reg_value, int accessSize, s32 offset = 0, bool signExtend = false); void UnsafeLoadRegToReg(Gen::X64Reg reg_addr, Gen::X64Reg reg_value, int accessSize, s32 offset = 0, bool signExtend = false);
void UnsafeLoadRegToRegNoSwap(Gen::X64Reg reg_addr, Gen::X64Reg reg_value, int accessSize, s32 offset); void UnsafeLoadRegToRegNoSwap(Gen::X64Reg reg_addr, Gen::X64Reg reg_value, int accessSize, s32 offset);