From bdd4a3d6ad89491b5848af2785775064c6f2ad9e Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Sun, 14 Sep 2014 21:26:30 +0300
Subject: [PATCH] just checking which part of unimplemented i hit

---
 lib/ast/basic_expressions.rb       |  2 +-
 lib/ast/call_site_expression.rb    |  2 +-
 lib/register/set_implementation.rb | 41 ++++++++++++++++++++++--------
 lib/virtual/instruction.rb         |  2 ++
 lib/virtual/send_implementation.rb |  8 +++---
 5 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/lib/ast/basic_expressions.rb b/lib/ast/basic_expressions.rb
index 834b3990..e7c52806 100644
--- a/lib/ast/basic_expressions.rb
+++ b/lib/ast/basic_expressions.rb
@@ -64,7 +64,7 @@ module Ast
 
     def compile method , message
       to = Virtual::Return.new(Virtual::Reference)
-      clazz = ::Virtual::BootSpace.space.get_or_create_class name
+      clazz = Virtual::BootSpace.space.get_or_create_class name
       raise "uups #{clazz}.#{name}" unless clazz
       method.add_code Virtual::Set.new( to , clazz )
       to
diff --git a/lib/ast/call_site_expression.rb b/lib/ast/call_site_expression.rb
index a52e6306..1ad54092 100644
--- a/lib/ast/call_site_expression.rb
+++ b/lib/ast/call_site_expression.rb
@@ -7,7 +7,7 @@ module Ast
     def compile method , message
       me = receiver.compile( method, message )
       method.add_code Virtual::Set.new(Virtual::NewSelf.new(me.type), me)
-      method.add_code Virtual::Set.new(Virtual::NewName.new(), name)
+      method.add_code Virtual::Set.new(Virtual::NewName.new(), Virtual::StringConstant.new(name))
       compiled_args = []
       args.each_with_index do |arg , i|
         #compile in the running method, ie before passing control
diff --git a/lib/register/set_implementation.rb b/lib/register/set_implementation.rb
index a260bde1..79a486b3 100644
--- a/lib/register/set_implementation.rb
+++ b/lib/register/set_implementation.rb
@@ -1,3 +1,24 @@
+Virtual::MessageSlot.class_eval do
+  def reg
+    Register::RegisterReference.new(Virtual::Message::MESSAGE_REG )
+  end
+end
+Virtual::FrameSlot.class_eval do
+  def reg
+    Register::RegisterReference.new(Virtual::Message::FRAME_REG )
+  end
+end
+Virtual::SelfSlot.class_eval do
+  def reg
+    Register::RegisterReference.new(Virtual::Message::SELF_REG )
+  end
+end
+Virtual::NewMessageSlot.class_eval do
+  def reg
+    Register::RegisterReference.new(Virtual::Message::NEW_MESSAGE_REG )
+  end
+end
+
 module Register
   # This implements setting of the various slot variables the vm defines. 
   # Basic mem moves, but have to shuffle the type nibbles
@@ -6,18 +27,18 @@ module Register
     def run block
       block.codes.dup.each do |code|
         next unless code.is_a? Virtual::Set
+        # resolve the register and offset that we need to move to
+        to = code.to.reg
+        # need a temporay place because of indexed load/store
         tmp = RegisterReference.new(Virtual::Message::TMP_REG)
-        if( code.to.is_a? Virtual::NewMessageSlot)
-          to = Virtual::Message::NEW_MESSAGE_REG
-          move = RegisterMachine.instance.ldr( to , tmp , code.to.index )
-          block.replace(code , move )
-        elsif( code.to.is_a? Virtual::Self)
-          to =  RegisterReference.new(Virtual::Message::SELF_REG)
-          move = RegisterMachine.instance.ldr( to , tmp , code.to.index )
-          block.replace(code , move )
-        else
-          raise "Start coding #{code.inspect}"
+        # for constants we have to "move" the constants value
+        if( code.from.is_a? Virtual::Constant)
+          move1 = RegisterMachine.instance.mov( tmp , code.from )
+        else # while otherwise we "load"
+          move1 = RegisterMachine.instance.ldr( tmp , code.from.reg , code.from.index )
         end
+        move2 = RegisterMachine.instance.str( tmp , to , code.to.index )
+        block.replace(code , [move1,move2] )
       end
     end
   end
diff --git a/lib/virtual/instruction.rb b/lib/virtual/instruction.rb
index 26d28a04..3fd5544f 100644
--- a/lib/virtual/instruction.rb
+++ b/lib/virtual/instruction.rb
@@ -89,6 +89,8 @@ module Virtual
   class Set < Instruction
     def initialize to , from
       @to = to
+      # hard to find afterwards where it came from, so ensure it doesn't happen
+      raise "From must be slot or constant, not symbol #{from}" if from.is_a? Symbol
       @from = from
     end
     attr_reader :to , :from
diff --git a/lib/virtual/send_implementation.rb b/lib/virtual/send_implementation.rb
index 76bc841d..83941b62 100644
--- a/lib/virtual/send_implementation.rb
+++ b/lib/virtual/send_implementation.rb
@@ -7,10 +7,10 @@ module Virtual
       block.codes.dup.each do |code|
         next unless code.is_a? MessageSend
         me = code.me
-        next unless ( me.type == Reference)
+        raise "ahm" unless ( me.type == Reference)
         if( me.is_a? Constant)
           if( me.is_a? BootClass )
-            raise "unimplemented"
+            raise "unimplemented #{code}"
           elsif( me.is_a? ObjectConstant )
             clazz = me.clazz
             method = clazz.get_instance_method code.name
@@ -18,8 +18,10 @@ module Virtual
             call = FunctionCall.new( method )
             block.replace(code , call )
           else
-            raise "unimplemented"
+            raise "unimplemented #{code}"
           end
+        else
+          raise "unimplemented #{code.me}"
         end
       end
     end