Upgrade shr to ashr and lshr