added labels to the source code..

src/compiler.cpp

@@ -50,10 +50,10 @@ namespace vm
             {
                 for ( auto itr = vmctx->vm_handlers.begin(); itr != vmctx->vm_handlers.end(); ++itr )
                 {
-                    vinstrs.push_back( { label_data->label_name } );
+                    virt_labels.push_back( { label_data->label_name } );
                     if ( itr->profile && itr->profile->name == vinstr.name )
                     {
-                        vinstrs.back().vinstrs.push_back( { ( std::uint8_t )( itr - vmctx->vm_handlers.begin() ),
+                        virt_labels.back().vinstrs.push_back( { ( std::uint8_t )( itr - vmctx->vm_handlers.begin() ),
                                                             vinstr.imm, itr->profile->imm_size } );
                         break;
                     }
@@ -62,11 +62,12 @@ namespace vm
             return true;
         } );
 
-        return &vinstrs;
+        return &virt_labels;
     }
 
     std::vector< compiled_label_data > compiler_t::encrypt()
     {
+        std::vector< compiled_label_data > result;
         const auto end_of_module = vmctx->image_size + vmctx->image_base;
 
         // decryption key starts off as the image
@@ -74,7 +75,7 @@ namespace vm
         std::uintptr_t decrypt_key = end_of_module, start_addr;
         if ( vmctx->exec_type == vmp2::exec_type_t::backward )
         {
-            std::for_each( vinstrs.begin(), vinstrs.end(), [ & ]( const vinstr_data &vinstr ) {
+            std::for_each( virt_labels.begin(), virt_labels.end(), [ & ]( const vinstr_data &vinstr ) {
                 ( ++decrypt_key ) += vinstr.imm_size ? vinstr.imm_size / 8 : 0;
             } );
         }
@@ -82,10 +83,14 @@ namespace vm
 
         // invert the encoded virtual instructions operands if vip advances backward...
         if ( vmctx->exec_type == vmp2::exec_type_t::backward )
-            std::reverse( vinstrs.begin(), vinstrs.end() );
+            std::reverse( virt_labels.begin(), virt_labels.end() );
 
         // loop over the instructions and encrypt them...
-        for ( auto &vinstr : vinstrs )
+        for ( auto &label : virt_labels )
+        {
+            result.push_back( { label.label_name, start_addr } );
+
+            for ( auto &vinstr : label.vinstrs )
             {
                 std::printf( "> decrypt key = 0x%p\n", decrypt_key );
 
@@ -95,7 +100,7 @@ namespace vm
 
                 if ( !vinstr.imm_size )
                 {
-                result_buffer.push_back( vinstr.vm_handler );
+                    result.back().vinstrs.push_back( vinstr.vm_handler );
                     continue;
                 }
 
@@ -108,20 +113,24 @@ namespace vm
                 if ( vmctx->exec_type == vmp2::exec_type_t::backward )
                 {
                     for ( auto idx = 0u; idx < vinstr.imm_size / 8; ++idx )
-                    result_buffer.push_back( reinterpret_cast< std::uint8_t * >( &vinstr.operand )[ idx ] );
+                        result.back().vinstrs.push_back( reinterpret_cast< std::uint8_t * >( &vinstr.operand )[ idx ] );
 
-                result_buffer.push_back( vinstr.vm_handler );
+                    result.back().vinstrs.push_back( vinstr.vm_handler );
                 }
                 else
                 {
-                result_buffer.push_back( vinstr.vm_handler );
+                    result.back().vinstrs.push_back( vinstr.vm_handler );
 
                     for ( auto idx = 0u; idx < vinstr.imm_size / 8; ++idx )
-                    result_buffer.push_back( reinterpret_cast< std::uint8_t * >( &vinstr.operand )[ idx ] );
+                        result.back().vinstrs.push_back( reinterpret_cast< std::uint8_t * >( &vinstr.operand )[ idx ] );
                 }
             }
 
-        return { start_addr, &result_buffer };
+            result.back().enc_alloc_rva = encrypt_rva( start_addr );
+            start_addr += result.back().vinstrs.size();
+        }
+
+        return result;
     }
 
     std::uint64_t compiler_t::encrypt_rva( std::uint64_t rva )

src/compiler.h

@@ -32,7 +32,7 @@ namespace vm
     struct compiled_label_data
     {
         std::string label_name;
-        std::uintptr_t enc_alloc_rva;
+        std::uintptr_t alloc_rva, enc_alloc_rva;
         std::vector< std::uint8_t > vinstrs;
     };
 
@@ -44,9 +44,11 @@ namespace vm
         std::vector< compiled_label_data > encrypt();
 
       private:
+        std::uint64_t encrypt_rva( std::uint64_t rva );
+
         vm::ctx_t *vmctx;
         transform::map_t calc_jmp_transforms;
-        std::vector< vlabel_data > vinstrs;
+        std::vector< vlabel_data > virt_labels;
         std::vector< zydis_decoded_instr_t > encrypt_vinstrs_rva;
     };
 } // namespace vm

src/main.cpp

@@ -22,11 +22,6 @@ void yyerror( char *msg )
     std::printf( "[!] parsing failure: %s\n", msg );
 }
 
