about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--miasm2/jitter/arch/JitCore_aarch64.c2
-rw-r--r--miasm2/jitter/arch/JitCore_aarch64.h1
-rw-r--r--miasm2/jitter/arch/JitCore_arm.c10
-rw-r--r--miasm2/jitter/arch/JitCore_arm.h2
-rw-r--r--miasm2/jitter/arch/JitCore_mips32.h1
-rw-r--r--miasm2/jitter/arch/JitCore_msp430.c2
-rw-r--r--miasm2/jitter/arch/JitCore_msp430.h3
-rw-r--r--miasm2/jitter/arch/JitCore_x86.h1
-rw-r--r--miasm2/jitter/vm_mngr_py.c32
9 files changed, 27 insertions, 27 deletions
diff --git a/miasm2/jitter/arch/JitCore_aarch64.c b/miasm2/jitter/arch/JitCore_aarch64.c
index 15a3c27c..8674b684 100644
--- a/miasm2/jitter/arch/JitCore_aarch64.c
+++ b/miasm2/jitter/arch/JitCore_aarch64.c
@@ -171,7 +171,7 @@ void dump_gpregs(vm_cpu_t* vmcpu)
 
 
 	printf("SP  %.16"PRIX64" PC  %.16"PRIX64" "\
-	       "zf  %.16"PRIX32" nf  %.16"PRIX32" of  %.16"PRIX32" cf  %.16"PRIX32"\n",
+	       "zf  %"PRIX32" nf  %"PRIX32" of  %"PRIX32" cf  %"PRIX32"\n",
 	       vmcpu->SP, vmcpu->PC,
 	       vmcpu->zf, vmcpu->nf, vmcpu->of, vmcpu->cf);
 }
diff --git a/miasm2/jitter/arch/JitCore_aarch64.h b/miasm2/jitter/arch/JitCore_aarch64.h
index 2203e037..4635b395 100644
--- a/miasm2/jitter/arch/JitCore_aarch64.h
+++ b/miasm2/jitter/arch/JitCore_aarch64.h
@@ -46,6 +46,7 @@ typedef struct {
 	uint32_t cf;
 }vm_cpu_t;
 
+void dump_gpregs(vm_cpu_t* vmcpu);
 
 uint64_t udiv64(vm_cpu_t* vmcpu, uint64_t a, uint64_t b);
 uint64_t umod64(vm_cpu_t* vmcpu, uint64_t a, uint64_t b);
