X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/9ec578d9fe450b7e7f9030dc9d930185593aa991..1344e1f9c923a4d6602d64a33da175f48c7b7b64:/src/codegen-proto.lisp

diff --git a/src/codegen-proto.lisp b/src/codegen-proto.lisp
index b8206fa..571f0b0 100644
--- a/src/codegen-proto.lisp
+++ b/src/codegen-proto.lisp
@@ -49,7 +49,7 @@
 
 ;; Root class.
 
-(export 'temporary-name)
+(export '(temporary-name temp-tag))
 (defclass temporary-name ()
   ((tag :initarg :tag :reader temp-tag))
   (:documentation
@@ -74,6 +74,8 @@
   (make-instance 'temporary-name :tag "sod__ap"))
 (defparameter *sod-master-ap*
   (make-instance 'temporary-name :tag "sod__master_ap"))
+(defparameter *sod-tmp-ap*
+  (make-instance 'temporary-name :tag "sod__tmp_ap"))
 
 ;;;--------------------------------------------------------------------------
 ;;; Instructions.
@@ -120,7 +122,7 @@
 ;; Instruction definition.
 
 (export 'definst)
-(defmacro definst (code (streamvar) args &body body)
+(defmacro definst (code (streamvar &key export) args &body body)
   "Define an instruction type and describe how to output it.
 
    An `inst' can represent any structured piece of output syntax: a
@@ -138,10 +140,14 @@
      * A print method, which prints a diagnostic dump if `*print-escape*' is
        set, or invokes the BODY (with STREAMVAR bound to the output stream)
        otherwise.  The BODY is expected to produce target code at this
-       point."
+       point.
+
+   If EXPORT is non-nil, then export the `CODE-inst' and `make-CODE-inst'
+   symbols."
 
   (let ((inst-var (gensym "INST"))
 	(class-name (symbolicate code '-inst))
+	(constructor-name (symbolicate 'make- code '-inst))
 	(keys (mapcar (lambda (arg) (intern (symbol-name arg) :keyword))
 		      args)))
     `(progn
@@ -149,7 +155,7 @@
 	 ,(mapcar (lambda (arg key)
 		    `(,arg :initarg ,key :reader ,(symbolicate 'inst- arg)))
 		  args keys))
-       (defun ,(symbolicate 'make- code '-inst) (,@args)
+       (defun ,constructor-name (,@args)
 	 (make-instance ',class-name ,@(mappend #'list keys args)))
        (defmethod inst-metric ((,inst-var ,class-name))
 	 (with-slots (,@args) ,inst-var
@@ -160,30 +166,33 @@
 	       (print-unreadable-object (,inst-var ,streamvar :type t)
 		 (format stream "~@<~@{~S ~@_~S~^ ~_~}~:>"
 			 ,@(mappend #'list keys args)))
-	       (progn ,@body)))))))
+	       (progn ,@body))))
+       ,@(and export `((export '(,class-name ,constructor-name))))
+       ',code)))
 
 ;; Important instruction classes.
 
-(export '(block-inst make-block-inst var-inst make-var-inst
-	  function-inst make-function-inst set-inst make-set-inst
-	  return-inst make-return-inst expr-inst make-expr-inst
-	  inst-decls inst-body inst-name inst-type inst-init inst-var
-	  inst-expr))
-
-(definst var (stream) (name type init)
+(definst var (stream :export t) (name type init)
   (pprint-c-type type stream name)
   (when init
-    (format stream " = ~A" init)))
-(definst set (stream) (var expr)
+    (format stream " = ~A" init))
+  (write-char #\; stream))
+(definst set (stream :export t) (var expr)
   (format stream "~@<~A = ~@_~2I~A;~:>" var expr))
-(definst return (stream) (expr)
+(definst update (stream :export t) (var op expr)
+  (format stream "~@<~A ~A= ~@_~2I~A;~:>" var op expr))
+(definst return (stream :export t) (expr)
   (format stream "return~@[ (~A)~];" expr))
-(definst expr (stream) (expr)
+(definst break (stream :export t) ()
+  (format stream "break;"))
+(definst continue (stream :export t) ()
+  (format stream "continue;"))
+(definst expr (stream :export t) (expr)
   (format stream "~A;" expr))
-(definst block (stream) (decls body)
-  (format stream "{~:@_~@<  ~2I~@[~{~A;~:@_~}~:@_~]~{~A~^~:@_~}~:>~:@_}"
+(definst block (stream :export t) (decls body)
+  (format stream "{~:@_~@<  ~2I~@[~{~A~:@_~}~:@_~]~{~A~^~:@_~}~:>~:@_}"
 	  decls body))
-(definst function (stream) (name type body)
+(definst function (stream :export t) (name type body)
   (pprint-logical-block (stream nil)
     (princ "static " stream)
     (pprint-c-type type stream name)
@@ -254,6 +263,14 @@
   (:method (codegen insts)
     (dolist (inst insts) (emit-inst codegen inst))))
 
+(export '(emit-decl emit-decls))
+(defgeneric emit-decl (codegen inst)
+  (:documentation
+   "Add INST to the end of CODEGEN's list of declarations."))
+(defgeneric emit-decls (codegen insts)
+  (:documentation
+   "Add a list of INSTS to the end of CODEGEN's list of declarations."))
+
 (export 'codegen-push)
 (defgeneric codegen-push (codegen)
   (:documentation