-typedef enum _arm_shift_modifier {
- ARM_SHF_NONE = 0, /**< no shift */
- ARM_SHF_IMM = 1, /**< immediate operand with implicit ROR */
- ARM_SHF_ASR = 2, /**< arithmetic shift right */
- ARM_SHF_LSL = 3, /**< logical shift left */
- ARM_SHF_LSR = 4, /**< logical shift right */
- ARM_SHF_ROR = 5, /**< rotate right */
- ARM_SHF_RRX = 6, /**< rotate right through carry bits */
-} arm_shift_modifier;
-
-/** True, if the modifier implies a shift argument */
-#define ARM_HAS_SHIFT(mod) ((mod) > ARM_SHF_IMM)
-
-/** get the shift modifier from flags */
-#define ARM_GET_SHF_MOD(attr) ((attr)->instr_fl & 7)
-
-/** set the shift modifier to flags */
-#define ARM_SET_SHF_MOD(attr, mod) ((attr)->instr_fl = (((attr)->instr_fl & ~7) | (mod)))
-
-/** fpa immediate bit */
-#define ARM_FPA_IMM (1 << 3) /**< fpa floating point immediate */
-
-#define ARM_GET_FPA_IMM(attr) ((attr)->instr_fl & ARM_FPA_IMM)
-#define ARM_SET_FPA_IMM(attr) ((attr)->instr_fl |= ARM_FPA_IMM)
-#define ARM_CLR_FPA_IMM(attr) ((attr)->instr_fl &= ~ARM_FPA_IMM)
-
-/**
- * Possible ARM condition codes.
- */
-typedef enum _arm_condition {
- ARM_COND_EQ = 0, /**< Equal, Z set. */
- ARM_COND_NE = 1, /**< Not Equal, Z clear */
- ARM_COND_CS = 2, /**< Carry set, unsigned >=, C set */
- ARM_COND_CC = 3, /**< Carry clear, unsigned <, C clear */
- ARM_COND_MI = 4, /**< Minus/Negative, N set */
- ARM_COND_PL = 5, /**< Plus/Positive or Zero, N clear */
- ARM_COND_VS = 6, /**< Overflow, V set */
- ARM_COND_VC = 7, /**< No overflow, V clear */
- ARM_COND_HI = 8, /**< unsigned >, C set and Z clear */
- ARM_COND_LS = 9, /**< unsigned <=, C clear or Z set */
- ARM_COND_GE = 10, /**< signed >=, N == V */
- ARM_COND_LT = 11, /**< signed <, N != V */
- ARM_COND_GT = 12, /**< signed >, Z clear and N == V */
- ARM_COND_LE = 13, /**< signed <=, Z set or N != V */
- ARM_COND_AL = 14, /**< Always (unconditional) */
- ARM_COND_NV = 15 /**< forbidden */
-} arm_condition;
-
-/** Get the condition code from flags */
-#define ARM_GET_COND(attr) (((attr)->instr_fl >> 4) & 15)
-
-/** Set the condition code to flags */
-#define ARM_SET_COND(attr, code) ((attr)->instr_fl = (((attr)->instr_fl & ~(15 << 4)) | ((code) << 4)))
+typedef enum arm_shift_modifier_t {
+ ARM_SHF_INVALID, /**< invalid shift */
+ ARM_SHF_REG, /**< simple register operand */
+ ARM_SHF_IMM, /**< immediate operand with implicit ROR */
+ ARM_SHF_ASR_IMM, /**< arithmetic shift right */
+ ARM_SHF_ASR_REG, /**< arithmetic shift right */
+ ARM_SHF_LSL_IMM, /**< logical shift left */
+ ARM_SHF_LSL_REG, /**< logical shift left */
+ ARM_SHF_LSR_IMM, /**< logical shift right */
+ ARM_SHF_LSR_REG, /**< logical shift right */
+ ARM_SHF_ROR_IMM, /**< rotate right */
+ ARM_SHF_ROR_REG, /**< rotate right */
+ ARM_SHF_RRX, /**< rotate right through carry bits */
+} arm_shift_modifier_t;