Merge pull request #812 from andrew-johnson-4/eliminate-fragments

Eliminate fragments
andrew-johnson-4 · Oct 12, 2024 · 60bc492 · 60bc492
2 parents 5f6040f + e597d3b
commit 60bc492
Show file tree

Hide file tree

Showing 19 changed files with 30,454 additions and 30,213 deletions.
diff --git a/BOOTSTRAP/cli.s b/BOOTSTRAP/cli.s
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lambda_mountain"
-version = "1.17.2"
+version = "1.17.3"
 authors = ["Andrew <andrew@subarctic.org>"]
 license = "MIT"
 description = "Typed Macro Assembler (backed by Coq proofs-of-correctness)"

diff --git a/LIB/default-cdecl-return.lm b/LIB/default-cdecl-return.lm
@@ -1,55 +1,58 @@
 
-fragment  cdecl::return := λ: DontChain(: l Nil). (: (
-   (.program(
-      (.program l)
-      (.del l)
-   ))
-   (.frame( (.frame l) ))
+cdecl::return := λ: Blob(: l Nil). (: (
+   (:frame( (:frame l) ))
+   (:unframe( (:unframe l) ))
+   (:program( (:program l) (:del l) ))
 ) Nil);
-fragment  cdecl::return := λ: DontChain(: l Reg8). (: (
-   (.program(
-      (.program l)
-      \t 'mov \t '% (.expression l) , '%AL \n
-      \t 'push \s '%RAX \n
-      (.del l)
-      \t 'pop \s '%RAX \n
+cdecl::return := λ: Blob(: l Reg8). (: (
+   (:frame( (:frame l) ))
+   (:unframe( (:unframe l) ))
+   (:expression( 'AL_s ))
+   (:program(
+      (:program l)
+      '\tmov\t%_s (:expression l) ',%AL\n_s
+      '\tpush\s%RAX\n_s
+      (:del l)
+      '\tpop\s%RAX\n_s
    ))
-   (.frame (.frame l))
-   (.expression 'AL)
 ) Nil);
-fragment  cdecl::return := λ: DontChain(: l Reg16). (: (
-   (.program(
-      (.program l)
-      \t 'mov \t '% (.expression l) , '%AX \n
-      \t 'push \s '%RAX \n
-      (.del l)
-      \t 'pop \s '%RAX \n
+cdecl::return := λ: Blob(: l Reg16). (: (
+   (:frame( (:frame l) ))
+   (:unframe( (:unframe l) ))
+   (:expression( 'AX_s ))
+   (:program(
+      (:program l)
+      '\tmov\t%_s (:expression l) ',%AX\n_s
+      '\tpush\s%RAX\n_s
+      (:del l)
+      '\tpop\s%RAX\n_s
    ))
-   (.frame (.frame l))
-   (.expression 'AX)
 ) Nil);
-fragment  cdecl::return := λ: DontChain(: l Reg32). (: (
-   (.program(
-      (.program l)
-      \t 'mov \t '% (.expression l) , '%EAX \n
-      \t 'push \s '%RAX \n
-      (.del l)
-      \t 'pop \s '%RAX \n
+cdecl::return := λ: Blob(: l Reg32). (: (
+   (:frame (:frame l))
+   (:unframe( (:unframe l) ))
+   (:expression 'EAX_s)
+   (:program(
+      (:program l)
+      '\tmov\t%_s (:expression l) ',%EAX\n_s
+      '\tpush\s%RAX\n_s
+      (:del l)
+      '\tpop\s%RAX\n_s
    ))
-   (.frame (.frame l))
-   (.expression 'EAX)
 ) Nil);
-fragment  cdecl::return := λ: DontChain(: l Reg64). (: (
-   (.program(
-      (.program l)
-      \t 'mov \t '% (.expression l) , '%RAX \n
-      \t 'push \s '%RAX \n
-      (.del l)
-      \t 'pop \s '%RAX \n
+cdecl::return := λ: Blob(: l Reg64). (: (
+   (:frame (:frame l))
+   (:unframe( (:unframe l) ))
+   (:expression 'RAX_s)
+   (:program(
+      (:program l)
+      '\tmov\t%_s (:expression l) ',%RAX\n_s
+      '\tpush\s%RAX\n_s
+      (:del l)
+      '\tpop\s%RAX\n_s
    ))
-   (.frame (.frame l))
-   (.expression 'RAX)
 ) Nil);
+
 fragment  cdecl::return := λ: DontChain(: l Constant+Literal+Sized<1>). (: (
    (.program(
       (.program l)

diff --git a/LIB/default-instruction-macros-64.lm b/LIB/default-instruction-macros-64.lm
@@ -7,8 +7,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -21,8 +19,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -35,8 +31,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -49,8 +43,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -63,8 +55,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -76,8 +66,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -90,8 +78,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -104,8 +90,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -119,8 +103,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -133,8 +115,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -148,8 +128,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -163,8 +141,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -178,8 +154,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -192,8 +166,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -207,8 +179,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)
@@ -224,8 +194,6 @@ macro ('declare-simple-instruction-alias-binop-64 (op-alias op-code op-set op-ty
          '\t_s op-code '\s%R14,\s%RAX\n_s
          op-set
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'RAX_s)

diff --git a/LIB/default-instruction-macros-8.lm b/LIB/default-instruction-macros-8.lm
@@ -6,8 +6,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s$_s (:expression r) ',\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -18,8 +16,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s_s (:expression r) '\[%RBP\],\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -31,8 +27,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s0\[%R14B\],\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -44,8 +38,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s$_s (:expression l) ',\s%AL\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -57,8 +49,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s$_s (:expression r) ',\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -69,8 +59,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s_s (:expression r) '\[%RBP\],\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -82,8 +70,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s0\[%R14B\],\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -95,8 +81,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s_s (:expression l) '\[%RBP\],\s%AL\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -109,8 +93,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s$_s (:expression r) ',\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -122,8 +104,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s_s (:expression r) '\[%RBP\],\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -136,8 +116,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s0\[%R14B\],\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -150,8 +128,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s0\[%AL\],\s%AL\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -164,8 +140,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s$_s (:expression r) ',\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -177,8 +151,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s_s (:expression r) '\[%RBP\],\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -191,8 +163,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tmovq\s0\[%R14B\],\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)
@@ -206,8 +176,6 @@ macro ('declare-simple-instruction-alias-binop-8 (op-alias op-code op-type)) (
          '\tpopq\s%R14B\n_s
          '\t_s op-code '\s%R14B,\s%AL\n_s
       ))
-      (:data( (:data l) (:data r) ))
-      (:text( (:text l) (:text r) ))
       (:frame( (:frame l) (:frame r) ))
       (:unframe( (:unframe l) (:unframe r) ))
       (:expression 'AL_s)