about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--miasm/jitter/arch/JitCore_aarch64.c4
-rw-r--r--miasm/jitter/arch/JitCore_arm.c6
-rw-r--r--miasm/jitter/arch/JitCore_mep.c4
-rw-r--r--miasm/jitter/arch/JitCore_mips32.c4
-rw-r--r--miasm/jitter/arch/JitCore_msp430.c4
-rw-r--r--miasm/jitter/arch/JitCore_ppc32.c2
-rw-r--r--miasm/jitter/arch/JitCore_x86.c24
-rw-r--r--miasm/jitter/arch/JitCore_x86.h2
8 files changed, 25 insertions, 25 deletions
diff --git a/miasm/jitter/arch/JitCore_aarch64.c b/miasm/jitter/arch/JitCore_aarch64.c
index 973d0fc0..7b860257 100644
--- a/miasm/jitter/arch/JitCore_aarch64.c
+++ b/miasm/jitter/arch/JitCore_aarch64.c
@@ -134,7 +134,7 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args)
 	    for (i=0; i < sizeof(gpreg_dict)/sizeof(reg_dict); i++){
 		    if (strcmp(d_key_name, gpreg_dict[i].name))
 			    continue;
-		    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = val;
+		    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = (uint32_t)val;
 		    found = 1;
 		    break;
 	    }
@@ -210,7 +210,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args)
 
 	PyGetInt(item1, i);
 
-	((vm_cpu_t*)self->cpu)->exception_flags = i;
+	((vm_cpu_t*)self->cpu)->exception_flags = (uint32_t)i;
 	Py_INCREF(Py_None);
 	return Py_None;
 }
diff --git a/miasm/jitter/arch/JitCore_arm.c b/miasm/jitter/arch/JitCore_arm.c
index c3e81335..3d8cb784 100644
--- a/miasm/jitter/arch/JitCore_arm.c
+++ b/miasm/jitter/arch/JitCore_arm.c
@@ -108,7 +108,7 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args)
 	    for (i=0; i < sizeof(gpreg_dict)/sizeof(reg_dict); i++){
 		    if (strcmp(d_key_name, gpreg_dict[i].name))
 			    continue;
-		    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = val;
+		    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = (uint32_t)val;
 		    found = 1;
 		    break;
 	    }
@@ -174,7 +174,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args)
 
 	PyGetInt(item1, i);
 
-	((vm_cpu_t*)self->cpu)->exception_flags = i;
+	((vm_cpu_t*)self->cpu)->exception_flags = (uint32_t)i;
 	Py_INCREF(Py_None);
 	return Py_None;
 }
@@ -264,7 +264,7 @@ PyObject* cpu_set_interrupt_num(JitCpu* self, PyObject* args)
 
 	PyGetInt(item1, i);
 
-	((vm_cpu_t*)self->cpu)->interrupt_num = i;
+	((vm_cpu_t*)self->cpu)->interrupt_num = (uint32_t)i;
 	Py_INCREF(Py_None);
 	return Py_None;
 }
diff --git a/miasm/jitter/arch/JitCore_mep.c b/miasm/jitter/arch/JitCore_mep.c
index 8267b7c8..e2ba4c60 100644
--- a/miasm/jitter/arch/JitCore_mep.c
+++ b/miasm/jitter/arch/JitCore_mep.c
@@ -165,7 +165,7 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args)
 	for (i=0; i < sizeof(gpreg_dict)/sizeof(reg_dict); i++){
 	    if (strcmp(d_key_name, gpreg_dict[i].name))
 		continue;
-	    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = val;
+	    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = (uint32_t)val;
 	    found = 1;
 	    break;
 	}
@@ -238,7 +238,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args)
 
     PyGetInt(item1, i);
 
-    ((vm_cpu_t*)self->cpu)->exception_flags = i;
+    ((vm_cpu_t*)self->cpu)->exception_flags = (uint32_t)i;
     Py_INCREF(Py_None);
     return Py_None;
 }
diff --git a/miasm/jitter/arch/JitCore_mips32.c b/miasm/jitter/arch/JitCore_mips32.c
index ada779b9..21fe2e4d 100644
--- a/miasm/jitter/arch/JitCore_mips32.c
+++ b/miasm/jitter/arch/JitCore_mips32.c
@@ -124,7 +124,7 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args)
 	    for (i=0; i < sizeof(gpreg_dict)/sizeof(reg_dict); i++){
 		    if (strcmp(d_key_name, gpreg_dict[i].name))
 			    continue;
-		    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = val;
+		    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = (uint32_t)val;
 		    found = 1;
 		    break;
 	    }
@@ -196,7 +196,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args)
 
 	PyGetInt(item1, i);
 
-	((vm_cpu_t*)self->cpu)->exception_flags = i;
+	((vm_cpu_t*)self->cpu)->exception_flags = (uint32_t)i;
 	Py_INCREF(Py_None);
 	return Py_None;
 }
