jit_buffer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17d82de5bc85b557ddb89f5d01b704a6187e008398a1436e373cd32e32cd538b
-  data.tar.gz: 4f483b84a8aa058607d5f30dfd8bac8bd93d9de3081ba2f76876f08ba354c39b
+  metadata.gz: 4be349fa4c465e35b8ef2bd1af1c80d26591146805978803b77ce24487c10724
+  data.tar.gz: 175b24a10629507a105dd34670c1eae51537ceccc2eae60c3fc907a9c16ffb33
 SHA512:
-  metadata.gz: ee5b84588512a0c383c10c083f7d6df4af529a7d6a681f0cb5f971ef5414d0fbf3bf4a2d543108d6238e9a25452270aeb6c62115fc940f7fcb3a47da2eec4045
-  data.tar.gz: 5a9d7aefc064cf02b1f2dbc49e859d39daf0a779302f390e462da08972416fe8b335c410ab08c11f0f5bcbfd9b40a51b4a62085714261a96a67b5808163327dd
+  metadata.gz: 23302857f3b5646d1c403cfbced18a4f7a98e8af0b93c070a9bc5a0e7c112be3a59bfbfad1952c41991213ad626becc4a36b43ca5040a751518c9d1c23d66be2
+  data.tar.gz: 22690c0bbbc23340c6bbfce56399861834d8960337180f2cc25cfeddee2573887da491aa9e92daf985617b42c30e5e816b2ce38e7564e7bef4c0b42af4331989

data/Rakefile

@@ -6,6 +6,3 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
   t.warning = true
 end
-
-require 'rake/extensiontask'
-Rake::ExtensionTask.new("jit_buffer")

data/jit_buffer.gemspec

@@ -18,10 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.require_paths = ["lib"]
-  spec.extensions = ["ext/jit_buffer/extconf.rb"]
 
   spec.add_development_dependency "rake", '~> 13.0'
-  spec.add_development_dependency "rake-compiler", '~> 1.1'
   spec.add_development_dependency "minitest", '~> 5.15'
   spec.add_dependency "fiddle", '~> 1.1'
 end

data/lib/jit_buffer.rb

@@ -1,4 +1,3 @@
-require "jit_buffer.so"
 require "fiddle"
 
 class Fiddle::Function
@@ -9,7 +8,7 @@ class Fiddle::Function
 end unless Fiddle::Function.method_defined?(:to_proc)
 
 class JITBuffer
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   class Exception < StandardError
   end
@@ -23,6 +22,20 @@ class JITBuffer
   module MMAP
     include Fiddle
 
+    PROT_READ   = 0x01
+    PROT_WRITE  = 0x02
+    PROT_EXEC   = 0x04
+
+    MAP_PRIVATE = 0x02
+
+    if RUBY_PLATFORM =~ /darwin/
+      MAP_ANON    = 0x1000
+      MAP_JIT     = 0x800
+    else
+      MAP_ANON    = 0x20
+      MAP_JIT     = 0x0
+    end
+
     def self.make_function name, args, ret
       ptr = Handle::DEFAULT[name]
       func = Function.new ptr, args, ret, name: name
@@ -42,17 +55,42 @@ class JITBuffer
 
     make_function "mprotect", [TYPE_VOIDP, TYPE_SIZE_T, TYPE_INT], TYPE_INT
 
+    begin
+      make_function "pthread_jit_write_protect_np", [TYPE_INT], TYPE_VOID
+      make_function "sys_icache_invalidate", [TYPE_VOIDP, -TYPE_INT], TYPE_VOID
+    rescue Fiddle::DLError
+    end
+
     def self.mmap_buffer size
       ptr = mmap 0, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON | MAP_JIT, -1, 0
       ptr.size = size
       ptr
     end
+
+    if respond_to?(:pthread_jit_write_protect_np)
+      # MacOS
+      def self.set_writeable ptr
+        MMAP.pthread_jit_write_protect_np 0
+      end
+
+      def self.set_executable ptr
+        MMAP.pthread_jit_write_protect_np 1
+        MMAP.sys_icache_invalidate ptr, ptr.size
+      end
+    else
+      # Linux
+      def self.set_writeable ptr
+        MMAP.mprotect ptr, ptr.size, PROT_READ | PROT_WRITE
+      end
+
+      def self.set_executable ptr
+        MMAP.mprotect ptr, ptr.size, PROT_READ | PROT_EXEC
+      end
+    end
   end
 
   def self.new size
-    x = super(MMAP.mmap_buffer(size), size)
-    MMAP.pthread_jit_write_protect_np(true)
-    x
+    super(MMAP.mmap_buffer(size), size)
   end
 
   attr_reader :pos
@@ -62,6 +100,7 @@ class JITBuffer
     @memory = memory
     @size   = size
     @pos    = 0
+    executable!
   end
 
   def putc byte
@@ -101,13 +140,12 @@ class JITBuffer
   end
 
   def executable!
-    MMAP.pthread_jit_write_protect_np true
-    MMAP.sys_icache_invalidate @memory.to_i, @size
+    MMAP.set_executable @memory.to_i
     @writeable = false
   end
 
   def writeable!
-    MMAP.pthread_jit_write_protect_np false
+    MMAP.set_writeable @memory.to_i
     @writeable = true
   end
 

data/test/jit_buffer_test.rb

@@ -46,18 +46,21 @@ class JITBufferTest < Minitest::Test
 
   def test_execute
     jit = JITBuffer.new 4096
