diff --git a/src/main.cpp b/src/main.cpp index e1f767e..7583dd0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,20 +33,7 @@ int __cdecl main( int argc, const char *argv[] ) parser.add_argument().names( { "--vmentry", "--entry" } ).description( "rva to push prior to a vm_entry" ); parser.add_argument().name( "--showhandlers" ).description( "show all vm handlers..." ); parser.add_argument().name( "--showhandler" ).description( "show a specific vm handler given its index..." ); - parser.add_argument().name( "--vmp2file" ).description( "path to .vmp2 file..." ); - parser.add_argument() - .name( "--indexes" ) - .description( "displays vm handler table indexes for a given vm handler name such as 'READQ', or 'WRITEQ'..." ); - parser.add_argument() - .name( "--scanfortables" ) - .description( "scans all executable sections for vm handler tables..." ); - parser.add_argument() - .name( "--showvirtinstrs" ) - .description( "show the virtual instructions of a specific virtual routine..." ); - parser.add_argument().name( "--showallrtns" ).description( "shows all information for all virtual routines..." ); - parser.add_argument() - .name( "--rtnaddr" ) - .description( "rva of the virtualized routine to apply another action upon such as --showallblocks..." ); + parser.add_argument().name( "--indexes" ).description( "displays vm handler table indexes for a given vm handler name such as 'READQ', or 'WRITEQ'..." ); parser.enable_help(); auto err = parser.parse( argc, argv ); @@ -96,8 +83,8 @@ int __cdecl main( int argc, const char *argv[] ) const auto vm_entry_rva = std::strtoull( parser.get< std::string >( "vmentry" ).c_str(), nullptr, 16 ); const auto image_base = img->get_nt_headers()->optional_header.image_base; - std::printf( "> module base = 0x%p, image base = 0x%p, image size = 0x%p\n", module_base, image_base, - image_size ); + std::printf( "> module base = %p, image base = %p, image size = %p, vm entry = 0x%x\n", module_base, image_base, + image_size, vm_entry_rva ); vm::ctx_t vmctx( module_base, image_base, image_size, vm_entry_rva ); @@ -187,96 +174,4 @@ int __cdecl main( int argc, const char *argv[] ) std::printf( "}\n" ); } } - - if ( !parser.exists( "vmp2file" ) ) - return {}; - - std::vector< std::uint8_t > vmp2file; - if ( !open_binary_file( parser.get< std::string >( "vmp2file" ), vmp2file ) ) - { - std::printf( "[!] failed to open vmp2 file...\n" ); - return -1; - } - - const auto file_header = reinterpret_cast< vmp2::v4::file_header * >( vmp2file.data() ); - - if ( file_header->version != vmp2::version_t::v4 ) - { - std::printf( "[!] invalid vmp2 file version... this build uses v4...\n" ); - return -1; - } - - auto first_rtn = reinterpret_cast< vmp2::v4::rtn_t * >( reinterpret_cast< std::uintptr_t >( file_header ) + - file_header->rtn_offset ); - - if ( parser.exists( "showallrtns" ) ) - { - for ( auto [ rtn_block, rtn_idx ] = std::pair{ first_rtn, 0ull }; rtn_idx < file_header->rtn_count; - ++rtn_idx, rtn_block = reinterpret_cast< vmp2::v4::rtn_t * >( - reinterpret_cast< std::uintptr_t >( rtn_block ) + rtn_block->size ) ) - { - std::printf( "[rtn_0x%p (vm enter rva = 0x%x)] number of code blocks = %d\n", - rtn_block->code_blocks[ 0 ].vip_begin, rtn_block->vm_enter_offset, - rtn_block->code_block_count ); - - for ( auto [ code_block, block_idx ] = std::pair{ &rtn_block->code_blocks[ 0 ], 0ull }; - block_idx < rtn_block->code_block_count; - ++block_idx, code_block = reinterpret_cast< vmp2::v4::code_block_t * >( - reinterpret_cast< std::uintptr_t >( code_block ) + code_block->next_block_offset ) ) - { - std::printf( " [blk_0x%p] number of virtual instructions = %d\n", code_block->vip_begin, - code_block->vinstr_count ); - } - } - } - - if ( parser.exists( "showvirtinstrs" ) && parser.exists( "rtnaddr" ) ) - { - auto rtn_addr = std::stoull( parser.get< std::string >( "rtnaddr" ).c_str(), nullptr, 16 ); - for ( auto [ rtn_block, rtn_idx ] = std::pair{ first_rtn, 0ull }; rtn_idx < file_header->rtn_count; - ++rtn_idx, rtn_block = reinterpret_cast< vmp2::v4::rtn_t * >( - reinterpret_cast< std::uintptr_t >( rtn_block ) + rtn_block->size ) ) - { - if ( rtn_block->code_blocks[ 0 ].vip_begin == rtn_addr ) - { - for ( auto [ code_block, block_idx ] = std::pair{ &rtn_block->code_blocks[ 0 ], 0ull }; - block_idx < rtn_block->code_block_count; - ++block_idx, code_block = reinterpret_cast< vmp2::v4::code_block_t * >( - reinterpret_cast< std::uintptr_t >( code_block ) + - code_block->next_block_offset ) ) - { - std::printf( "[blk_0x%p] number of virtual instructions = %d\n", code_block->vip_begin, - code_block->vinstr_count ); - - std::printf( "> -----------------------------------------------------------------------\n" ); - std::printf( "> opcode | virtual instructions | virtual instruction pointer\n" ); - std::printf( "> -----------------------------------------------------------------------\n" ); - - auto block_vinstrs = reinterpret_cast< vm::instrs::virt_instr_t * >( - reinterpret_cast< std::uintptr_t >( code_block ) + sizeof(vmp2::v4::code_block_t) + - ( code_block->num_block_addrs * 8 ) ); - - for ( auto idx = 0u; idx < code_block->vinstr_count; ++idx ) - { - const auto vinstr = &block_vinstrs[ idx ]; - const auto vm_profile = vm::handler::get_profile( vinstr->mnemonic_t ); - if ( vinstr->operand.has_imm ) - { - std::printf( "> %-6x | %-15s %-15p | 0x%p\n", vinstr->opcode, - vm_profile ? vm_profile->name : "UNK", vinstr->operand.imm.u, - ABS_TO_IMG( vinstr->trace_data.vip, file_header->module_base, - file_header->image_base ) ); - } - else - { - std::printf( "> %-6x | %-32s | 0x%p\n", vinstr->opcode, - vm_profile ? vm_profile->name : "UNK", - ABS_TO_IMG( vinstr->trace_data.vip, file_header->module_base, - file_header->image_base ) ); - } - } - } - } - } - } } \ No newline at end of file