T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #614: Implement a debug trap;

Browse Source
This commit is contained in:
Benjamin Bouvier
2018-12-05 17:30:22 +01:00
committed by Dan Gohman
parent f065b39d65
commit 93696a80bb
4 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cranelift/filetests/isa/x86/binary64.clif
View File

@@ -784,6 +784,9 @@ ebb1:
; asm: jnbe .+4; ud2 ; asm: jnbe .+4; ud2
trapif ule v11, user0 ; bin: 77 02 user0 0f 0b trapif ule v11, user0 ; bin: 77 02 user0 0f 0b
; Debug trap.
debugtrap ; bin: cc
; Stack check. ; Stack check.
; asm: cmpq %rsp, %rcx ; asm: cmpq %rsp, %rcx
[-,%rflags] v40 = ifcmp_sp v1 ; bin: 48 39 e1 [-,%rflags] v40 = ifcmp_sp v1 ; bin: 48 39 e1

4
lib/codegen/meta-python/base/instructions.py
View File

@@ -181,6 +181,10 @@ indirect_jump_table_br = Instruction(
ins=(addr, JT), ins=(addr, JT),
is_branch=True, is_indirect_branch=True, is_terminator=True) is_branch=True, is_indirect_branch=True, is_terminator=True)
debugtrap = Instruction('debugtrap', r"""
Encodes an assembly debug trap.
""", can_load=True, can_store=True, other_side_effects=True)
code = Operand('code', trapcode) code = Operand('code', trapcode)
trap = Instruction( trap = Instruction(
'trap', r""" 'trap', r"""

5
lib/codegen/meta-python/isa/x86/encodings.py
View File

@@ -521,12 +521,17 @@ X86_32.enc(base.jump_table_base.i32, *r.jt_base(0x8d))
enc_x86_64(base.indirect_jump_table_br.i64, r.indirect_jmp, 0xff, rrr=4) enc_x86_64(base.indirect_jump_table_br.i64, r.indirect_jmp, 0xff, rrr=4)
X86_32.enc(base.indirect_jump_table_br.i32, *r.indirect_jmp(0xff, rrr=4)) X86_32.enc(base.indirect_jump_table_br.i32, *r.indirect_jmp(0xff, rrr=4))
# #
# Trap as ud2 # Trap as ud2
# #
X86_32.enc(base.trap, *r.trap(0x0f, 0x0b)) X86_32.enc(base.trap, *r.trap(0x0f, 0x0b))
X86_64.enc(base.trap, *r.trap(0x0f, 0x0b)) X86_64.enc(base.trap, *r.trap(0x0f, 0x0b))
# Debug trap as int3
X86_32.enc(base.debugtrap, r.debugtrap, 0)
X86_64.enc(base.debugtrap, r.debugtrap, 0)
# Using a standard EncRecipe, not the TailRecipe. # Using a standard EncRecipe, not the TailRecipe.
X86_32.enc(base.trapif, r.trapif, 0) X86_32.enc(base.trapif, r.trapif, 0)
X86_64.enc(base.trapif, r.trapif, 0) X86_64.enc(base.trapif, r.trapif, 0)

5
lib/codegen/meta-python/isa/x86/recipes.py
View File

@@ -295,6 +295,11 @@ def valid_scale(iform):
# copies and no-op conversions. # copies and no-op conversions.
null = EncRecipe('null', Unary, base_size=0, ins=GPR, outs=0, emit='') null = EncRecipe('null', Unary, base_size=0, ins=GPR, outs=0, emit='')
debugtrap = EncRecipe('debugtrap', NullAry, base_size=1, ins=(), outs=(),
emit='''
sink.put1(0xcc);
''')
# XX opcode, no ModR/M. # XX opcode, no ModR/M.
trap = TailRecipe( trap = TailRecipe(
'trap', Trap, base_size=0, ins=(), outs=(), 'trap', Trap, base_size=0, ins=(), outs=(),