s390x-codegen.h : Fix instruction definition and add instruction format variant