diff options
Diffstat (limited to 'miasm2/jitter/vm_mngr.c')
| -rw-r--r-- | miasm2/jitter/vm_mngr.c | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/miasm2/jitter/vm_mngr.c b/miasm2/jitter/vm_mngr.c index dd0f6cf2..9b7a4c98 100644 --- a/miasm2/jitter/vm_mngr.c +++ b/miasm2/jitter/vm_mngr.c @@ -101,14 +101,6 @@ uint64_t set_endian64(vm_mngr_t* vm_mngr, uint64_t val) return Endian64_Swap(val); } -uint128_t set_endian128(vm_mngr_t* vm_mngr, uint128_t val) -{ - if (vm_mngr->sex == __BYTE_ORDER) - return val; - else - return Endian128_Swap(val); -} - void print_val(uint64_t base, uint64_t addr) { uint64_t *ptr = (uint64_t *) (intptr_t) addr; @@ -163,14 +155,11 @@ struct memory_page_node * get_memory_page_from_address(vm_mngr_t* vm_mngr, uint6 return NULL; } - - - -static uint128_t memory_page_read(vm_mngr_t* vm_mngr, unsigned int my_size, uint64_t ad) +static uint64_t memory_page_read(vm_mngr_t* vm_mngr, unsigned int my_size, uint64_t ad) { struct memory_page_node * mpn; unsigned char * addr; - uint128_t ret = 0; + uint64_t ret = 0; struct memory_breakpoint_info * b; @@ -213,11 +202,8 @@ static uint128_t memory_page_read(vm_mngr_t* vm_mngr, unsigned int my_size, uint ret = *((uint64_t*)addr)&0xFFFFFFFFFFFFFFFFULL; ret = set_endian64(vm_mngr, ret); break; - case 128: - ret = *((uint128_t*)addr)&MASK_128; - ret = set_endian128(vm_mngr, ret); - break; default: + fprintf(stderr, "Bad memory access size %d\n", my_size); exit(EXIT_FAILURE); break; } @@ -249,10 +235,8 @@ static uint128_t memory_page_read(vm_mngr_t* vm_mngr, unsigned int my_size, uint case 64: ret = set_endian64(vm_mngr, ret); break; - case 128: - ret = set_endian128(vm_mngr, ret); - break; default: + fprintf(stderr, "Bad memory access size %d\n", my_size); exit(EXIT_FAILURE); break; } @@ -261,7 +245,7 @@ static uint128_t memory_page_read(vm_mngr_t* vm_mngr, unsigned int my_size, uint } static void memory_page_write(vm_mngr_t* vm_mngr, unsigned int my_size, - uint64_t ad, uint128_t src) + uint64_t ad, uint64_t src) { struct memory_page_node * mpn; unsigned char * addr; @@ -305,11 +289,8 @@ static void memory_page_write(vm_mngr_t* vm_mngr, unsigned int my_size, src = set_endian64(vm_mngr, src); *((uint64_t*)addr) = src&0xFFFFFFFFFFFFFFFFULL; break; - case 128: - src = set_endian128(vm_mngr, src); - *((uint128_t*)addr) = src&MASK_128; - break; default: + fprintf(stderr, "Bad memory access size %d\n", my_size); exit(EXIT_FAILURE); break; } @@ -330,10 +311,8 @@ static void memory_page_write(vm_mngr_t* vm_mngr, unsigned int my_size, case 64: src = set_endian64(vm_mngr, src); break; - case 128: - src = set_endian128(vm_mngr, src); - break; default: + fprintf(stderr, "Bad memory access size %d\n", my_size); exit(EXIT_FAILURE); break; } @@ -501,12 +480,6 @@ void vm_MEM_WRITE_64(vm_mngr_t* vm_mngr, uint64_t addr, uint64_t src) memory_page_write(vm_mngr, 64, addr, src); } -void vm_MEM_WRITE_128(vm_mngr_t* vm_mngr, uint64_t addr, uint128_t src) -{ - add_mem_write(vm_mngr, addr, 16); - memory_page_write(vm_mngr, 128, addr, src); -} - unsigned char vm_MEM_LOOKUP_08(vm_mngr_t* vm_mngr, uint64_t addr) { unsigned char ret; @@ -535,13 +508,6 @@ uint64_t vm_MEM_LOOKUP_64(vm_mngr_t* vm_mngr, uint64_t addr) ret = memory_page_read(vm_mngr, 64, addr); return ret; } -uint128_t vm_MEM_LOOKUP_128(vm_mngr_t* vm_mngr, uint128_t addr) -{ - uint128_t ret; - add_mem_read(vm_mngr, addr, 16); - ret = memory_page_read(vm_mngr, 128, addr); - return ret; -} int vm_read_mem(vm_mngr_t* vm_mngr, uint64_t addr, char** buffer_ptr, uint64_t size) |