VirtualBox

Changeset 8150 in vbox for trunk/src/VBox/Disassembler


Ignore:
Timestamp:
Apr 18, 2008 2:01:13 PM (17 years ago)
Author:
vboxsync
Message:

Cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Disassembler/DisasmCore.cpp

    r8149 r8150  
    10831083{
    10841084    if (pCpu->opmode == CPUMODE_32BIT)
    1085     {
    10861085        return sizeof(uint32_t);
    1087     }
    1088     else
    1089     {
    1090         return sizeof(uint16_t);
    1091     }
     1086    return sizeof(uint16_t);
    10921087}
    10931088//*****************************************************************************
    … …  
    11371132{
    11381133    if (pCpu->opmode == CPUMODE_32BIT)
    1139     {
    11401134        return sizeof(int32_t);
    1141     }
    1142     else
    1143     {
    1144         return sizeof(uint16_t);
    1145     }
     1135    return sizeof(uint16_t);
    11461136}
    11471137//*****************************************************************************
    … …  
    15001490    //little hack to make sure the ModRM byte is included in the returned size
    15011491    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1502     {
    15031492        size = sizeof(uint8_t); //ModRM byte
    1504     }
    15051493
    15061494    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    15221510    //little hack to make sure the ModRM byte is included in the returned size
    15231511    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1524     {
    15251512        size = sizeof(uint8_t); //ModRM byte
    1526     }
    15271513
    15281514    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    15431529    //little hack to make sure the ModRM byte is included in the returned size
    15441530    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1545     {
    15461531        size = sizeof(uint8_t); //ModRM byte
    1547     }
    15481532
    15491533    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    15641548    //little hack to make sure the ModRM byte is included in the returned size
    15651549    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1566     {
    15671550        size = sizeof(uint8_t); //ModRM byte
    1568     }
    15691551
    15701552    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    16221604    //little hack to make sure the ModRM byte is included in the returned size
    16231605    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1624     {
    16251606        size = sizeof(uint8_t); //ModRM byte
    1626     }
    16271607
    16281608    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    16421622
    16431623    if (mod == 3 && rm == 0)
    1644     {
    16451624        pOp = (PCOPCODE)&g_aMapX86_Group7_mod11_rm000[reg];
    1646     }
    16471625    else
    16481626    if (mod == 3 && rm == 1)
    1649     {
    16501627        pOp = (PCOPCODE)&g_aMapX86_Group7_mod11_rm001[reg];
    1651     }
    16521628    else
    16531629        pOp = (PCOPCODE)&g_aMapX86_Group7_mem[reg];
    … …  
    16551631    //little hack to make sure the ModRM byte is included in the returned size
    16561632    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1657     {
    16581633        size = sizeof(uint8_t); //ModRM byte
    1659     }
    16601634
    16611635    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    16761650    //little hack to make sure the ModRM byte is included in the returned size
    16771651    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1678     {
    16791652        size = sizeof(uint8_t); //ModRM byte
    1680     }
    16811653
    16821654    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    16971669    //little hack to make sure the ModRM byte is included in the returned size
    16981670    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1699     {
    17001671        size = sizeof(uint8_t); //ModRM byte
    1701     }
    17021672
    17031673    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    17181688    //little hack to make sure the ModRM byte is included in the returned size
    17191689    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1720     {
    17211690        size = sizeof(uint8_t); //ModRM byte
    1722     }
    17231691
    17241692    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    17361704
    17371705    if (pCpu->prefix & PREFIX_OPSIZE)
    1738     {
    17391706        reg += 8;   //2nd table
    1740     }
    17411707
    17421708    pOp = (PCOPCODE)&g_aMapX86_Group12[reg];
    … …  
    17441710    //little hack to make sure the ModRM byte is included in the returned size
    17451711    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1746     {
    17471712        size = sizeof(uint8_t); //ModRM byte
    1748     }
    17491713
    17501714    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    1751 
    17521715    return size;
    17531716}
    … …  
    17611724    reg   = MODRM_REG(modrm);
    17621725    if (pCpu->prefix & PREFIX_OPSIZE)
    1763     {
    17641726        reg += 8;   //2nd table
    1765     }
    17661727
    17671728    pOp = (PCOPCODE)&g_aMapX86_Group13[reg];
    … …  
    17691730    //little hack to make sure the ModRM byte is included in the returned size
    17701731    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1771     {
    17721732        size = sizeof(uint8_t); //ModRM byte
    1773     }
    17741733
    17751734    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    17861745    reg   = MODRM_REG(modrm);
    17871746    if (pCpu->prefix & PREFIX_OPSIZE)
    1788     {
    17891747        reg += 8;   //2nd table
    1790     }
    17911748
    17921749    pOp = (PCOPCODE)&g_aMapX86_Group14[reg];
    … …  
    17941751    //little hack to make sure the ModRM byte is included in the returned size
    17951752    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1796     {
    17971753        size = sizeof(uint8_t); //ModRM byte
    1798     }
    17991754
    18001755    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    … …  
    18201775    //little hack to make sure the ModRM byte is included in the returned size
    18211776    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1822     {
    18231777        size = sizeof(uint8_t); //ModRM byte
    1824     }
    18251778
    18261779    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    1827 
    18281780    return size;
    18291781}
    … …  
    18411793    //little hack to make sure the ModRM byte is included in the returned size
    18421794    if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
    1843     {
    18441795        size = sizeof(uint8_t); //ModRM byte
    1845     }
    18461796
    18471797    size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
    1848 
    18491798    return size;
    18501799}
    … …  
    18631812    subtype = OP_PARM_VSUBTYPE(pParam->param);
    18641813    if (fRegAddr)
    1865     {
    18661814        subtype = OP_PARM_d;
    1867     }
    18681815    else
    18691816    if (subtype == OP_PARM_v || subtype == OP_PARM_NONE)
    1870     {
    18711817        subtype = (pCpu->opmode == CPUMODE_32BIT) ? OP_PARM_d : OP_PARM_w;
    1872     }
    18731818
    18741819    switch (subtype)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette