From a7127745f197807a8eeda3a6a34b9a0eee4a2c71 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Thu, 20 Jul 2023 11:54:47 -0700
Subject: [PATCH] Get rid of obsoleted __bp__ references

---
 misc/gdb.py         | 10 +++++-----
 yjit/src/codegen.rs |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/misc/gdb.py b/misc/gdb.py
index 85507fb540..96d7c3cafb 100644
--- a/misc/gdb.py
+++ b/misc/gdb.py
@@ -65,14 +65,14 @@ class CFP(gdb.Command):
         self.print_stack(cfp, -1, self.frame_types(cfp, -1))
         print()
 
-        stack_size = int((self.get_int(f'{cfp}->sp') - self.get_int(f'{cfp}->__bp__')) / 8)
+        stack_size = int((self.get_int(f'{cfp}->sp') - self.get_int(f'vm_base_ptr({cfp})')) / 8)
         print(f'Stack (size={stack_size}):')
         for i in range(0, stack_size):
             self.print_stack(cfp, i, self.rp(cfp, i))
         print(self.regs(cfp, stack_size))
 
     def print_stack(self, cfp, bp_index, content):
-        address = self.get_int(f'{cfp}->__bp__ + {bp_index}')
+        address = self.get_int(f'vm_base_ptr({cfp}) + {bp_index}')
         value = self.get_value(cfp, bp_index)
         regs = self.regs(cfp, bp_index)
         if content:
@@ -81,9 +81,9 @@ class CFP(gdb.Command):
         print('{:2} 0x{:x} [{}] {}(0x{:x})'.format(regs, address, bp_index, content, value))
 
     def regs(self, cfp, bp_index):
-        address = self.get_int(f'{cfp}->__bp__ + {bp_index}')
+        address = self.get_int(f'vm_base_ptr({cfp}) + {bp_index}')
         regs = []
-        for reg, field in { 'EP': 'ep', 'BP': '__bp__', 'SP': 'sp' }.items():
+        for reg, field in { 'EP': 'ep', 'SP': 'sp' }.items():
             if address == self.get_int(f'{cfp}->{field}'):
                 regs.append(reg)
         return ' '.join(regs)
@@ -119,7 +119,7 @@ class CFP(gdb.Command):
         return ' | '.join(types)
 
     def get_value(self, cfp, bp_index):
-        return self.get_int(f'{cfp}->__bp__[{bp_index}]')
+        return self.get_int(f'vm_base_ptr({cfp})[{bp_index}]')
 
     def get_int(self, expr):
         return int(self.get_string(f'printf "%ld", ({expr})'))
diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs
index ea421ee725..c8c29630ce 100644
--- a/yjit/src/codegen.rs
+++ b/yjit/src/codegen.rs
@@ -4841,7 +4841,6 @@ fn gen_push_frame(
     //    .self       = recv,
     //    .ep         = <sp - 1>,
     //    .block_code = 0,
-    //    .__bp__     = sp,
     // };
     asm.comment("push callee control frame");