about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2016-11-10 11:16:27 +0100
committerGitHub <noreply@github.com>2016-11-10 11:16:27 +0100
commitc106fd74add334b24533156820072a3558b1a725 (patch)
tree89ea8fd4fa11b53829cd7eec49cd30716b1615c2
parent9821e83e79a45e45a99ed89eb8951bd278cc83d8 (diff)
parentb355224fe635cb2df332f1b97a6f3091c5c7b8cb (diff)
downloadmiasm-c106fd74add334b24533156820072a3558b1a725.tar.gz
miasm-c106fd74add334b24533156820072a3558b1a725.zip
Merge pull request #449 from commial/fix/vm-page-addrsize
Fix/vm page addrsize
-rw-r--r--miasm2/jitter/vm_mngr.c4
-rw-r--r--miasm2/jitter/vm_mngr.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/miasm2/jitter/vm_mngr.c b/miasm2/jitter/vm_mngr.c
index df8326d9..a8cc7639 100644
--- a/miasm2/jitter/vm_mngr.c
+++ b/miasm2/jitter/vm_mngr.c
@@ -1515,7 +1515,7 @@ void init_memory_page_pool(vm_mngr_t* vm_mngr)
 void init_code_bloc_pool(vm_mngr_t* vm_mngr)
 {
 	LIST_INIT(&vm_mngr->code_bloc_pool);
-	vm_mngr->code_bloc_pool_ad_min = 0xffffffff;
+	vm_mngr->code_bloc_pool_ad_min = 0xffffffffffffffffULL;
 	vm_mngr->code_bloc_pool_ad_max = 0;
 
 	memory_access_list_init(&(vm_mngr->memory_r));
@@ -1555,7 +1555,7 @@ void reset_code_bloc_pool(vm_mngr_t* vm_mngr)
 		LIST_REMOVE(cbp, next);
 		free(cbp);
 	}
-	vm_mngr->code_bloc_pool_ad_min = 0xffffffff;
+	vm_mngr->code_bloc_pool_ad_min = 0xffffffffffffffffULL;
 	vm_mngr->code_bloc_pool_ad_max = 0;
 }
 
diff --git a/miasm2/jitter/vm_mngr.h b/miasm2/jitter/vm_mngr.h
index 13ec065a..d3583b52 100644
--- a/miasm2/jitter/vm_mngr.h
+++ b/miasm2/jitter/vm_mngr.h
@@ -92,9 +92,8 @@ typedef struct {
 	int memory_pages_number;
 	struct memory_page_node* memory_pages_array;
 
-	unsigned int *code_addr_tab;
-	unsigned int code_bloc_pool_ad_min;
-	unsigned int code_bloc_pool_ad_max;
+	uint64_t code_bloc_pool_ad_min;
+	uint64_t code_bloc_pool_ad_max;
 
 	uint64_t exception_flags;
 	uint64_t exception_flags_new;