Changeset 12638

Timestamp:

04/28/10 21:04:28 (13 years ago)

Author:

astalla

Message:

Experimental: special operator to insert inline bytecode in compiled Lisp functions.

Location:

branches/less-reflection/abcl/src/org/armedbear/lisp

Files:

• Lisp.java (modified) (1 diff)
• compiler-pass1.lisp (modified) (1 diff)
• compiler-pass2.lisp (modified) (3 diffs)
• precompiler.lisp (modified) (1 diff)

branches/less-reflection/abcl/src/org/armedbear/lisp/Lisp.java

@@ -2740 +2740 @@
   }
 
+  private static final SpecialOperator WITH_INLINE_CODE = new with_inline_code();
+  private static class with_inline_code extends SpecialOperator {
+    with_inline_code() {
+      super("with-inline-code", PACKAGE_JVM, true, "(&optional target repr) &body body");
+    }
+    @Override
+    public LispObject execute(LispObject args, Environment env)
+    {
+  return error(new SimpleError("This is a placeholder. It should only be called in compiled code, and tranformed by the compiler using special form handlers."));
+    }
+  }
+
 }

branches/less-reflection/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

@@ -1433 +1433 @@
                   (UNWIND-PROTECT       p1-unwind-protect)
                   (THREADS:SYNCHRONIZED-ON
-                                        p1-threads-synchronized-on)))
+                                        p1-threads-synchronized-on)
+      (JVM::WITH-INLINE-CODE identity)))
     (install-p1-handler (%car pair) (%cadr pair))))
 

branches/less-reflection/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -2180 +2180 @@
     (*code* *static-code*))
      ;; fixme *declare-inline*
-     (declare-field g +lisp-object+ +field-access-default+)
+     (declare-field g +lisp-object+ +field-access-private+)
      (emit 'new class-name)
      (emit 'dup)
@@ -8609 +8609 @@
   t)
 
+(defun p2-with-inline-code (form target representation)
+  ;;form = (with-inline-code (&optional target-var repr-var) ...body...)
+  (destructuring-bind (&optional target-var repr-var) (cadr form)
+    (eval `(let (,@(when target-var `((,target-var ,target)))
+     ,@(when repr-var `((,repr-var ,representation))))
+       ,@(cddr form)))))
+
 (defun compile-1 (compiland stream)
   (let ((*all-variables* nil)
@@ -8987 +8994 @@
   (install-p2-handler 'write-8-bits        'p2-write-8-bits)
   (install-p2-handler 'zerop               'p2-zerop)
+  (install-p2-handler 'with-inline-code    'p2-with-inline-code)
   t)
 

branches/less-reflection/abcl/src/org/armedbear/lisp/precompiler.lisp

@@ -1022 +1022 @@
 
                   (THREADS:SYNCHRONIZED-ON
-                                        precompile-threads-synchronized-on)))
+                                        precompile-threads-synchronized-on)
+      
+      (JVM::WITH-INLINE-CODE precompile-identity)))
     (install-handler (first pair) (second pair))))