ruby-x/rubyx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix names of branch codes

Browse Source 
also store objects in register, avoid the whole object_id thing which
just lead to unclarity about class
This commit is contained in:
Torsten Ruger 2015-11-04 20:22:03 +02:00
parent 428faad25f
commit 691ae96d71
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/interpreter/interpreter.rb
View File

@ -18,8 +18,8 @@ module Interpreter
@state = :stopped @state = :stopped
@stdout = "" @stdout = ""
@registers = {} @registers = {}
@flags = { :zero => false , :positive => false , @flags = { :zero => false , :plus => false ,
:negative=> false , :overflow => false } :minus => false , :overflow => false }
@clock = 0 @clock = 0
(0...12).each do |r| (0...12).each do |r|
set_register "r#{r}".to_sym , "r#{r}:unknown" set_register "r#{r}".to_sym , "r#{r}:unknown"
@ -55,11 +55,14 @@ module Interpreter
def set_register reg , val def set_register reg , val
old = get_register( reg ) # also ensures format old = get_register( reg ) # also ensures format
unless val.is_a? String if val.is_a? Fixnum
@flags[:zero] = (val == 0) @flags[:zero] = (val == 0)
@flags[:positive] = (val > 0) @flags[:plus] = (val > 0)
@flags[:negative] = (val < 0) @flags[:minus] = (val < 0)
#puts "Set_flags #{val} :#{@flags.inspect}" #puts "Set_flags #{val} :#{@flags.inspect}"
else
@flags[:zero] = @flags[:plus] = true
@flags[:minus] = false
end end
return if old === val return if old === val
reg = reg.symbol if reg.is_a? Register::RegisterValue reg = reg.symbol if reg.is_a? Register::RegisterValue
@ -78,9 +81,7 @@ module Interpreter
end end
def object_for reg def object_for reg
id = get_register(reg) get_register(reg)
object = Register.machine.objects[id]
object.nil? ? id : object
end end
# Label is a noop. # Label is a noop.
@ -110,7 +111,7 @@ module Interpreter
def execute_LoadConstant def execute_LoadConstant
to = @instruction.register to = @instruction.register
value = @instruction.constant value = @instruction.constant
value = value.object_id unless value.is_a?(Fixnum) #value = value.object_id unless value.is_a?(Fixnum)
set_register( to , value ) set_register( to , value )
true true
end end
@ -118,7 +119,7 @@ module Interpreter
def execute_GetSlot def execute_GetSlot
object = object_for( @instruction.array ) object = object_for( @instruction.array )
value = object.internal_object_get( @instruction.index ) value = object.internal_object_get( @instruction.index )
value = value.object_id unless value.is_a? Fixnum #value = value.object_id unless value.is_a? Fixnum
set_register( @instruction.register , value ) set_register( @instruction.register , value )
true true
end end