am 603104b5: Merge "Fix handling of long argument spanning register/memory."

* commit '603104b5b5c3759b0bc2733bda2f972686a775a3':
  Fix handling of long argument spanning register/memory.