about summary refs log tree commit diff
path: root/tvix/eval/src/vm.rs
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-08-13T18·29+0300
committertazjin <tazjin@tvl.su>2022-08-30T16·53+0000
commit57d0dbb1c62401559533ced7c1c686da5125df75 (patch)
tree1865da67e2e335b9e00c7a7a22a74571c0658291 /tvix/eval/src/vm.rs
parentdd0d6249190db1ab09dfbe4debcf857f7781616b (diff)
feat(tvix/eval): implement optional runtime tracing r/4533
This adds a `disassembler` feature to the crate configuration that
traces the operations executed and the state of the stack at runtime.

This can be enabled by compiling with `--feature disassembler`.

This will also gain a more sensible layout of code slices eventually.

Change-Id: I34c15e1cd346ecc4362b5afba6bf82dd49359d20
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6193
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/src/vm.rs')
-rw-r--r--tvix/eval/src/vm.rs14
1 files changed, 13 insertions, 1 deletions
diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs
index 8ee1725860..0d0249e3f6 100644
--- a/tvix/eval/src/vm.rs
+++ b/tvix/eval/src/vm.rs
@@ -10,6 +10,9 @@ use crate::{
     value::{NixAttrs, NixList, Value},
 };
 
+#[cfg(feature = "disassembler")]
+use crate::disassembler::Tracer;
+
 pub struct VM {
     ip: usize,
     chunk: Chunk,
@@ -88,8 +91,12 @@ impl VM {
     }
 
     fn run(&mut self) -> EvalResult<Value> {
+        #[cfg(feature = "disassembler")]
+        let mut tracer = Tracer::new();
+
         loop {
-            match self.inc_ip() {
+            let op = self.inc_ip();
+            match op {
                 OpCode::OpConstant(idx) => {
                     let c = self.chunk.constant(idx).clone();
                     self.push(c);
@@ -261,6 +268,11 @@ impl VM {
                 }
             }
 
+            #[cfg(feature = "disassembler")]
+            {
+                tracer.trace(&op, self.ip, &self.stack);
+            }
+
             if self.ip == self.chunk.code.len() {
                 return Ok(self.pop());
             }