-void generate_header( std::vector< std::uint8_t > &virt_instrs, std::string image_path )
-{
-
-}
-
 int __cdecl main( int argc, const char *argv[] )
 {
     argparse::argument_parser_t argp( "vmassembler", "virtual instruction assembler" );
@@ -98,41 +93,34 @@ int __cdecl main( int argc, const char *argv[] )
     // encode virtual instructions...
     //
 
-    auto [ encoded_success, vinstrs ] = compiler.encode();
+    auto virt_labels = compiler.encode();
     std::printf( "[+] finished encoding... encoded instructions below...\n" );
 
-    if ( !encoded_success )
+    for ( auto &label : *virt_labels )
     {
-        std::printf( "[!] failed to encode virtual instructions...\n" );
+        for ( const auto &vinstr : label.vinstrs )
-        return -1;
-    }
-
-    for ( auto &vinstr : *vinstrs )
         {
             if ( vinstr.imm_size )
                 std::printf( "> 0x%x - 0x%x\n", vinstr.vm_handler, vinstr.operand );
             else
                 std::printf( "> 0x%x\n", vinstr.vm_handler );
         }
+    }
 
     //
     // encrypt virtual instructions...
     //
 
-    auto [ entry_rva, result_buffer ] = compiler.encrypt();
+    auto compiled_labels = compiler.encrypt();
-    std::printf( "[+] finished encrypting... encrypted instructions below...\n" );
+    std::printf( "[+] finished encrypting... encrypted labels below...\n" );
 
-    if ( !entry_rva )
+    for ( const auto &label : compiled_labels )
     {
-        std::printf( "[!] failed to encrypt virtual instructions...\n" );
+        std::printf( "> %s must be allocated at = 0x%p\n", label.label_name.c_str(), label.alloc_rva );
-        return -1;
-    }
-
-    std::printf( "> virtual instructions must be allocated at = 0x%p\n", entry_rva );
         std::printf( "> " );
         {
             auto idx = 0u;
-        for ( auto byte : *result_buffer )
+            for ( auto byte : label.vinstrs )
             {
                 std::printf( "0x%x ", byte );
                 if ( ++idx == 10 )
@@ -142,7 +130,7 @@ int __cdecl main( int argc, const char *argv[] )
                 }
             }
         }
+    }
 
     std::printf( "\n" );
-    generate_header( *result_buffer, argp.get< std::string >( "output" ) );
 }

src/parser.cpp

@@ -12,22 +12,22 @@ auto parse_t::get_instance() -> parse_t *
 
 void parse_t::add_label( std::string label_name )
 {
-    vinstrs.push_back( { label_name } );
+    virt_labels.push_back( { label_name } );
 }
 
 void parse_t::add_vinstr( std::string vinstr_name )
 {
-    vinstrs.back().vinstrs.push_back( { vinstr_name, false, 0u } );
+    virt_labels.back().vinstrs.push_back( { vinstr_name, false, 0u } );
 }
 
 void parse_t::add_vinstr( std::string vinstr_name, std::uintptr_t imm_val )
 {
-    vinstrs.back().vinstrs.push_back( { vinstr_name, true, imm_val } );
+    virt_labels.back().vinstrs.push_back( { vinstr_name, true, imm_val } );
 }
 
 bool parse_t::for_each( callback_t callback )
 {
-    for ( auto &entry : vinstrs )
+    for ( auto &entry : virt_labels )
         if ( !callback( &entry ) )
             return false;
 

src/parser.h

@@ -33,5 +33,5 @@ class parse_t
 
   private:
     parse_t();
-    std::vector< _vlabel_meta > vinstrs;
+    std::vector< _vlabel_meta > virt_labels;
 };