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

Only create the shared return block if required.

This commit is contained in:
Ben Vanik 2013-05-25 00:45:16 -07:00
parent da62ec56f9
commit ed401449b7
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/xenia/cpu/x64/x64_emitter.cc
View File

@ -231,7 +231,7 @@ int X64Emitter::MakeFunction(FunctionSymbol* symbol) {
symbol_ = symbol; symbol_ = symbol;
fn_block_ = NULL; fn_block_ = NULL;
return_block_ = c.newLabel(); return_block_ = Label();
internal_indirection_block_ = Label(); internal_indirection_block_ = Label();
external_indirection_block_ = Label(); external_indirection_block_ = Label();
@ -425,16 +425,18 @@ FunctionBlock* X64Emitter::fn_block() {
void X64Emitter::GenerateSharedBlocks() { void X64Emitter::GenerateSharedBlocks() {
X86Compiler& c = compiler_; X86Compiler& c = compiler_;
// Create a return block. // Create a return block, if it was used.
// This spills registers and returns. All non-tail returns should branch if (return_block_.getId() != kInvalidValue) {
// here to do the return and ensure registers are spilled. // This spills registers and returns. All non-tail returns should branch
// This will be moved to the end after all the other blocks are created. // here to do the return and ensure registers are spilled.
if (FLAGS_annotate_disassembly) { // This will be moved to the end after all the other blocks are created.
c.comment("Shared return block"); if (FLAGS_annotate_disassembly) {
c.comment("Shared return block");
}
c.bind(return_block_);
SpillRegisters();
c.ret();
} }
c.bind(return_block_);
SpillRegisters();
c.ret();
// Build indirection block on demand. // Build indirection block on demand.
// We have already prepped all basic blocks, so we can build these tables now. // We have already prepped all basic blocks, so we can build these tables now.
@ -616,6 +618,11 @@ void X64Emitter::GenerateBasicBlock(FunctionBlock* block) {
} }
Label& X64Emitter::GetReturnLabel() { Label& X64Emitter::GetReturnLabel() {
X86Compiler& c = compiler_;
// Implicit creation on first use.
if (return_block_.getId() == kInvalidValue) {
return_block_ = c.newLabel();
}
return return_block_; return return_block_;
} }
@ -632,6 +639,8 @@ int X64Emitter::CallFunction(FunctionSymbol* target_symbol,
// If the target function was small we could try to make the whole thing now. // If the target function was small we could try to make the whole thing now.
PrepareFunction(target_symbol); PrepareFunction(target_symbol);
SpillRegisters();
uint64_t target_ptr = (uint64_t)target_symbol->impl_value; uint64_t target_ptr = (uint64_t)target_symbol->impl_value;
XEASSERTNOTNULL(target_ptr); XEASSERTNOTNULL(target_ptr);