diff options
| author | Camille Mougey <commial@gmail.com> | 2018-03-28 15:22:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-28 15:22:51 +0200 |
| commit | 5b07d8c8828bdaba0c9a4ce63e978441d5dab525 (patch) | |
| tree | aa61c08b6da9a914c0ec5d4f0a516d6f365d5da3 /miasm2/jitter/vm_mngr.c | |
| parent | 92e508bc505fc8c23cc2a50ee6abfb03ccfa3ce4 (diff) | |
| parent | 719266807687e0a9a5b4f194d7c2220974a2e83f (diff) | |
| download | miasm-5b07d8c8828bdaba0c9a4ce63e978441d5dab525.tar.gz miasm-5b07d8c8828bdaba0c9a4ce63e978441d5dab525.zip | |
Merge pull request #707 from serpilliere/fix_bp_memory_name
Fix memory breakpoint name
Diffstat (limited to 'miasm2/jitter/vm_mngr.c')
| -rw-r--r-- | miasm2/jitter/vm_mngr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/miasm2/jitter/vm_mngr.c b/miasm2/jitter/vm_mngr.c index 3c324a08..8e50a6dd 100644 --- a/miasm2/jitter/vm_mngr.c +++ b/miasm2/jitter/vm_mngr.c @@ -220,7 +220,7 @@ static uint64_t memory_page_read(vm_mngr_t* vm_mngr, unsigned int my_size, uint6 if ((b->access & BREAKPOINT_READ) == 0) continue; if ((b->ad <= ad) && (ad < b->ad + b->size)) - vm_mngr->exception_flags |= EXCEPT_BREAKPOINT_INTERN; + vm_mngr->exception_flags |= EXCEPT_BREAKPOINT_MEMORY; } @@ -306,7 +306,7 @@ static void memory_page_write(vm_mngr_t* vm_mngr, unsigned int my_size, if ((b->access & BREAKPOINT_WRITE) == 0) continue; if ((b->ad <= ad) && (ad < b->ad + b->size)) - vm_mngr->exception_flags |= EXCEPT_BREAKPOINT_INTERN; + vm_mngr->exception_flags |= EXCEPT_BREAKPOINT_MEMORY; } addr = &((unsigned char*)mpn->ad_hp)[ad - mpn->ad]; @@ -495,13 +495,13 @@ void check_memory_breakpoint(vm_mngr_t* vm_mngr) /* Check memory breakpoints */ LIST_FOREACH(memory_bp, &vm_mngr->memory_breakpoint_pool, next) { - if (vm_mngr->exception_flags & EXCEPT_BREAKPOINT_INTERN) + if (vm_mngr->exception_flags & EXCEPT_BREAKPOINT_MEMORY) break; if (memory_bp->access & BREAKPOINT_READ) { for (i=0;i<vm_mngr->memory_r.num; i++) { if ((memory_bp->ad < vm_mngr->memory_r.array[i].stop) && (vm_mngr->memory_r.array[i].start < memory_bp->ad + memory_bp->size)) { - vm_mngr->exception_flags |= EXCEPT_BREAKPOINT_INTERN; + vm_mngr->exception_flags |= EXCEPT_BREAKPOINT_MEMORY; break; } } @@ -510,7 +510,7 @@ void check_memory_breakpoint(vm_mngr_t* vm_mngr) for (i=0;i<vm_mngr->memory_w.num; i++) { if ((memory_bp->ad < vm_mngr->memory_w.array[i].stop) && (vm_mngr->memory_w.array[i].start < memory_bp->ad + memory_bp->size)) { - vm_mngr->exception_flags |= EXCEPT_BREAKPOINT_INTERN; + vm_mngr->exception_flags |= EXCEPT_BREAKPOINT_MEMORY; break; } } |