diff options
| -rw-r--r-- | lib/ruby_vm/mjit/assembler.rb | 19 | ||||
| -rw-r--r-- | lib/ruby_vm/mjit/compiler.rb | 2 |
2 files changed, 14 insertions, 7 deletions
diff --git a/lib/ruby_vm/mjit/assembler.rb b/lib/ruby_vm/mjit/assembler.rb index adf7fd1821..c8d9da9f2d 100644 --- a/lib/ruby_vm/mjit/assembler.rb +++ b/lib/ruby_vm/mjit/assembler.rb @@ -17,7 +17,7 @@ module RubyVM::MJIT class ModRM < Data.define(:mod, :reg, :rm); end Mod00 = 0b00 # Mod 00: [reg] Mod01 = 0b01 # Mod 01: [reg]+disp8 - Mod10 = 0b10 # Mod 10: [reg]+disp16 + Mod10 = 0b10 # Mod 10: [reg]+disp32 Mod11 = 0b11 # Mod 11: reg # REX = 0100WR0B @@ -212,6 +212,16 @@ module RubyVM::MJIT mod_rm: ModRM[mod: Mod01, reg: dst_reg, rm: src_reg], disp: src_disp, ) + # MOV r64, r/m64 (Mod 10: [reg]+disp16) + in [Symbol => src_reg, Integer => src_disp] if r64?(dst_reg) && r64?(src_reg) && imm32?(src_disp) + # REX.W + 8B /r + # RM: Operand 1: ModRM:reg (w), Operand 2: ModRM:r/m (r) + insn( + prefix: REX_W, + opcode: 0x8b, + mod_rm: ModRM[mod: Mod10, reg: dst_reg, rm: src_reg], + disp: imm32(src_disp), + ) # MOV r64, r/m64 (Mod 11: reg) in Symbol => src_reg if r64?(dst_reg) && r64?(src_reg) # REX.W + 8B /r @@ -473,10 +483,7 @@ module RubyVM::MJIT @bytes.push(mod_rm_byte) end if disp - unless imm8?(disp) # TODO: support displacement in 2 or 4 bytes as well - raise NotImplementedError, "not-implemented disp: #{disp}" - end - @bytes.push(disp) + @bytes.push(*Array(disp)) end if imm @bytes.push(*imm) @@ -583,7 +590,7 @@ module RubyVM::MJIT end def imm64?(imm) - (-0x8000_0000_0000_0000..0x7fff_ffff_ffff_ffff).include?(imm) # TODO: consider uimm + (-0x8000_0000_0000_0000..0xffff_ffff_ffff_ffff).include?(imm) end def r32?(reg) diff --git a/lib/ruby_vm/mjit/compiler.rb b/lib/ruby_vm/mjit/compiler.rb index 6a461fd580..5daa006aff 100644 --- a/lib/ruby_vm/mjit/compiler.rb +++ b/lib/ruby_vm/mjit/compiler.rb @@ -168,7 +168,7 @@ module RubyVM::MJIT # # @param asm [RubyVM::MJIT::Assembler] def compile_prologue(asm) - asm.comment('MJIT entry') + asm.comment('MJIT entry point') # Save callee-saved registers used by JITed code asm.push(CFP) |