fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various fixes.

Browse Source
This commit is contained in:
Ben Vanik
2014-01-28 23:51:40 -08:00
parent 0ec8e32861
commit bdee924494
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/alloy/backend/x64/lowering/lowering_sequences.cc
View File

@@ -189,7 +189,7 @@ void IssueCall(X64Emitter& e, FunctionInfo* symbol_info, uint32_t flags) {
}
if (flags & CALL_TAIL) {
// TODO(benvanik): adjust stack?
e.add(e.rsp, 0x40);
e.add(e.rsp, 72);
e.jmp(e.rax);
} else {
e.call(e.rax);
@@ -210,7 +210,7 @@ void IssueCallIndirect(X64Emitter& e, Value* target, uint32_t flags) {
e.mov(e.rdx, e.qword[e.rcx + 8]); // membase
if (flags & CALL_TAIL) {
// TODO(benvanik): adjust stack?
e.add(e.rsp, 0x40);
e.add(e.rsp, 72);
e.jmp(e.rax);
} else {
e.call(e.rax);
@@ -2844,8 +2844,16 @@ table->AddSequence(OPCODE_COMPARE_EXCHANGE, [](X64Emitter& e, Instr*& i) {
});
table->AddSequence(OPCODE_ATOMIC_EXCHANGE, [](X64Emitter& e, Instr*& i) {
if (IsIntType(i->dest->type)) {
UNIMPLEMENTED_SEQ();
if (i->dest->type == INT32_TYPE) {
// dest = old_value = InterlockedExchange(src1 = address, src2 = new_value);
Reg32 dest, src2;
Reg64 src1;
e.BeginOp(i->dest, dest, REG_DEST,
i->src1.value, src1, 0,
i->src2.value, src2, 0);
e.mov(dest, src2);
e.xchg(e.dword[src1], dest);
e.EndOp(dest, src1, src2);
} else {
ASSERT_INVALID_TYPE();
}

8
src/alloy/backend/x64/lowering/op_utils.inl
View File

@@ -17,6 +17,8 @@ namespace {
#define LIKE_REG(dest, like) Reg(dest.getIdx(), dest.getKind(), like.getBit(), false)
#define NAX_LIKE(like) Reg(e.rax.getIdx(), e.rax.getKind(), like.getBit(), false)
#define STASH_OFFSET 48
// If we are running with tracing on we have to store the EFLAGS in the stack,
// otherwise our calls out to C to print will clear it before DID_CARRY/etc
// can get the value.
@@ -24,7 +26,7 @@ namespace {
void LoadEflags(X64Emitter& e) {
#if STORE_EFLAGS
e.mov(e.eax, e.dword[e.rsp + 40]);
e.mov(e.eax, e.dword[e.rsp + STASH_OFFSET]);
e.push(e.ax);
e.popf();
#else
@@ -34,7 +36,7 @@ void LoadEflags(X64Emitter& e) {
void StoreEflags(X64Emitter& e) {
#if STORE_EFLAGS
e.pushf();
e.pop(e.word[e.rsp + 40]);
e.pop(e.word[e.rsp + STASH_OFFSET]);
#else
// EFLAGS should have CA set?
// (so long as we don't fuck with it)
@@ -43,7 +45,7 @@ void StoreEflags(X64Emitter& e) {
Address Stash(X64Emitter& e, const Xmm& r) {
// TODO(benvanik): ensure aligned.
auto addr = e.ptr[e.rsp + 48];
auto addr = e.ptr[e.rsp + STASH_OFFSET];
e.movups(addr, r);
return addr;
}