Changeset 41678 in vbox for trunk/src/VBox/VMM/VMMAll/IOMAll.cpp
- Timestamp:
- Jun 13, 2012 9:37:47 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMAll/IOMAll.cpp
r41676 r41678 68 68 { 69 69 NOREF(pCpu); 70 if (pParam->f lags& (DISUSE_BASE | DISUSE_INDEX | DISUSE_SCALE | DISUSE_DISPLACEMENT8 | DISUSE_DISPLACEMENT16 | DISUSE_DISPLACEMENT32))70 if (pParam->fUse & (DISUSE_BASE | DISUSE_INDEX | DISUSE_SCALE | DISUSE_DISPLACEMENT8 | DISUSE_DISPLACEMENT16 | DISUSE_DISPLACEMENT32)) 71 71 { 72 72 *pcbSize = 0; … … 76 76 77 77 /* divide and conquer */ 78 if (pParam->f lags& (DISUSE_REG_GEN64 | DISUSE_REG_GEN32 | DISUSE_REG_GEN16 | DISUSE_REG_GEN8))79 { 80 if (pParam->f lags& DISUSE_REG_GEN32)78 if (pParam->fUse & (DISUSE_REG_GEN64 | DISUSE_REG_GEN32 | DISUSE_REG_GEN16 | DISUSE_REG_GEN8)) 79 { 80 if (pParam->fUse & DISUSE_REG_GEN32) 81 81 { 82 82 *pcbSize = 4; … … 85 85 } 86 86 87 if (pParam->f lags& DISUSE_REG_GEN16)87 if (pParam->fUse & DISUSE_REG_GEN16) 88 88 { 89 89 *pcbSize = 2; … … 92 92 } 93 93 94 if (pParam->f lags& DISUSE_REG_GEN8)94 if (pParam->fUse & DISUSE_REG_GEN8) 95 95 { 96 96 *pcbSize = 1; … … 99 99 } 100 100 101 Assert(pParam->f lags& DISUSE_REG_GEN64);101 Assert(pParam->fUse & DISUSE_REG_GEN64); 102 102 *pcbSize = 8; 103 103 DISFetchReg64(pRegFrame, pParam->base.reg_gen, pu64Data); … … 106 106 else 107 107 { 108 if (pParam->f lags& (DISUSE_IMMEDIATE64 | DISUSE_IMMEDIATE64_SX8))108 if (pParam->fUse & (DISUSE_IMMEDIATE64 | DISUSE_IMMEDIATE64_SX8)) 109 109 { 110 110 *pcbSize = 8; … … 113 113 } 114 114 115 if (pParam->f lags& (DISUSE_IMMEDIATE32 | DISUSE_IMMEDIATE32_SX8))115 if (pParam->fUse & (DISUSE_IMMEDIATE32 | DISUSE_IMMEDIATE32_SX8)) 116 116 { 117 117 *pcbSize = 4; … … 120 120 } 121 121 122 if (pParam->f lags& (DISUSE_IMMEDIATE16 | DISUSE_IMMEDIATE16_SX8))122 if (pParam->fUse & (DISUSE_IMMEDIATE16 | DISUSE_IMMEDIATE16_SX8)) 123 123 { 124 124 *pcbSize = 2; … … 127 127 } 128 128 129 if (pParam->f lags& DISUSE_IMMEDIATE8)129 if (pParam->fUse & DISUSE_IMMEDIATE8) 130 130 { 131 131 *pcbSize = 1; … … 134 134 } 135 135 136 if (pParam->f lags& DISUSE_REG_SEG)136 if (pParam->fUse & DISUSE_REG_SEG) 137 137 { 138 138 *pcbSize = 2; … … 162 162 { 163 163 NOREF(pCpu); 164 if (pParam->f lags& (DISUSE_BASE | DISUSE_INDEX | DISUSE_SCALE | DISUSE_DISPLACEMENT8 | DISUSE_DISPLACEMENT16 | DISUSE_DISPLACEMENT32 | DISUSE_DISPLACEMENT64 | DISUSE_IMMEDIATE8 | DISUSE_IMMEDIATE16 | DISUSE_IMMEDIATE32 | DISUSE_IMMEDIATE32_SX8 | DISUSE_IMMEDIATE16_SX8))164 if (pParam->fUse & (DISUSE_BASE | DISUSE_INDEX | DISUSE_SCALE | DISUSE_DISPLACEMENT8 | DISUSE_DISPLACEMENT16 | DISUSE_DISPLACEMENT32 | DISUSE_DISPLACEMENT64 | DISUSE_IMMEDIATE8 | DISUSE_IMMEDIATE16 | DISUSE_IMMEDIATE32 | DISUSE_IMMEDIATE32_SX8 | DISUSE_IMMEDIATE16_SX8)) 165 165 { 166 166 return false; 167 167 } 168 168 169 if (pParam->f lags& DISUSE_REG_GEN32)169 if (pParam->fUse & DISUSE_REG_GEN32) 170 170 { 171 171 DISWriteReg32(pRegFrame, pParam->base.reg_gen, (uint32_t)u64Data); … … 173 173 } 174 174 175 if (pParam->f lags& DISUSE_REG_GEN64)175 if (pParam->fUse & DISUSE_REG_GEN64) 176 176 { 177 177 DISWriteReg64(pRegFrame, pParam->base.reg_gen, u64Data); … … 179 179 } 180 180 181 if (pParam->f lags& DISUSE_REG_GEN16)181 if (pParam->fUse & DISUSE_REG_GEN16) 182 182 { 183 183 DISWriteReg16(pRegFrame, pParam->base.reg_gen, (uint16_t)u64Data); … … 185 185 } 186 186 187 if (pParam->f lags& DISUSE_REG_GEN8)187 if (pParam->fUse & DISUSE_REG_GEN8) 188 188 { 189 189 DISWriteReg8(pRegFrame, pParam->base.reg_gen, (uint8_t)u64Data); … … 191 191 } 192 192 193 if (pParam->f lags& DISUSE_REG_SEG)193 if (pParam->fUse & DISUSE_REG_SEG) 194 194 { 195 195 DISWriteRegSeg(pRegFrame, pParam->base.reg_seg, (RTSEL)u64Data);
Note:
See TracChangeset
for help on using the changeset viewer.