1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Complete sketch for guard_object_is_heap

Browse Source
This commit is contained in:
Maxime Chevalier-Boisvert 2022-05-12 14:31:17 -04:00 committed by Takashi Kokubun
parent 884cbaabd9
commit 5021f26b4b
No known key found for this signature in database
GPG Key ID: 6FFC433B12EE23DD
1 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
yjit/src/ir.rs
View File

@ -8,32 +8,6 @@ use crate::virtualmem::{CodePtr};
use crate::asm::x86_64::{X86Opnd, X86Imm, X86UImm, X86Reg, X86Mem, RegType}; use crate::asm::x86_64::{X86Opnd, X86Imm, X86UImm, X86Reg, X86Mem, RegType};
use crate::core::{Context, Type, TempMapping}; use crate::core::{Context, Type, TempMapping};
/*
// Minimally, we might want to specify how many operands and branch targets an insn has
// Branch targets are not interchangeable with other operand types. We distinguish
// between branch and regular instructions.
//
// TODO: should mark instructions that produce no output operand
//
make_ops! {
(Comment, 1, 0),
...
// Call is variadic, might need to be special-cased
}
*/
/// Instruction opcodes /// Instruction opcodes
#[derive(Copy, Clone, PartialEq, Eq, Debug)] #[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub enum Op pub enum Op
@ -80,8 +54,12 @@ pub enum Op
// Bitwise AND test instruction // Bitwise AND test instruction
Test, Test,
// Jump if not zero // Compare two operands
Cmp,
// Low-level conditional jump instructions
Jnz, Jnz,
Jbe,
/* /*
// The following are conditional jump instructions. They all accept as their // The following are conditional jump instructions. They all accept as their
@ -128,12 +106,6 @@ pub enum Op
// be returned from the generated function. // be returned from the generated function.
RetVal, RetVal,
// A low-level cmp instruction. It accepts two operands. The first it
// expects to be a register. The second can be anything. Most of the time
// this instruction shouldn't be used by the developer since other
// instructions break down to this one.
Cmp,
// A conditional move instruction that should be preceeded at some point by // A conditional move instruction that should be preceeded at some point by
// an OP_CMP instruction that would have set the requisite comparison flags. // an OP_CMP instruction that would have set the requisite comparison flags.
// Accepts 2 operands, both of which are expected to be of the EIR_REG type. // Accepts 2 operands, both of which are expected to be of the EIR_REG type.
@ -195,15 +167,6 @@ pub enum Op
*/ */
} }
// Register value used by IR operands // Register value used by IR operands
#[derive(Copy, Clone, PartialEq, Eq, Debug)] #[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub struct Reg pub struct Reg
@ -418,6 +381,11 @@ impl Assembler
{ {
self.push_insn(Op::Jnz, vec![], Some(target)); self.push_insn(Op::Jnz, vec![], Some(target));
} }
fn jbe(&mut self, target: Target)
{
self.push_insn(Op::Jbe, vec![], Some(target));
}
} }
macro_rules! def_push_2_opnd { macro_rules! def_push_2_opnd {
@ -447,8 +415,9 @@ macro_rules! def_push_2_opnd_no_out {
def_push_2_opnd!(add, Op::Add); def_push_2_opnd!(add, Op::Add);
def_push_2_opnd!(sub, Op::Sub); def_push_2_opnd!(sub, Op::Sub);
def_push_2_opnd!(and, Op::And); def_push_2_opnd!(and, Op::And);
def_push_2_opnd_no_out!(test, Op::Test);
def_push_2_opnd_no_out!(mov, Op::Mov); def_push_2_opnd_no_out!(mov, Op::Mov);
def_push_2_opnd_no_out!(cmp, Op::Cmp);
def_push_2_opnd_no_out!(test, Op::Test);
// NOTE: these methods are temporary and will likely move // NOTE: these methods are temporary and will likely move
// to context.rs later // to context.rs later
@ -496,12 +465,12 @@ mod tests {
asm.comment("guard object is heap"); asm.comment("guard object is heap");
// Test that the object is not an immediate // Test that the object is not an immediate
asm.test(object_opnd, Opnd::UImm(RUBY_IMMEDIATE_MASK as u64)); asm.test(object_opnd.clone(), Opnd::UImm(RUBY_IMMEDIATE_MASK as u64));
asm.jnz(Target::CodePtr(side_exit)); asm.jnz(Target::CodePtr(side_exit));
// Test that the object is not false or nil // Test that the object is not false or nil
//cmp(cb, object_opnd, uimm_opnd(Qnil.into())); asm.cmp(object_opnd.clone(), Opnd::UImm(Qnil.into()));
//jbe_ptr(cb, side_exit); asm.jbe(Target::CodePtr(side_exit));
} }
#[test] #[test]