diff --git a/include/vmlifters.hpp b/include/vmlifters.hpp index d1da347..e6f7179 100644 --- a/include/vmlifters.hpp +++ b/include/vmlifters.hpp @@ -16,9 +16,9 @@ namespace vm::lifters return { vtil::register_virtual, ( size_t )context_offset / 8, size * 8, ( context_offset % 8 ) * 8 }; } - extern lifter_t lregq, lregdw; - extern lifter_t addq, adddw, addw; - extern lifter_t sregq, sregdw, sregw; + extern vm::lifters::lifter_t lregq, lregdw; + extern vm::lifters::lifter_t addq, adddw, addw; + extern vm::lifters::lifter_t sregq, sregdw, sregw; inline std::map< vm::handler::mnemonic_t, lifter_callback_t > all = { // lreg lifters... diff --git a/src/vmlifters/add.cpp b/src/vmlifters/add.cpp index 4afc9d0..f52bdc9 100644 --- a/src/vmlifters/add.cpp +++ b/src/vmlifters/add.cpp @@ -2,7 +2,7 @@ namespace vm::lifters { - lifter_t addq = { + vm::lifters::lifter_t addq = { // vsp[0] = vsp[1] + vsp[0]; vm::handler::ADDQ, []( vtil::basic_block *blk, vm::instrs::virt_instr_t *vinstr ) { auto [ t0, t1 ] = blk->tmp( 64, 64 ); @@ -13,7 +13,7 @@ namespace vm::lifters blk->pushf(); } }; - lifter_t adddw = { + vm::lifters::lifter_t adddw = { // vsp[0] = vsp[1] + vsp[0]; vm::handler::ADDDW, []( vtil::basic_block *blk, vm::instrs::virt_instr_t *vinstr ) { auto [ t0, t1 ] = blk->tmp( 32, 32 ); @@ -24,7 +24,7 @@ namespace vm::lifters blk->pushf(); } }; - lifter_t addw = { + vm::lifters::lifter_t addw = { // vsp[0] = vsp[1] + vsp[0]; vm::handler::ADDW, []( vtil::basic_block *blk, vm::instrs::virt_instr_t *vinstr ) { auto [ t0, t1 ] = blk->tmp( 16, 16 ); diff --git a/src/vmlifters/lreg.cpp b/src/vmlifters/lreg.cpp index 7db2ad8..324b876 100644 --- a/src/vmlifters/lreg.cpp +++ b/src/vmlifters/lreg.cpp @@ -2,13 +2,13 @@ namespace vm::lifters { - lifter_t lregq = { + vm::lifters::lifter_t lregq = { // push vregX vm::handler::LREGQ, []( vtil::basic_block *blk, vm::instrs::virt_instr_t *vinstr ) { blk->push( make_virtual_register( vinstr->operand.imm.u, 8 ) ); } }; - lifter_t lregdw = { + vm::lifters::lifter_t lregdw = { // push vregX vm::handler::LREGDW, []( vtil::basic_block *blk, vm::instrs::virt_instr_t *vinstr ) { blk->push( make_virtual_register( vinstr->operand.imm.u, 4 ) ); diff --git a/src/vmlifters/sreg.cpp b/src/vmlifters/sreg.cpp index 59022e4..c6d6698 100644 --- a/src/vmlifters/sreg.cpp +++ b/src/vmlifters/sreg.cpp @@ -2,19 +2,19 @@ namespace vm::lifters { - lifter_t sregq = { + vm::lifters::lifter_t sregq = { // pop vregX vm::handler::SREGQ, []( vtil::basic_block *blk, vm::instrs::virt_instr_t *vinstr ) { blk->pop( make_virtual_register( vinstr->operand.imm.u, 8 ) ); } }; - lifter_t sregdw = { + vm::lifters::lifter_t sregdw = { // pop vregX vm::handler::SREGDW, []( vtil::basic_block *blk, vm::instrs::virt_instr_t *vinstr ) { blk->pop( make_virtual_register( vinstr->operand.imm.u, 4 ) ); } }; - lifter_t sregw = { + vm::lifters::lifter_t sregw = { // pop vregX vm::handler::SREGW, []( vtil::basic_block *blk, vm::instrs::virt_instr_t *vinstr ) { blk->pop( make_virtual_register( vinstr->operand.imm.u, 2 ) ); diff --git a/vmprofiler.vcxproj b/vmprofiler.vcxproj index 3b08b53..0b0bbd6 100644 --- a/vmprofiler.vcxproj +++ b/vmprofiler.vcxproj @@ -64,6 +64,7 @@ stdcpplatest Disabled MultiThreadedDLL + $(IntDir)%(RelativeDir) Console @@ -87,6 +88,7 @@ stdcpplatest Disabled MultiThreadedDebugDLL + $(IntDir)%(RelativeDir) Console @@ -166,7 +168,8 @@ - + + diff --git a/vmprofiler.vcxproj.filters b/vmprofiler.vcxproj.filters index 23968ce..b6c647e 100644 --- a/vmprofiler.vcxproj.filters +++ b/vmprofiler.vcxproj.filters @@ -261,7 +261,10 @@ Source Files\vmlifters - + + Source Files\vmlifters + + Source Files\vmlifters