audio.engine.test: cleanup using

[factor.git] / vm / quotations.hpp

diff --git a/vm/quotations.hpp b/vm/quotations.hpp
index cb61820d38d97cd2d16687b14ffe9379765c8292..3c659126dc0ddf53e64a70403dc6be449a73bf27 100644 (file)
--- a/vm/quotations.hpp
+++ b/vm/quotations.hpp
@@ -4,19 +4,17 @@ struct quotation_jit : public jit {
   data_root<array> elements;
   bool compiling, relocate;
 
+  // Allocates memory
   quotation_jit(cell owner, bool compiling, bool relocate, factor_vm* vm)
-      : jit(code_block_unoptimized, owner, vm),
+      : jit(owner, vm),
         elements(false_object, vm),
         compiling(compiling),
         relocate(relocate) {}
-  ;
 
+  cell nth(cell index);
   void init_quotation(cell quot);
-  void emit_mega_cache_lookup(cell methods, fixnum index, cell cache);
+
   bool primitive_call_p(cell i, cell length);
-  bool trivial_quotation_p(array* elements);
-  void emit_quotation(cell quot);
-  void emit_epilog(bool needed);
   bool fast_if_p(cell i, cell length);
   bool fast_dip_p(cell i, cell length);
   bool fast_2dip_p(cell i, cell length);
@@ -24,10 +22,29 @@ struct quotation_jit : public jit {
   bool mega_lookup_p(cell i, cell length);
   bool declare_p(cell i, cell length);
   bool special_subprimitive_p(cell obj);
+
+  void emit_mega_cache_lookup(cell methods, fixnum index, cell cache);
+  void emit_quotation(cell quot);
+  void emit_epilog(bool needed);
+
   cell word_stack_frame_size(cell obj);
-  bool word_safepoint_p(cell obj);
-  bool no_non_safepoint_words_p();
+  bool stack_frame_p();
   void iterate_quotation();
+
+  // Allocates memory
+  void word_call(cell word) {
+    emit_with_literal(parent->special_objects[JIT_WORD_CALL], word);
+  }
+
+  // Allocates memory (literal(), emit())
+  void word_jump(cell word_) {
+    data_root<word> word(word_, parent);
+#ifndef FACTOR_AMD64
+    literal(tag_fixnum(xt_tail_pic_offset));
+#endif
+    literal(word.value());
+    emit(parent->special_objects[JIT_WORD_JUMP]);
+  }
 };
 
 VM_C_API cell lazy_jit_compile(cell quot, factor_vm* parent);