s390x: Rename and use constants for short PSW address and mask