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

--inline_mmio_access to allow turning it off.

This commit is contained in:
Ben Vanik 2015-08-03 19:07:34 -07:00
parent b0425f7ee2
commit 90c248146e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xenia/cpu/compiler/passes/constant_propagation_pass.cc
View File

@ -9,11 +9,15 @@
#include "xenia/cpu/compiler/passes/constant_propagation_pass.h" #include "xenia/cpu/compiler/passes/constant_propagation_pass.h"
#include <gflags/gflags.h>
#include "xenia/base/assert.h" #include "xenia/base/assert.h"
#include "xenia/cpu/function.h" #include "xenia/cpu/function.h"
#include "xenia/cpu/processor.h" #include "xenia/cpu/processor.h"
#include "xenia/profiling.h" #include "xenia/profiling.h"
DEFINE_bool(inline_mmio_access, true, "Inline constant MMIO loads and stores.");
namespace xe { namespace xe {
namespace cpu { namespace cpu {
namespace compiler { namespace compiler {
@ -180,14 +184,14 @@ bool ConstantPropagationPass::Run(HIRBuilder* builder) {
auto address = i->src1.value->constant.i32; auto address = i->src1.value->constant.i32;
auto mmio_range = auto mmio_range =
processor_->memory()->LookupVirtualMappedRange(address); processor_->memory()->LookupVirtualMappedRange(address);
if (mmio_range) { if (FLAGS_inline_mmio_access && mmio_range) {
i->Replace(&OPCODE_LOAD_MMIO_info, 0); i->Replace(&OPCODE_LOAD_MMIO_info, 0);
i->src1.offset = reinterpret_cast<uint64_t>(mmio_range); i->src1.offset = reinterpret_cast<uint64_t>(mmio_range);
i->src2.offset = address; i->src2.offset = address;
} else { } else {
auto heap = memory->LookupHeap(address); auto heap = memory->LookupHeap(address);
uint32_t protect; uint32_t protect;
if (heap->QueryProtect(address, &protect) && if (heap && heap->QueryProtect(address, &protect) &&
!(protect & kMemoryProtectWrite) && !(protect & kMemoryProtectWrite) &&
(protect & kMemoryProtectRead)) { (protect & kMemoryProtectRead)) {
// Memory is readonly - can just return the value. // Memory is readonly - can just return the value.
@ -206,7 +210,7 @@ bool ConstantPropagationPass::Run(HIRBuilder* builder) {
} }
break; break;
case OPCODE_STORE: case OPCODE_STORE:
if (i->src1.value->IsConstant()) { if (FLAGS_inline_mmio_access && i->src1.value->IsConstant()) {
auto address = i->src1.value->constant.i32; auto address = i->src1.value->constant.i32;
auto mmio_range = auto mmio_range =
processor_->memory()->LookupVirtualMappedRange(address); processor_->memory()->LookupVirtualMappedRange(address);