Backport r3856 - reg_eip is 32bit (jmarsh)