Read-lock the memory object while running code

Sekedo664 · Dec 25, 2017 · ce9f624 · ce9f624
1 parent 07c4ab8
commit ce9f624
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/emu/interp.c b/emu/interp.c
@@ -620,6 +620,7 @@
 flatten void cpu_run(struct cpu_state *cpu) {
     int i = 0;
     struct tlb *tlb = tlb_new(cpu->mem);
+    read_wrlock(&cpu->mem->lock);
     int changes = cpu->mem->changes;
     while (true) {
         int interrupt = cpu_step32(cpu, tlb);
@@ -629,7 +630,9 @@ flatten void cpu_run(struct cpu_state *cpu) {
         }
         if (interrupt != INT_NONE) {
             cpu->trapno = interrupt;
+            read_wrunlock(&cpu->mem->lock);
             handle_interrupt(interrupt);
+            read_wrlock(&cpu->mem->lock);
             if (tlb->mem != cpu->mem)
                 tlb->mem = cpu->mem;
             if (cpu->mem->changes != changes) {