From f5136b6b6896b401b1a733ecdfd31aa849a30f20 Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Sat, 18 Jul 2015 11:52:30 +0300 Subject: [PATCH] minor formatting --- lib/arm/instructions/logic_instruction.rb | 2 +- lib/arm/instructions/move_instruction.rb | 2 +- lib/parfait/object.rb | 10 ++-------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/arm/instructions/logic_instruction.rb b/lib/arm/instructions/logic_instruction.rb index a2c0fd29..e7744967 100644 --- a/lib/arm/instructions/logic_instruction.rb +++ b/lib/arm/instructions/logic_instruction.rb @@ -48,7 +48,7 @@ module Arm #TODO this is copied from MoveInstruction, should rework unless @extra @extra = 1 - puts "RELINK L at #{self.position.to_s(16)}" + #puts "RELINK L at #{self.position.to_s(16)}" raise ::Register::LinkException.new("cannot fit numeric literal argument in operand #{right.inspect}") end # now we can do the actual breaking of instruction, by splitting the operand diff --git a/lib/arm/instructions/move_instruction.rb b/lib/arm/instructions/move_instruction.rb index b45377f4..2d70da9a 100644 --- a/lib/arm/instructions/move_instruction.rb +++ b/lib/arm/instructions/move_instruction.rb @@ -62,7 +62,7 @@ module Arm # then on subsequent assemblies we can assemble unless @extra @extra = 1 - puts "RELINK M at #{self.position.to_s(16)}" + #puts "RELINK M at #{self.position.to_s(16)}" raise ::Register::LinkException.new("cannot fit numeric literal argument in operand #{right.inspect}") end # now we can do the actual breaking of instruction, by splitting the operand diff --git a/lib/parfait/object.rb b/lib/parfait/object.rb index d80d942f..688114b7 100644 --- a/lib/parfait/object.rb +++ b/lib/parfait/object.rb @@ -47,13 +47,7 @@ module Parfait # private def set_layout(layout) - #if( was = internal_object_get(LAYOUT_INDEX) ) - #TODO find out wat these objects are - #puts "Layout was set for #{self.class}" - #puts "#{self}" if self.class == Parfait::Word - # Space.object_space.check was - # return - #end + # puts "Layout was set for #{self.class}" raise "Nil layout" unless layout internal_object_set(LAYOUT_INDEX , layout) end @@ -65,7 +59,7 @@ module Parfait def get_layout() l = internal_object_get(LAYOUT_INDEX) - raise "No layout #{self.to_s}:#{self.class} #{self.object_id}" unless l + raise "No layout #{self.object_id.to_s(16)}=#{self.to_s[0 ... 100]}:#{self.class} " unless l return l end