[pypy-commit] lang-smalltalk storage: Renamed getbytecode() to fetch_next_bytecode()

[anton_gulenko]

Author: Anton Gulenko <anton.gulenko at googlemail.com>
Branch: storage
Changeset: r815:b398a1500d52
Date: 2014-05-12 12:59 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/b398a1500d52/

Log:	Renamed getbytecode() to fetch_next_bytecode()

diff --git a/spyvm/interpreter.py b/spyvm/interpreter.py
--- a/spyvm/interpreter.py
+++ b/spyvm/interpreter.py
@@ -469,7 +469,7 @@
 
     def extendedVariableTypeAndIndex(self):
         # AK please explain this method (a helper, I guess)
-        descriptor = self.getbytecode()
+        descriptor = self.fetch_next_bytecode()
         return ((descriptor >> 6) & 3), (descriptor & 63)
 
     def extendedPushBytecode(self, interp, current_bytecode):
@@ -505,7 +505,7 @@
         self.pop()
 
     def getExtendedSelectorArgcount(self):
-        descriptor = self.getbytecode()
+        descriptor = self.fetch_next_bytecode()
         return ((self.w_method().getliteral(descriptor & 31)),
                 (descriptor >> 5))
 
@@ -515,8 +515,8 @@
 
     def doubleExtendedDoAnythingBytecode(self, interp, current_bytecode):
         from spyvm import error
-        second = self.getbytecode()
-        third = self.getbytecode()
+        second = self.fetch_next_bytecode()
+        third = self.fetch_next_bytecode()
         opType = second >> 5
         if opType == 0:
             # selfsend
@@ -557,7 +557,7 @@
         return self._sendSuperSelector(w_selector, argcount, interp)
 
     def secondExtendedSendBytecode(self, interp, current_bytecode):
-        descriptor = self.getbytecode()
+        descriptor = self.fetch_next_bytecode()
         w_selector = self.w_method().getliteral(descriptor & 63)
         argcount = descriptor >> 6
         return self._sendSelfSelector(w_selector, argcount, interp)
@@ -567,7 +567,7 @@
 
     # closure bytecodes
     def pushNewArrayBytecode(self, interp, current_bytecode):
-        arraySize, popIntoArray = splitter[7, 1](self.getbytecode())
+        arraySize, popIntoArray = splitter[7, 1](self.fetch_next_bytecode())
         newArray = None
         if popIntoArray == 1:
            newArray = interp.space.wrap_list(self.pop_and_return_n(arraySize))
@@ -579,8 +579,8 @@
         raise MissingBytecode("experimentalBytecode")
 
     def _extract_index_and_temps(self):
-        index_in_array = self.getbytecode()
-        index_of_array = self.getbytecode()
+        index_in_array = self.fetch_next_bytecode()
+        index_of_array = self.fetch_next_bytecode()
         w_indirectTemps = self.gettemp(index_of_array)
         return index_in_array, w_indirectTemps
 
@@ -618,9 +618,9 @@
         self jump: blockSize
         """
         space = self.space
-        numArgs, numCopied = splitter[4, 4](self.getbytecode())
-        j = self.getbytecode()
-        i = self.getbytecode()
+        numArgs, numCopied = splitter[4, 4](self.fetch_next_bytecode())
+        j = self.fetch_next_bytecode()
+        i = self.fetch_next_bytecode()
         blockSize = (j << 8) | i
         #create new instance of BlockClosure
         w_closure = space.newClosure(self.w_self(), self.pc(), numArgs,
@@ -657,10 +657,10 @@
         self.jumpConditional(interp, False, self.shortJumpPosition(current_bytecode))
 
     def longUnconditionalJump(self, interp, current_bytecode):
-        self.jump((((current_bytecode & 7) - 4) << 8) + self.getbytecode())
+        self.jump((((current_bytecode & 7) - 4) << 8) + self.fetch_next_bytecode())
 
     def longJumpPosition(self, current_bytecode):
-        return ((current_bytecode & 3) << 8) + self.getbytecode()
+        return ((current_bytecode & 3) << 8) + self.fetch_next_bytecode()
 
     def longJumpIfTrue(self, interp, current_bytecode):
         self.jumpConditional(interp, True, self.longJumpPosition(current_bytecode))
@@ -852,7 +852,7 @@
 from rpython.rlib.unroll import unrolling_iterable
 unrolling_ranges = unrolling_iterable(BYTECODE_RANGES)
 def bytecode_step_translated(self, context):
-    bytecode = context.getbytecode()
+    bytecode = context.fetch_next_bytecode()
     for entry in unrolling_ranges:
         if len(entry) == 2:
             bc, methname = entry
diff --git a/spyvm/model.py b/spyvm/model.py
--- a/spyvm/model.py
+++ b/spyvm/model.py
@@ -1275,7 +1275,7 @@
         return 16 + self.islarge * 40 + self.argsize
     
     @constant_for_version_arg
-    def getbytecode(self, pc):
+    def fetch_next_bytecode(self, pc):
         assert pc >= 0 and pc < len(self.bytes)
         return self.bytes[pc]
     
diff --git a/spyvm/shadow.py b/spyvm/shadow.py
--- a/spyvm/shadow.py
+++ b/spyvm/shadow.py
@@ -794,10 +794,10 @@
         # XXX this is incorrect when there is subclassing
         return self._w_self_size
     
-    def getbytecode(self):
+    def fetch_next_bytecode(self):
         jit.promote(self._pc)
         assert self._pc >= 0
-        bytecode = self.w_method().getbytecode(self._pc)
+        bytecode = self.w_method().fetch_next_bytecode(self._pc)
         currentBytecode = ord(bytecode)
         self._pc += 1
         return currentBytecode
diff --git a/spyvm/test/test_interpreter.py b/spyvm/test/test_interpreter.py
--- a/spyvm/test/test_interpreter.py
+++ b/spyvm/test/test_interpreter.py
@@ -118,9 +118,9 @@
     assert s_frame.gettemp(2).is_nil(space)
     s_frame.settemp(2, w("spam"))
     assert s_frame.gettemp(2).as_string() == "spam"
-    assert s_frame.getbytecode() == ord("h")
-    assert s_frame.getbytecode() == ord("e")
-    assert s_frame.getbytecode() == ord("l")
+    assert s_frame.fetch_next_bytecode() == ord("h")
+    assert s_frame.fetch_next_bytecode() == ord("e")
+    assert s_frame.fetch_next_bytecode() == ord("l")
 
 def test_push_pop():
     _, frame = new_frame("")
diff --git a/spyvm/test/test_shadow.py b/spyvm/test/test_shadow.py
--- a/spyvm/test/test_shadow.py
+++ b/spyvm/test/test_shadow.py
@@ -162,11 +162,11 @@
                               # Point over 2 literals of size 4
     w_object = methodcontext(pc=13,method=w_m)
     s_object = w_object.as_methodcontext_get_shadow(space)
-    assert s_object.getbytecode() == 97
-    assert s_object.getbytecode() == 98
-    assert s_object.getbytecode() == 99
-    assert s_object.getbytecode() == 100
-    assert s_object.getbytecode() == 101
+    assert s_object.fetch_next_bytecode() == 97
+    assert s_object.fetch_next_bytecode() == 98
+    assert s_object.fetch_next_bytecode() == 99
+    assert s_object.fetch_next_bytecode() == 100
+    assert s_object.fetch_next_bytecode() == 101
     assert s_object.s_home() == s_object
 
 def assert_contains_nils(w_obj):