Cleanup some old breakpoint cruft

rubinius · Sep 2, 2010 · 8fdb4a4 · 8fdb4a4
1 parent 903d16d
commit 8fdb4a4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 77 deletions.
diff --git a/vm/builtin/compiledmethod.cpp b/vm/builtin/compiledmethod.cpp
@@ -234,8 +234,12 @@ namespace rubinius {
     int i = ip->to_native();
     if(backend_method_ == NULL) return Qfalse;
     if(!backend_method_->validate_ip(state, i)) return Primitives::failure();
-    if(backend_method_->get_breakpoint_flags(state, i) == cBreakpoint)
-      return Qtrue;
+    if(breakpoints_->nil_p()) return Qfalse;
+
+    bool found = false;
+    breakpoints_->fetch(state, ip, &found);
+
+    if(found) return Qtrue;
     return Qfalse;
   }
 

diff --git a/vm/test/test_vmmethod.hpp b/vm/test/test_vmmethod.hpp
@@ -72,50 +72,4 @@ class TestVMMethod : public CxxTest::TestSuite, public VMTest {
     TS_ASSERT_EQUALS(vmm->validate_ip(state, 1), false);
     TS_ASSERT_EQUALS(vmm->validate_ip(state, 2), true);
   }
-
-  void test_set_breakpoint_flags() {
-    CompiledMethod* cm = CompiledMethod::create(state);
-    Tuple* tup = Tuple::from(state, 1, state->symbol("@blah"));
-    cm->literals(state, tup);
-
-    InstructionSequence* iseq = InstructionSequence::create(state, 3);
-    iseq->opcodes()->put(state, 0, Fixnum::from(InstructionSequence::insn_push_ivar));
-    iseq->opcodes()->put(state, 1, Fixnum::from(0));
-    iseq->opcodes()->put(state, 2, Fixnum::from(InstructionSequence::insn_push_nil));
-
-    cm->iseq(state, iseq);
-
-    VMMethod* vmm = new VMMethod(state, cm);
-
-    vmm->set_breakpoint_flags(state, 0, 1 << 24);
-    TS_ASSERT_EQUALS(vmm->opcodes[0], (1U << 24) | static_cast<unsigned int>(InstructionSequence::insn_push_ivar));
-
-    vmm->set_breakpoint_flags(state, 0, 7 << 24);
-    TS_ASSERT_EQUALS(vmm->opcodes[0], (7U << 24) | static_cast<unsigned int>(InstructionSequence::insn_push_ivar));
-
-    vmm->set_breakpoint_flags(state, 0, 0);
-    TS_ASSERT_EQUALS(vmm->opcodes[0], static_cast<unsigned int>(InstructionSequence::insn_push_ivar));
-
-    vmm->set_breakpoint_flags(state, 1, 1);
-    TS_ASSERT_EQUALS(vmm->opcodes[1], 0U);
-  }
-
-  void test_get_breakpoint_flags() {
-    CompiledMethod* cm = CompiledMethod::create(state);
-    Tuple* tup = Tuple::from(state, 1, state->symbol("@blah"));
-    cm->literals(state, tup);
-
-    InstructionSequence* iseq = InstructionSequence::create(state, 3);
-    iseq->opcodes()->put(state, 0, Fixnum::from(InstructionSequence::insn_push_ivar));
-    iseq->opcodes()->put(state, 1, Fixnum::from(0));
-    iseq->opcodes()->put(state, 2, Fixnum::from(4 << 24 | InstructionSequence::insn_push_nil));
-
-    cm->iseq(state, iseq);
-
-    VMMethod* vmm = new VMMethod(state, cm);
-
-    TS_ASSERT_EQUALS(vmm->get_breakpoint_flags(state, 0), 0U);
-    TS_ASSERT_EQUALS(vmm->get_breakpoint_flags(state, 2), (4U << 24));
-    TS_ASSERT_EQUALS(vmm->get_breakpoint_flags(state, 1), 0U);
-  }
 };
diff --git a/vm/vmmethod.cpp b/vm/vmmethod.cpp
@@ -655,24 +655,4 @@ namespace rubinius {
     }
     return ip == iter.position();
   }
-
-  /*
-   * Sets breakpoint flags on the specified opcode.
-   */
-  void VMMethod::set_breakpoint_flags(STATE, size_t ip, bpflags flags) {
-    if(validate_ip(state, ip)) {
-      opcodes[ip] &= cBreakpointMask;    // Clear the high byte
-      opcodes[ip] |= flags & ~cBreakpointMask;
-    }
-  }
-
-  /*
-   * Gets breakpoint flags on the specified opcode.
-   */
-  bpflags VMMethod::get_breakpoint_flags(STATE, size_t ip) {
-    if(validate_ip(state, ip)) {
-      return opcodes[ip] & ~cBreakpointMask;
-    }
-    return 0;
-  }
 }
diff --git a/vm/vmmethod.hpp b/vm/vmmethod.hpp
@@ -25,12 +25,6 @@ namespace rubinius {
 
   typedef std::list<Object**> IndirectLiterals;
 
-  // Breakpoint flags are set in the high byte of an opcode
-  const bpflags cBreakpoint = 1 << 24;
-  const bpflags cBreakAfterSend = 1 << 25;
-
-  const unsigned int cBreakpointMask = 0x00ffffff;
-
   class CompiledMethod;
   class MethodContext;
   class SendSite;
@@ -124,7 +118,7 @@ namespace rubinius {
 #endif
 
     void update_addresses(int index, int operands=0) {
-      addresses[index] = instructions[opcodes[index] & cBreakpointMask];
+      addresses[index] = instructions[opcodes[index]];
       switch(operands) {
       case 2:
         addresses[index + 2] = reinterpret_cast<void*>(opcodes[index + 2]);
@@ -211,8 +205,6 @@ namespace rubinius {
     void setup_argument_handler(CompiledMethod* meth);
 
     bool validate_ip(STATE, size_t ip);
-    void set_breakpoint_flags(STATE, size_t ip, bpflags flags);
-    bpflags get_breakpoint_flags(STATE, size_t ip);
 
     void fill_opcodes(STATE, CompiledMethod* original);
     void initialize_caches(STATE, CompiledMethod* original, int sends);