https://git.ruby-lang.org/ruby.git/commit/?id=e99e3daace

From e99e3daace542cbfd045ae76c435a4f6e163f1d5 Mon Sep 17 00:00:00 2001
From: Maxime Chevalier-Boisvert <maxime.chevalierboisvert@s...>
Date: Wed, 30 Sep 2020 13:32:15 -0400
Subject: Added jmp_ptr() to ujit_asm.h

---
 ujit_asm.c | 24 ++++++------------------
 ujit_asm.h |  1 +
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/ujit_asm.c b/ujit_asm.c
index 6a79e85854..d2f0c1484e 100644
--- a/ujit_asm.c
+++ b/ujit_asm.c
@@ -823,7 +823,8 @@ void cb_write_jcc_ptr(codeblock_t* cb, const char* mnem, uint8_t op0, uint8_t op https://github.com/ruby/ruby/blob/trunk/ujit_asm.c#L823
     //cb.writeASM(mnem, label);
 
     // Write the opcode
-    cb_write_byte(cb, op0);
+    if (op0 != 0xFF)
+        cb_write_byte(cb, op0);
     cb_write_byte(cb, op1);
 
     // Pointer to the end of this jump
@@ -1101,7 +1102,7 @@ void inc(codeblock_t* cb, x86opnd_t opnd) https://github.com/ruby/ruby/blob/trunk/ujit_asm.c#L1102
     );
 }
 
-/// jcc - Conditional relative jump to a label
+/// jcc - relative jumps to a label
 void ja  (codeblock_t* cb, size_t label_idx) { cb_write_jcc(cb, "ja"  , 0x0F, 0x87, label_idx); }
 void jae (codeblock_t* cb, size_t label_idx) { cb_write_jcc(cb, "jae" , 0x0F, 0x83, label_idx); }
 void jb  (codeblock_t* cb, size_t label_idx) { cb_write_jcc(cb, "jb"  , 0x0F, 0x82, label_idx); }
@@ -1132,8 +1133,9 @@ void jpe (codeblock_t* cb, size_t label_idx) { cb_write_jcc(cb, "jpe" , 0x0F, 0x https://github.com/ruby/ruby/blob/trunk/ujit_asm.c#L1133
 void jpo (codeblock_t* cb, size_t label_idx) { cb_write_jcc(cb, "jpo" , 0x0F, 0x8B, label_idx); }
 void js  (codeblock_t* cb, size_t label_idx) { cb_write_jcc(cb, "js"  , 0x0F, 0x88, label_idx); }
 void jz  (codeblock_t* cb, size_t label_idx) { cb_write_jcc(cb, "jz"  , 0x0F, 0x84, label_idx); }
+void jmp (codeblock_t* cb, size_t label_idx) { cb_write_jcc(cb, "jmp" , 0xFF, 0xE9, label_idx); }
 
-/// jcc - Conditional relative jump to a pointer (32-bit offset)
+/// jcc - relative jumps to a pointer (32-bit offset)
 void ja_ptr  (codeblock_t* cb, uint8_t* ptr) { cb_write_jcc_ptr(cb, "ja"  , 0x0F, 0x87, ptr); }
 void jae_ptr (codeblock_t* cb, uint8_t* ptr) { cb_write_jcc_ptr(cb, "jae" , 0x0F, 0x83, ptr); }
 void jb_ptr  (codeblock_t* cb, uint8_t* ptr) { cb_write_jcc_ptr(cb, "jb"  , 0x0F, 0x82, ptr); }
@@ -1164,21 +1166,7 @@ void jpe_ptr (codeblock_t* cb, uint8_t* ptr) { cb_write_jcc_ptr(cb, "jpe" , 0x0F https://github.com/ruby/ruby/blob/trunk/ujit_asm.c#L1166
 void jpo_ptr (codeblock_t* cb, uint8_t* ptr) { cb_write_jcc_ptr(cb, "jpo" , 0x0F, 0x8B, ptr); }
 void js_ptr  (codeblock_t* cb, uint8_t* ptr) { cb_write_jcc_ptr(cb, "js"  , 0x0F, 0x88, ptr); }
 void jz_ptr  (codeblock_t* cb, uint8_t* ptr) { cb_write_jcc_ptr(cb, "jz"  , 0x0F, 0x84, ptr); }
-
-/// jmp - Direct relative jump to label
-void jmp(codeblock_t* cb, size_t label_idx)
-{
-    //cb.writeASM(mnem, label);
-
-    /// Opcode for direct jump with relative 32-bit offset
-    cb_write_byte(cb, 0xE9);
-
-    // Add a reference to the label
-    cb_label_ref(cb, label_idx);
-
-    // Relative 32-bit offset to be patched
-    cb_write_int(cb, 0, 32);
-}
+void jmp_ptr (codeblock_t* cb, uint8_t* ptr) { cb_write_jcc_ptr(cb, "jmp" , 0xFF, 0xE9, ptr); }
 
 /// jmp - Indirect jump near to an R/M operand
 void jmp_rm(codeblock_t* cb, x86opnd_t opnd)
diff --git a/ujit_asm.h b/ujit_asm.h
index 707c56cb2a..8bb408f9f1 100644
--- a/ujit_asm.h
+++ b/ujit_asm.h
@@ -333,6 +333,7 @@ void jpo_ptr(codeblock_t* cb, uint8_t* ptr); https://github.com/ruby/ruby/blob/trunk/ujit_asm.h#L333
 void js_ptr(codeblock_t* cb, uint8_t* ptr);
 void jz_ptr(codeblock_t* cb, uint8_t* ptr);
 void jmp(codeblock_t* cb, size_t label_idx);
+void jmp_ptr(codeblock_t* cb, uint8_t* ptr);
 void jmp_rm(codeblock_t* cb, x86opnd_t opnd);
 void jmp32(codeblock_t* cb, int32_t offset);
 void lea(codeblock_t* cb, x86opnd_t dst, x86opnd_t src);
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/