OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-24 07:31:03 +00:00
Code Issues Projects Releases Wiki Activity

Rebase fixes

Browse Source
This commit is contained in:
Dani Messerman 2015-05-10 22:44:17 +03:00
parent 03527aba71
commit aa830b5cf3
6 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/nihstro vendored

@ -1 +1 @@
Subproject commit 4a78588b308564f7ebae193e0ae00d9a0d5741d5 Subproject commit 81f1804a43f625e3a1a20752c0db70a413410380

1
src/binary_translation/CodeGen.cpp
View File

@ -2,6 +2,7 @@
#include "ModuleGen.h" #include "ModuleGen.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "common/logging/log.h"
#include <llvm/Support/TargetSelect.h> #include <llvm/Support/TargetSelect.h>
#include <llvm/Support/Host.h> #include <llvm/Support/Host.h>

1
src/binary_translation/ModuleGen.cpp
View File

@ -5,6 +5,7 @@
#include "Instructions/Instruction.h" #include "Instructions/Instruction.h"
#include "Instructions/Types.h" #include "Instructions/Types.h"
#include "InstructionBlock.h" #include "InstructionBlock.h"
#include "common/logging/log.h"
#include <llvm/IR/Function.h> #include <llvm/IR/Function.h>
#include <llvm/IR/GlobalVariable.h> #include <llvm/IR/GlobalVariable.h>
#include <stack> #include <stack>

2
src/core/arm/dyncom/arm_dyncom_interpreter.cpp
View File

@ -3687,7 +3687,7 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
Common::Profiling::ScopeTimer timer_execute(profile_execute); Common::Profiling::ScopeTimer timer_execute(profile_execute);
#if ENABLE_BINARY_TRANSLATION #if ENABLE_BINARY_TRANSLATION
BinaryTranslationLoader::SetCpuState(state); BinaryTranslationLoader::SetCpuState(cpu);
#endif #endif
#undef RM #undef RM

1
src/core/binary_translation/BinaryTranslationLoader.cpp
View File

@ -1,5 +1,6 @@
#include "BinaryTranslationLoader.h" #include "BinaryTranslationLoader.h"
#include "core/arm/skyeye_common/armdefs.h" #include "core/arm/skyeye_common/armdefs.h"
#include "common/logging/log.h"
#include <llvm/Support/TargetSelect.h> #include <llvm/Support/TargetSelect.h>
#include <llvm/ADT/STLExtras.h> #include <llvm/ADT/STLExtras.h>
#include <llvm/Support/MemoryBuffer.h> #include <llvm/Support/MemoryBuffer.h>

1
src/core/binary_translation/BinaryTranslationLoader.h
View File

@ -1,4 +1,3 @@
#include "common/common.h"
#include "common/file_util.h" #include "common/file_util.h"
#include <memory> #include <memory>