diff --git a/miasm2/jitter/arch/JitCore_arm.c b/miasm2/jitter/arch/JitCore_arm.c
index 90e72ea4..a7ed67d0 100644
--- a/miasm2/jitter/arch/JitCore_arm.c
+++ b/miasm2/jitter/arch/JitCore_arm.c
@@ -117,15 +117,15 @@ PyObject * cpu_init_regs(JitCpu* self)
 
 void dump_gpregs(vm_cpu_t* vmcpu)
 {
-	printf("R0 %.16"PRIX32" R1 %.16"PRIX32" R2 %.16"PRIX32" R3 %.16"PRIX32"\n",
+	printf("R0  %.16"PRIX32" R1  %.16"PRIX32" R2  %.16"PRIX32" R3  %.16"PRIX32" ",
 	       vmcpu->R0, vmcpu->R1, vmcpu->R2, vmcpu->R3);
-	printf("R4 %.16"PRIX32" R5 %.16"PRIX32" R6 %.16"PRIX32" R7 %.16"PRIX32"\n",
+	printf("R4  %.16"PRIX32" R5  %.16"PRIX32" R6  %.16"PRIX32" R7  %.16"PRIX32"\n",
 	       vmcpu->R4, vmcpu->R5, vmcpu->R6, vmcpu->R7);
-	printf("R8 %.16"PRIX32" R9 %.16"PRIX32" R10 %.16"PRIX32" R11 %.16"PRIX32"\n",
+	printf("R8  %.16"PRIX32" R9  %.16"PRIX32" R10 %.16"PRIX32" R11 %.16"PRIX32" ",
 	       vmcpu->R8, vmcpu->R9, vmcpu->R10, vmcpu->R11);
-	printf("R12 %.16"PRIX32" SP %.16"PRIX32" LR %.16"PRIX32" PC %.16"PRIX32"\n",
+	printf("R12 %.16"PRIX32" SP  %.16"PRIX32" LR  %.16"PRIX32" PC  %.16"PRIX32" ",
 	       vmcpu->R12, vmcpu->SP, vmcpu->LR, vmcpu->PC);
-	printf("zf %.16"PRIX32" nf %.16"PRIX32" of %.16"PRIX32" cf %.16"PRIX32"\n",
+	printf("zf %"PRIX32" nf %"PRIX32" of %"PRIX32" cf %"PRIX32"\n",
 	       vmcpu->zf, vmcpu->nf, vmcpu->of, vmcpu->cf);
 }
 
diff --git a/miasm2/jitter/arch/JitCore_arm.h b/miasm2/jitter/arch/JitCore_arm.h
index 976ff124..9fde5e93 100644
--- a/miasm2/jitter/arch/JitCore_arm.h
+++ b/miasm2/jitter/arch/JitCore_arm.h
@@ -29,6 +29,6 @@ typedef struct {
 }vm_cpu_t;
 
 
+void dump_gpregs(vm_cpu_t* vmcpu);
 
-//#define RETURN_PC return PyLong_FromUnsignedLongLong(vmcpu->PC);
 #define RETURN_PC return BlockDst;
diff --git a/miasm2/jitter/arch/JitCore_mips32.h b/miasm2/jitter/arch/JitCore_mips32.h
index 55c63d3b..ff2045d7 100644
--- a/miasm2/jitter/arch/JitCore_mips32.h
+++ b/miasm2/jitter/arch/JitCore_mips32.h
@@ -335,5 +335,4 @@ typedef struct {
 
 void dump_gpregs(vm_cpu_t* vmcpu);
 
-//#define RETURN_PC return PyLong_FromUnsignedLongLong(vmcpu->PC);
 #define RETURN_PC return BlockDst;
diff --git a/miasm2/jitter/arch/JitCore_msp430.c b/miasm2/jitter/arch/JitCore_msp430.c
index 977b0777..bfa35926 100644
--- a/miasm2/jitter/arch/JitCore_msp430.c
+++ b/miasm2/jitter/arch/JitCore_msp430.c
@@ -142,7 +142,7 @@ void dump_gpregs(vm_cpu_t* vmcpu)
 	       vmcpu->R8, vmcpu->R9, vmcpu->R10, vmcpu->R11);
 	printf("R12 %.4"PRIX32" R13 %.4"PRIX32" R14 %.4"PRIX32" R15 %.4"PRIX32"\n",
 	       vmcpu->R12, vmcpu->R13, vmcpu->R14, vmcpu->R15);
-	printf("zf %.4"PRIX32" nf %.4"PRIX32" of %.4"PRIX32" cf %.4"PRIX32"\n",
+	printf("zf %"PRIX32" nf %"PRIX32" of %"PRIX32" cf %"PRIX32"\n",
 	       vmcpu->zf, vmcpu->nf, vmcpu->of, vmcpu->cf);
 }
 
diff --git a/miasm2/jitter/arch/JitCore_msp430.h b/miasm2/jitter/arch/JitCore_msp430.h
index 03b0bb25..cad028a9 100644
--- a/miasm2/jitter/arch/JitCore_msp430.h
+++ b/miasm2/jitter/arch/JitCore_msp430.h
@@ -34,7 +34,6 @@ typedef struct {
 
 }vm_cpu_t;
 
-//#define RETURN_PC return PyLong_FromUnsignedLongLong(vmcpu->PC);
 #define RETURN_PC return BlockDst;
 
 uint16_t bcdadd_16(uint16_t a, uint16_t b);
@@ -48,3 +47,5 @@ uint8_t hex2bcd_8(uint8_t a);
 uint8_t bcd2hex_8(uint8_t a);
 
 uint16_t bcd2hex_16(uint16_t a);
+
+void dump_gpregs(vm_cpu_t* vmcpu);
diff --git a/miasm2/jitter/arch/JitCore_x86.h b/miasm2/jitter/arch/JitCore_x86.h
index d4282640..e55948e6 100644
--- a/miasm2/jitter/arch/JitCore_x86.h
+++ b/miasm2/jitter/arch/JitCore_x86.h
@@ -123,5 +123,4 @@ uint16_t umod16(vm_cpu_t* vmcpu, uint16_t a, uint16_t b);
 int16_t idiv16(vm_cpu_t* vmcpu, int16_t a, int16_t b);
 int16_t imod16(vm_cpu_t* vmcpu, int16_t a, int16_t b);
 
-//#define RETURN_PC return PyLong_FromUnsignedLongLong(vmcpu->RIP);
 #define RETURN_PC return BlockDst;
diff --git a/miasm2/jitter/vm_mngr_py.c b/miasm2/jitter/vm_mngr_py.c
index 891d4459..a7350f51 100644
--- a/miasm2/jitter/vm_mngr_py.c
+++ b/miasm2/jitter/vm_mngr_py.c
@@ -197,22 +197,22 @@ PyObject* vm_set_mem(VmMngr* self, PyObject* args)
 
 PyObject* vm_get_mem_access(VmMngr* self, PyObject* args)
 {
-        PyObject *py_addr;
-        uint64_t page_addr;
-        struct memory_page_node * mpn;
-
-        if (!PyArg_ParseTuple(args, "O", &py_addr))
-                return NULL;
-
-        PyGetInt(py_addr, page_addr);
-
-        mpn = get_memory_page_from_address(&self->vm_mngr, page_addr, 1);
-        if (!mpn){
-                PyErr_SetString(PyExc_RuntimeError, "cannot find address");
-                return 0;
-        }
-      
-        return PyLong_FromUnsignedLongLong((uint64_t)mpn->access);
+	PyObject *py_addr;
+	uint64_t page_addr;
+	struct memory_page_node * mpn;
+
+	if (!PyArg_ParseTuple(args, "O", &py_addr))
+		return NULL;
+
+	PyGetInt(py_addr, page_addr);
+
+	mpn = get_memory_page_from_address(&self->vm_mngr, page_addr, 1);
+	if (!mpn){
+		PyErr_SetString(PyExc_RuntimeError, "cannot find address");
+		return 0;
+	}
+
+	return PyLong_FromUnsignedLongLong((uint64_t)mpn->access);
 }
 
 PyObject* vm_get_mem(VmMngr* self, PyObject* args)