x86: harmonize disp with imm handling