summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-08-06 15:07:26 +0200
committerAndy Wingo <wingo@pobox.com>2018-08-06 15:07:26 +0200
commitdedf73d3703618439973f66e9a29ccbfc1a9f65d (patch)
treee3f38378533d7431347f0faef043d258829f2f79
parent8f25f75bf1c732a25011ed8d52ff26458ea2c8f0 (diff)
downloadguile-dedf73d3703618439973f66e9a29ccbfc1a9f65d.tar.gz
Consolidate apply hook to instrument-entry instruction
* libguile/vm.c (scm_call_n): * libguile/vm-engine.c: Move apply hook to "instrument-entry" instruction.
-rw-r--r--libguile/vm-engine.c14
-rw-r--r--libguile/vm.c3
2 files changed, 3 insertions, 14 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 63e8de8b4..5ca75e0bc 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -386,8 +386,6 @@ VM_NAME (scm_thread *thread)
CACHE_REGISTER ();
}
- APPLY_HOOK ();
-
NEXT (0);
}
@@ -423,8 +421,6 @@ VM_NAME (scm_thread *thread)
ip += label;
- APPLY_HOOK ();
-
NEXT (0);
}
@@ -445,8 +441,6 @@ VM_NAME (scm_thread *thread)
CACHE_REGISTER ();
}
- APPLY_HOOK ();
-
NEXT (0);
}
@@ -463,8 +457,6 @@ VM_NAME (scm_thread *thread)
ip += label;
- APPLY_HOOK ();
-
NEXT (0);
}
@@ -499,6 +491,8 @@ VM_NAME (scm_thread *thread)
else
data->counter += SCM_JIT_COUNTER_ENTRY_INCREMENT;
+ APPLY_HOOK ();
+
NEXT (2);
}
@@ -767,8 +761,6 @@ VM_NAME (scm_thread *thread)
CACHE_REGISTER ();
}
- APPLY_HOOK ();
-
NEXT (0);
}
@@ -2387,7 +2379,7 @@ VM_NAME (scm_thread *thread)
CALL_INTRINSIC (push_interrupt_frame, (thread, 0));
CACHE_SP ();
ip = (uint32_t *) vm_handle_interrupt_code;
- APPLY_HOOK ();
+
NEXT (0);
}
diff --git a/libguile/vm.c b/libguile/vm.c
index d1e5d519b..1ad95babe 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -1435,9 +1435,6 @@ scm_call_n (SCM proc, SCM *argv, size_t nargs)
else
/* FIXME: Make this return an IP. */
apply_non_program (thread);
-
- if (vp->trace_level)
- vm_dispatch_apply_hook (thread);
}
thread->vm.registers = &registers;