sjs/compiler
1
0
Fork 0
mirror of https://github.com/samsonjs/compiler.git synced 2026-03-25 08:45:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

register? is more robust, rm? works with sizes properly, e.g. [:byte, <addr/var>]

Browse source
This commit is contained in:
Sami Samhuri 2010-01-20 23:17:34 -08:00
parent f9acae7e15
commit b3dad0b947
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
asm/binary.rb
View file

@ -447,7 +447,8 @@ module Assembler
def register?(op, size=DefaultOperandSize) def register?(op, size=DefaultOperandSize)
op.is_a?(RegisterProxy) && op.size == size || op.size == SizeMap[size] op.is_a?(RegisterProxy) && op.size == size ||
op.respond_to?(:size) && op.size == SizeMap[size]
end end
def immediate?(op, size=DefaultOperandSize) def immediate?(op, size=DefaultOperandSize)
@ -466,10 +467,16 @@ module Assembler
# #
# XXX This method is pretty ugly. # XXX This method is pretty ugly.
def rm?(op, size=DefaultOperandSize) def rm?(op, size=DefaultOperandSize)
# register
register?(op, size) || register?(op, size) ||
(op.is_a?(Array) &&
(op.size == 1 && [Numeric, RegisterProxy, VariableProxy].any?{|c| c == op[0].class}) || # [register/memory]
(op.size == 2 && rm?(op[1]))) (op.is_a?(Array) && op.size == 1 &&
[Numeric, RegisterProxy, VariableProxy].any?{|c| c == op[0].class}) ||
# [<size>, memory]
(op.is_a?(Array) && op.size == 2 && op[0] == size &&
[Numeric, RegisterProxy, VariableProxy].any?{|c| c == op[1].class})
end end
def offset?(addr, size=DefaultOperandSize) def offset?(addr, size=DefaultOperandSize)