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

Special casing some VC++ traps.

Browse Source
This commit is contained in:
Ben Vanik
2014-07-08 16:01:40 -07:00
parent ef75042f38
commit 2a68a1b35b
7 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/alloy/backend/ivm/ivm_intcode.cc
View File

@@ -309,8 +309,15 @@ int Translate_DEBUG_BREAK_TRUE(TranslationContext& ctx, Instr* i) {
}
uint32_t IntCode_TRAP(IntCodeState& ics, const IntCode* i) {
// 0x0FE00014 is a 'debug print' where r3 = buffer r4 = length
// TODO(benvanik): post software interrupt to debugger.
switch (i->flags) {
case 20:
// 0x0FE00014 is a 'debug print' where r3 = buffer r4 = length
break;
case 22:
// Always trap?
break;
}
__debugbreak();
return IA_NEXT;
}

21
src/alloy/backend/x64/x64_emitter.cc
View File

@@ -219,10 +219,23 @@ void X64Emitter::DebugBreak() {
db(0xCC);
}
void X64Emitter::Trap() {
// 0x0FE00014 is a 'debug print' where r3 = buffer r4 = length
// TODO(benvanik): post software interrupt to debugger.
db(0xCC);
void X64Emitter::Trap(uint16_t trap_type) {
switch (trap_type) {
case 20:
// 0x0FE00014 is a 'debug print' where r3 = buffer r4 = length
// TODO(benvanik): debug print at runtime.
break;
case 0:
case 22:
// Always trap?
// TODO(benvanik): post software interrupt to debugger.
db(0xCC);
break;
default:
XELOGW("Unknown trap type %d", trap_type);
db(0xCC);
break;
}
}
void X64Emitter::UnimplementedInstr(const hir::Instr* i) {

2
src/alloy/backend/x64/x64_emitter.h
View File

@@ -117,7 +117,7 @@ public:
void MarkSourceOffset(const hir::Instr* i);
void DebugBreak();
void Trap();
void Trap(uint16_t trap_type = 0);
void UnimplementedInstr(const hir::Instr* i);
void UnimplementedExtern(const hir::Instr* i);

14
src/alloy/backend/x64/x64_sequences.cc
View File

@@ -191,7 +191,7 @@ EMITTER_OPCODE_TABLE(
// ============================================================================
EMITTER(TRAP, MATCH(I<OPCODE_TRAP, VoidOp>)) {
static void Emit(X64Emitter& e, const EmitArgType& i) {
e.Trap();
e.Trap(i.instr->flags);
}
};
EMITTER_OPCODE_TABLE(
@@ -207,7 +207,7 @@ EMITTER(TRAP_TRUE_I8, MATCH(I<OPCODE_TRAP_TRUE, VoidOp, I8<>>)) {
e.test(i.src1, i.src1);
Xbyak::Label skip;
e.jz(skip);
e.Trap();
e.Trap(i.instr->flags);
e.L(skip);
}
};
@@ -216,7 +216,7 @@ EMITTER(TRAP_TRUE_I16, MATCH(I<OPCODE_TRAP_TRUE, VoidOp, I16<>>)) {
e.test(i.src1, i.src1);
Xbyak::Label skip;
e.jz(skip);
e.Trap();
e.Trap(i.instr->flags);
e.L(skip);
}
};
@@ -225,7 +225,7 @@ EMITTER(TRAP_TRUE_I32, MATCH(I<OPCODE_TRAP_TRUE, VoidOp, I32<>>)) {
e.test(i.src1, i.src1);
Xbyak::Label skip;
e.jz(skip);
e.Trap();
e.Trap(i.instr->flags);
e.L(skip);
}
};
@@ -234,7 +234,7 @@ EMITTER(TRAP_TRUE_I64, MATCH(I<OPCODE_TRAP_TRUE, VoidOp, I64<>>)) {
e.test(i.src1, i.src1);
Xbyak::Label skip;
e.jz(skip);
e.Trap();
e.Trap(i.instr->flags);
e.L(skip);
}
};
@@ -243,7 +243,7 @@ EMITTER(TRAP_TRUE_F32, MATCH(I<OPCODE_TRAP_TRUE, VoidOp, F32<>>)) {
e.vptest(i.src1, i.src1);
Xbyak::Label skip;
e.jz(skip);
e.Trap();
e.Trap(i.instr->flags);
e.L(skip);
}
};
@@ -252,7 +252,7 @@ EMITTER(TRAP_TRUE_F64, MATCH(I<OPCODE_TRAP_TRUE, VoidOp, F64<>>)) {
e.vptest(i.src1, i.src1);
Xbyak::Label skip;
e.jz(skip);
e.Trap();
e.Trap(i.instr->flags);
e.L(skip);
}
};