-    insns = [
-      movz(0, 42),
-      ret
-    ].pack("L<L<")
+
+    bytes = [0x48, 0xc7, 0xc0, 0x2b, 0x00, 0x00, 0x00, # x86_64 mov rax, 0x2b
+             0xc3,                                     # x86_64 ret
+             0xeb, 0xf6,                               # x86 jmp
+             0x80, 0xd2,                               # ARM movz X11, 0x7b7
+             0x60, 0x05, 0x80, 0xd2,                   # ARM movz X0, #0x2b
+             0xc0, 0x03, 0x5f, 0xd6]                   # ARM ret
 
     jit.writeable!
 
-    jit.write insns
+    jit.write bytes.pack("C*")
 
     jit.executable!
-    func = jit.to_function([], Fiddle::TYPE_INT)
-    assert_equal 42, func.call
+    func = Fiddle::Function.new(jit.to_i + 8, [], Fiddle::TYPE_INT)
+    assert_equal 43, func.call
   end
 
   def test_invalid_write
@@ -116,18 +119,4 @@ class JITBufferTest < Minitest::Test
     jit = JITBuffer.new 4096
     assert jit.to_i
   end
-
-  # ARM instructions
-  def movz reg, imm
-    insn = 0b0_10_100101_00_0000000000000000_00000
-    insn |= (1 << 31)  # 64 bit
-    insn |= (imm << 5) # immediate
-    insn |= reg        # reg
-  end
-
-  def ret xn = 30
-    insn = 0b1101011_0_0_10_11111_0000_0_0_00000_00000
-    insn |= (xn << 5)
-    insn
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jit_buffer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Aaron Patterson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -70,8 +56,7 @@ description: A JIT Buffer object for Ruby.
 email:
 - tenderlove@ruby-lang.org
 executables: []
-extensions:
-- ext/jit_buffer/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - CODE_OF_CONDUCT.md
@@ -79,8 +64,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- ext/jit_buffer/extconf.rb
-- ext/jit_buffer/jit_buffer.c
 - jit_buffer.gemspec
 - lib/jit_buffer.rb
 - test/helper.rb
@@ -89,7 +72,7 @@ homepage: https://github.com/tenderlove/jit_buffer
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -104,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: A JIT Buffer object for Ruby.
 test_files:

data/ext/jit_buffer/extconf.rb

@@ -1,10 +0,0 @@
-require 'mkmf'
-
-raise unless have_header "sys/mman.h"
-
-have_const 'MAP_JIT', 'sys/mman.h'
-
-have_func 'pthread_jit_write_protect_np'
-have_func 'sys_icache_invalidate'
-
-create_makefile('jit_buffer')

data/ext/jit_buffer/jit_buffer.c

@@ -1,59 +0,0 @@
-#include <ruby.h>
-#include <sys/mman.h>
-#include <mach/vm_prot.h>
-#include <mach/mach_init.h>
-#include <pthread.h>
-
-#if HAVE_SYS_ICACHE_INVALIDATE
-#include <libkern/OSCacheControl.h>
-#endif
-
-#if HAVE_PTHREAD_JIT_WRITE_PROTECT_NP
-static VALUE
-rb_pthread_jit_write_protect_np(VALUE mod, VALUE v)
-{
-    if (RTEST(v)) {
-        pthread_jit_write_protect_np(1);
-    }
-    else {
-        pthread_jit_write_protect_np(0);
-    }
-
-    return Qnil;
-}
-#endif
-
-#if HAVE_SYS_ICACHE_INVALIDATE
-static VALUE
-rb_sys_icache_invalidate(VALUE mod, VALUE addr, VALUE len)
-{
-    sys_icache_invalidate((void *)(NUM2ULONG(addr)), NUM2INT(len));
-
-    return Qnil;
-}
-#endif
-
-void Init_jit_buffer() {
-    VALUE rb_cJITBuffer = rb_define_class("JITBuffer", rb_cObject);
-    VALUE rb_mMMap = rb_define_module_under(rb_cJITBuffer, "MMAP");
-
-    rb_define_const(rb_mMMap, "PROT_READ", INT2NUM(PROT_READ));
-    rb_define_const(rb_mMMap, "PROT_WRITE", INT2NUM(PROT_WRITE));
-    rb_define_const(rb_mMMap, "PROT_EXEC", INT2NUM(PROT_EXEC));
-    rb_define_const(rb_mMMap, "VM_PROT_COPY", INT2NUM(VM_PROT_COPY));
-    rb_define_const(rb_mMMap, "VM_PROT_READ", INT2NUM(VM_PROT_READ));
-    rb_define_const(rb_mMMap, "VM_PROT_EXECUTE", INT2NUM(VM_PROT_EXECUTE));
-    rb_define_const(rb_mMMap, "MAP_PRIVATE", INT2NUM(MAP_PRIVATE));
-    rb_define_const(rb_mMMap, "MAP_ANON", INT2NUM(MAP_ANON));
-#if HAVE_CONST_MAP_JIT
-    rb_define_const(rb_mMMap, "MAP_JIT", INT2NUM(MAP_JIT));
-#endif
-
-#if HAVE_PTHREAD_JIT_WRITE_PROTECT_NP
-    rb_define_module_function(rb_mMMap, "pthread_jit_write_protect_np", rb_pthread_jit_write_protect_np, 1);
-#endif
-
-#if HAVE_SYS_ICACHE_INVALIDATE
-    rb_define_module_function(rb_mMMap, "sys_icache_invalidate", rb_sys_icache_invalidate, 2);
-#endif
-}