Merge branch 'dev' into 'master'

Dev

See merge request vmp2/vmemu!12

src/main.cpp

@@ -256,7 +256,7 @@ int __cdecl main( int argc, const char *argv[] )
             if ( !emu.get_trace( code_blocks ) )
             {
                 std::printf( "[!] something failed during tracing, review the console for more information...\n" );
-                continue;
+                return -1;
             }
 
             std::printf( "> number of blocks = %d\n", code_blocks.size() );
@@ -282,7 +282,7 @@ int __cdecl main( int argc, const char *argv[] )
         output.write( reinterpret_cast< const char * >( &file_header ), sizeof file_header );
         output.write( reinterpret_cast< const char * >( module_base ), image_size );
 
-        for ( auto& [ vm_enter_offset, virt_rtn ] : virt_rtns )
+        for ( auto &[ vm_enter_offset, virt_rtn ] : virt_rtns )
         {
             vmp2::v4::rtn_t rtn{ virt_rtn.size() };
             std::vector< vmp2::v4::code_block_t * > vmp2_blocks;
@@ -379,7 +379,7 @@ int __cdecl main( int argc, const char *argv[] )
             if ( !emu.get_trace( code_blocks ) )
             {
                 std::printf( "[!] something failed during tracing, review the console for more information...\n" );
-                continue;
+                return -1;
             }
 
             std::printf( "> number of blocks = %d\n", code_blocks.size() );

src/vmemu_t.cpp

@@ -87,6 +87,9 @@ namespace vm
             return false;
         }
 
+        if ( !cc_block )
+            return false;
+
         code_blocks.push_back( code_block );
 
         // code_blocks.size() will continue to grow as all branches are traced...
@@ -149,6 +152,9 @@ namespace vm
                     return false;
                 }
 
+                if ( !cc_block )
+                    return false;
+
                 // push back new block that has been traced...
                 code_blocks.push_back( branch_block );
 
@@ -205,6 +211,9 @@ namespace vm
                     return false;
                 }
 
+                if ( !cc_block )
+                    return false;
+
                 // push back new block that has been traced...
                 code_blocks.push_back( branch_block );
                 break;
@@ -262,6 +271,9 @@ namespace vm
                         return false;
                     }
 
+                    if ( !cc_block )
+                        return false;
+
                     // push back new block that has been traced...
                     code_blocks.push_back( branch_block );
                 }
@@ -372,10 +384,9 @@ namespace vm
             return false;
         }
 
-        if ( instr.mnemonic == ZYDIS_MNEMONIC_INT1 || instr.mnemonic == ZYDIS_MNEMONIC_INVALID )
+        if ( instr.mnemonic == ZYDIS_MNEMONIC_INVALID )
         {
-            obj->cc_block->code_block.jcc.has_jcc = false;
-            obj->cc_block->code_block.jcc.type = vm::instrs::jcc_type::none;
+            obj->cc_block = nullptr;
             uc_emu_stop( uc );
             return false;
         }
@@ -427,7 +438,7 @@ namespace vm
             return false;
         }
 
-        const auto &vm_handler = obj->g_vm_ctx->vm_handlers[ vm_handler_table_idx ];
+        auto &vm_handler = obj->g_vm_ctx->vm_handlers[ vm_handler_table_idx ];
 
         if ( ( err = obj->create_entry( &vinstr_entry ) ) )
         {
@@ -448,6 +459,7 @@ namespace vm
             std::printf( "> vm handler index (%d) does not match vm handler address (%p)...\n", vm_handler_table_idx,
                          vm_handler_addr );
 
+            obj->cc_block = nullptr;
             if ( ( err = uc_emu_stop( uc ) ) )
             {
                 std::printf( "> failed to stop emulation, exiting... reason = %d\n", err );
@@ -457,6 +469,23 @@ namespace vm
             return false;
         }
 
+        if ( !vm_handler.profile )
+        {
+            obj->cc_block = nullptr;
+            std::printf( "> virtual machine handler (0x%p): \n\n",
+                         ( vm_handler_addr - obj->g_vm_ctx->module_base ) + obj->g_vm_ctx->image_base );
+
+            vm::util::print( vm_handler.instrs );
+            std::printf( "\n\n" );
+
+            if ( ( err = uc_emu_stop( uc ) ) )
+            {
+                std::printf( "> failed to stop emulation, exiting... reason = %d\n", err );
+                exit( 0 );
+            }
+            return false;
+        }
+
         auto vinstr = vm::instrs::get( *obj->g_vm_ctx, vinstr_entry );
 
         if ( !vinstr.has_value() )