diff --git a/miasm/jitter/arch/JitCore_msp430.c b/miasm/jitter/arch/JitCore_msp430.c
index 75fd5ca3..fbeb31cd 100644
--- a/miasm/jitter/arch/JitCore_msp430.c
+++ b/miasm/jitter/arch/JitCore_msp430.c
@@ -105,7 +105,7 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args)
 	    for (i=0; i < sizeof(gpreg_dict)/sizeof(reg_dict); i++){
 		    if (strcmp(d_key_name, gpreg_dict[i].name))
 			    continue;
-		    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = val;
+		    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = (uint32_t)val;
 		    found = 1;
 		    break;
 	    }
@@ -173,7 +173,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args)
 
 	PyGetInt(item1, i);
 
-	((vm_cpu_t*)self->cpu)->exception_flags = i;
+	((vm_cpu_t*)self->cpu)->exception_flags = (uint32_t)i;
 	Py_INCREF(Py_None);
 	return Py_None;
 }
diff --git a/miasm/jitter/arch/JitCore_ppc32.c b/miasm/jitter/arch/JitCore_ppc32.c
index b53b9f1d..b61cb517 100644
--- a/miasm/jitter/arch/JitCore_ppc32.c
+++ b/miasm/jitter/arch/JitCore_ppc32.c
@@ -54,7 +54,7 @@ cpu_set_gpreg(JitCpu *self, PyObject *args) {
 	for (i=0; i < sizeof(gpreg_dict)/sizeof(reg_dict); i++){
 	    if (strcmp(d_key_name, gpreg_dict[i].name))
 		continue;
-	    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = val;
+	    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = (uint32_t)val;
 	    found = 1;
 	    break;
 	}
diff --git a/miasm/jitter/arch/JitCore_x86.c b/miasm/jitter/arch/JitCore_x86.c
index cfda1e69..11a21427 100644
--- a/miasm/jitter/arch/JitCore_x86.c
+++ b/miasm/jitter/arch/JitCore_x86.c
@@ -186,15 +186,15 @@ PyObject* cpu_set_gpreg(JitCpu* self, PyObject *args)
 		    switch (gpreg_dict[i].size) {
 			    case 8:
 				    PyGetInt(d_value, val);
-				    *((uint8_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = val;
+				    *((uint8_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = (uint8_t)val;
 				    break;
 			    case 16:
 				    PyGetInt(d_value, val);
-				    *((uint16_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = val;
+				    *((uint16_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = (uint16_t)val;
 				    break;
 			    case 32:
 				    PyGetInt(d_value, val);
-				    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = val;
+				    *((uint32_t*)(((char*)(self->cpu)) + gpreg_dict[i].offset)) = (uint32_t)val;
 				    break;
 			    case 64:
 				    PyGetInt(d_value, val);
@@ -390,7 +390,7 @@ PyObject* cpu_set_exception(JitCpu* self, PyObject* args)
 
 	PyGetInt(item1, i);
 
-	((vm_cpu_t*)self->cpu)->exception_flags = i;
+	((vm_cpu_t*)self->cpu)->exception_flags = (uint32_t)i;
 	Py_INCREF(Py_None);
 	return Py_None;
 }
@@ -410,7 +410,7 @@ PyObject* cpu_set_interrupt_num(JitCpu* self, PyObject* args)
 
 	PyGetInt(item1, i);
 
-	((vm_cpu_t*)self->cpu)->interrupt_num = i;
+	((vm_cpu_t*)self->cpu)->interrupt_num = (uint32_t)i;
 	Py_INCREF(Py_None);
 	return Py_None;
 }
@@ -604,13 +604,13 @@ getset_reg_u64(R15);
 
 getset_reg_u64(RIP);
 
-getset_reg_u64(zf);
-getset_reg_u64(nf);
-getset_reg_u64(pf);
-getset_reg_u64(of);
-getset_reg_u64(cf);
-getset_reg_u64(af);
-getset_reg_u64(df);
+getset_reg_u8(zf);
+getset_reg_u8(nf);
+getset_reg_u8(pf);
+getset_reg_u8(of);
+getset_reg_u8(cf);
+getset_reg_u8(af);
+getset_reg_u8(df);
 
 
 getset_reg_u16(ES);
diff --git a/miasm/jitter/arch/JitCore_x86.h b/miasm/jitter/arch/JitCore_x86.h
index 27d94d7c..b03fa959 100644
--- a/miasm/jitter/arch/JitCore_x86.h
+++ b/miasm/jitter/arch/JitCore_x86.h
@@ -120,7 +120,7 @@ typedef struct {
 	bn_t XMM14;
 	bn_t XMM15;
 
-	uint32_t segm_base[0x10000];
+	uint64_t segm_base[0x10000];
 
 }vm_cpu_t;