Dr.Deamon64 Git-Repository
(2014/03/01- Main-Repository: migrate from cvs)
Revision | 99757436ffbc5332370303d0a432bf4ccdcae1d8 (tree) |
---|---|
Zeit | 2020-01-31 08:12:45 |
Autor | Koine Yuusuke(koinec) <koinec@user...> |
Commiter | Koine Yuusuke(koinec) |
@@ -1219,13 +1219,18 @@ int | ||
1219 | 1219 | } |
1220 | 1220 | |
1221 | 1221 | /* [RIP + disp] Support Code */ |
1222 | - if( ((Word)p_temp[0]->w_typeid) == OPTYPE_REG_RIP ) { | |
1223 | - p_analyze->modrm.modrm.mod = 0x00; | |
1224 | - p_analyze->modrm.modrm.rm = 0x05; | |
1222 | + if( NULL != p_temp[0] ) { | |
1223 | + if( ((Word)p_temp[0]->w_typeid) == OPTYPE_REG_RIP ) { | |
1224 | + p_analyze->modrm.modrm.mod = 0x00; | |
1225 | + p_analyze->modrm.modrm.rm = 0x05; | |
1225 | 1226 | |
1226 | - p_analyze->v_disp.i_bytes = 4; | |
1227 | + p_analyze->v_disp.i_bytes = 4; | |
1228 | + | |
1229 | + goto goto_Drd64_Intel64_SetAnalyzePacket_OperandMemory_post; | |
1230 | + } | |
1227 | 1231 | } |
1228 | - else { | |
1232 | + // 2020/01/31 - Temporary fix. VVVV | |
1233 | + //else { | |
1229 | 1234 | /* Support [?SP + disp?] => SiB = 1Bytes */ |
1230 | 1235 | if( NULL != p_base ) { |
1231 | 1236 | if( isRegType( p_base->w_typeid, OPTYPE_BASE_REG_GENERIC )) { |
@@ -1297,8 +1302,9 @@ int | ||
1297 | 1302 | p_analyze->rex.rex.b = (w_temp & 0x0008) >> 3; |
1298 | 1303 | } |
1299 | 1304 | } |
1300 | - } | |
1305 | + //} | |
1301 | 1306 | |
1307 | +goto_Drd64_Intel64_SetAnalyzePacket_OperandMemory_post: | |
1302 | 1308 | /* Debug Print */ |
1303 | 1309 | Drd64_Intel64_Debug_Asm_PrintMemoryOperand( |
1304 | 1310 | p_index, p_scale, p_base, p_disp); |