Refactor send for better compilation (#19)

src/interpreter/Interpreter.cpp

@@ -137,34 +137,37 @@ void Interpreter::send(VMSymbol* signature, VMClass* receiverClass) {
         invokable->Invoke(this, GetFrame());
         bytecodeIndexGlobal = GetFrame()->GetBytecodeIndex();
     } else {
-        //doesNotUnderstand
-        long numberOfArgs = Signature::GetNumberOfArguments(signature);
+        triggerDoesNotUnderstand(signature);
+    }
+}
 
-        vm_oop_t receiver = GetFrame()->GetStackElement(numberOfArgs-1);
+void Interpreter::triggerDoesNotUnderstand(VMSymbol* signature) {
+    long numberOfArgs = Signature::GetNumberOfArguments(signature);
 
-        VMArray* argumentsArray = GetUniverse()->NewArray(numberOfArgs - 1); // without receiver
+    vm_oop_t receiver = GetFrame()->GetStackElement(numberOfArgs - 1);
 
-        // the receiver should not go into the argumentsArray
-        // so, numberOfArgs - 2
-        for (long i = numberOfArgs - 2; i >= 0; --i) {
-            vm_oop_t o = GetFrame()->Pop();
-            argumentsArray->SetIndexableField(i, o);
-        }
-        vm_oop_t arguments[] = {signature, argumentsArray};
-
-        GetFrame()->Pop(); // pop the receiver
+    VMArray* argumentsArray = GetUniverse()->NewArray(numberOfArgs - 1); // without receiver
 
-        //check if current frame is big enough for this unplanned Send
-        //doesNotUnderstand: needs 3 slots, one for this, one for method name, one for args
-        long additionalStackSlots = 3 - GetFrame()->RemainingStackSize();
-        if (additionalStackSlots > 0) {
-            GetFrame()->SetBytecodeIndex(bytecodeIndexGlobal);
-            //copy current frame into a bigger one and replace the current frame
-            SetFrame(VMFrame::EmergencyFrameFrom(GetFrame(), additionalStackSlots));
-        }
+    // the receiver should not go into the argumentsArray
+    // so, numberOfArgs - 2
+    for (long i = numberOfArgs - 2; i >= 0; --i) {
+        vm_oop_t o = GetFrame()->Pop();
+        argumentsArray->SetIndexableField(i, o);
+    }
+    vm_oop_t arguments[] = {signature, argumentsArray};
+
+    GetFrame()->Pop(); // pop the receiver
 
-        AS_OBJ(receiver)->Send(this, doesNotUnderstand, arguments, 2);
+    //check if current frame is big enough for this unplanned Send
+    //doesNotUnderstand: needs 3 slots, one for this, one for method name, one for args
+    long additionalStackSlots = 3 - GetFrame()->RemainingStackSize();
+    if (additionalStackSlots > 0) {
+        GetFrame()->SetBytecodeIndex(bytecodeIndexGlobal);
+        //copy current frame into a bigger one and replace the current frame
+        SetFrame(VMFrame::EmergencyFrameFrom(GetFrame(), additionalStackSlots));
     }
+
+    AS_OBJ(receiver)->Send(this, doesNotUnderstand, arguments, 2);
 }
 
 void Interpreter::doDup() {
@@ -278,8 +281,10 @@ void Interpreter::doSend(long bytecodeIndex) {
     int numOfArgs = Signature::GetNumberOfArguments(signature);
 
     vm_oop_t receiver = GetFrame()->GetStackElement(numOfArgs-1);
+
     assert(IsValidObject(receiver));
-    assert(dynamic_cast<VMClass*>(CLASS_OF(receiver)) != nullptr); // make sure it is really a class
+    // make sure it is really a class
+    assert(dynamic_cast<VMClass*>(CLASS_OF(receiver)) != nullptr);
 
     VMClass* receiverClass = CLASS_OF(receiver);
 

src/interpreter/Interpreter.h

@@ -77,7 +77,10 @@ class Interpreter {
 
     VMFrame* popFrame();
     void popFrameAndPushResult(vm_oop_t result);
+
     void send(VMSymbol* signature, VMClass* receiverClass);
+
+    void triggerDoesNotUnderstand(VMSymbol* signature);
 
     void doDup();
     void doPushLocal(long bytecodeIndex);

src/vm/IsValidObject.cpp

@@ -104,7 +104,7 @@ void obtain_vtables_of_known_classes(VMSymbol* className) {
     VMInteger* i  = new (GetHeap<HEAP_CLS>()) VMInteger(0);
     vt_integer    = *(void**) i;
 
-    VMMethod* mth = new (GetHeap<HEAP_CLS>()) VMMethod(0, 0, 0);
+    VMMethod* mth = new (GetHeap<HEAP_CLS>()) VMMethod(0, 0);
     vt_method     = *(void**) mth;
     vt_object     = *(void**) nilObject;
 

src/vmobjects/Signature.cpp

@@ -27,10 +27,6 @@
 #include "Signature.h"
 #include "VMSymbol.h"
 
-int Signature::GetNumberOfArguments(VMSymbol* sig) {
-    return sig->numberOfArgumentsOfSignature;
-}
-
 bool Signature::IsBinary(VMSymbol* sig) {
     return sig->numberOfArgumentsOfSignature == 2;
 }

src/vmobjects/Signature.h

@@ -28,13 +28,16 @@
 
 #include <stddef.h>
 #include <vmobjects/ObjectFormats.h>
+#include <vmobjects/VMSymbol.h>
 
 class Signature {
 public:
-    static int GetNumberOfArguments(VMSymbol* sig);
+    inline static int GetNumberOfArguments(VMSymbol* sig) {
+        return sig->numberOfArgumentsOfSignature;
+    }
+
     static bool IsBinary(VMSymbol* sig);
 
     static int DetermineNumberOfArguments(const char* sig, const size_t length);
     static bool IsBinary(const char* sig, const size_t length);
-
 };

src/vmobjects/VMFrame.cpp

@@ -227,14 +227,6 @@ void VMFrame::PrintStack() const {
     }
 }
 
-void VMFrame::ResetStackPointer() {
-    // arguments are stored in front of local variables
-    VMMethod* meth = GetMethod();
-    locals = arguments + meth->GetNumberOfArguments();
-    // Set the stack pointer to its initial value thereby clearing the stack
-    stack_ptr = locals + meth->GetNumberOfLocals() - 1;
-}
-
 void VMFrame::SetLocal(long index, long contextLevel, vm_oop_t value) {
     VMFrame* context = GetContextLevel(contextLevel);
     context->SetLocal(index, value);

src/vmobjects/VMFrame.h

@@ -27,6 +27,7 @@
  */
 
 #include <vmobjects/VMArray.h>
+#include <vmobjects/VMMethod.h>
 
 class Universe;
 
@@ -64,7 +65,14 @@ class VMFrame: public VMObject {
         store_ptr(*stack_ptr, obj);
     }
 
-    void ResetStackPointer();
+    void ResetStackPointer() {
+        // arguments are stored in front of local variables
+        VMMethod* meth = GetMethod();
+        locals = arguments + meth->GetNumberOfArguments();
+        // Set the stack pointer to its initial value thereby clearing the stack
+        stack_ptr = locals + meth->GetNumberOfLocals() - 1;
+    }
+
     inline long GetBytecodeIndex() const;
     inline void SetBytecodeIndex(long);
 

src/vmobjects/VMMethod.cpp

@@ -46,8 +46,8 @@ const long VMMethod::VMMethodNumberOfFields = 8;
 const long VMMethod::VMMethodNumberOfFields = 7;
 #endif
 
-VMMethod::VMMethod(long bcCount, long numberOfConstants, long nof) :
-        VMInvokable(nof + VMMethodNumberOfFields) {
+VMMethod::VMMethod(long bcCount, long numberOfConstants) :
+        VMInvokable(VMMethodNumberOfFields) {
 #ifdef UNSAFE_FRAME_OPTIMIZATION
     cachedFrame = nullptr;
 #endif

src/vmobjects/VMMethod.h

@@ -41,13 +41,20 @@ class VMMethod: public VMInvokable {
 public:
     typedef GCMethod Stored;
 
-    VMMethod(long bcCount, long numberOfConstants, long nof = 0);
+    VMMethod(long bcCount, long numberOfConstants);
 
-    inline  long      GetNumberOfLocals() const;
+    inline long GetNumberOfLocals() const {
+        return INT_VAL(load_ptr(numberOfLocals));
+    }
+
             void      SetNumberOfLocals(long nol);
             long      GetMaximumNumberOfStackElements() const;
             void      SetMaximumNumberOfStackElements(long stel);
-    inline  long      GetNumberOfArguments() const;
+
+    inline long GetNumberOfArguments() const {
+        return INT_VAL(load_ptr(numberOfArguments));
+    }
+
             void      SetNumberOfArguments(long);
             long      GetNumberOfBytecodes() const;
     virtual void      SetHolder(VMClass* hld);
@@ -111,14 +118,6 @@ class VMMethod: public VMInvokable {
     static const long VMMethodNumberOfFields;
 };
 
-inline long VMMethod::GetNumberOfLocals() const {
-    return INT_VAL(load_ptr(numberOfLocals));
-}
-
-inline long VMMethod::GetNumberOfArguments() const {
-    return INT_VAL(load_ptr(numberOfArguments));
-}
-
 void VMMethod::SetIndexableField(long idx, vm_oop_t item) {
     store_ptr(indexableFields[idx], item);
 }