about summary refs log tree commit diff stats
path: root/subx
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2018-09-01 09:39:36 -0700
committerKartik Agaram <vc@akkartik.com>2018-09-01 09:39:36 -0700
commitea7f869856a614d14de31c680c8dd290de1cc113 (patch)
tree6cbbf70db886032a807bcc9e64d27412fbbe9cc3 /subx
parenta413105a5dc4741ccd1c364cc82609d2aa25f6c5 (diff)
downloadmu-ea7f869856a614d14de31c680c8dd290de1cc113.tar.gz
4529 - move examples to a sub-directory
Diffstat (limited to 'subx')
-rw-r--r--subx/Readme.md21
-rwxr-xr-xsubx/examples/ex1 (renamed from subx/ex1)bin96 -> 96 bytes
-rw-r--r--subx/examples/ex1.1.subx (renamed from subx/ex1.1.subx)0
-rw-r--r--subx/examples/ex1.2.subx (renamed from subx/ex1.2.subx)0
-rwxr-xr-xsubx/examples/ex2 (renamed from subx/ex2)bin102 -> 102 bytes
-rw-r--r--subx/examples/ex2.subx (renamed from subx/ex2.subx)0
-rwxr-xr-xsubx/examples/ex3 (renamed from subx/ex3)bin119 -> 119 bytes
-rw-r--r--subx/examples/ex3.subx (renamed from subx/ex3.subx)0
-rwxr-xr-xsubx/examples/ex4 (renamed from subx/ex4)bin171 -> 171 bytes
-rw-r--r--subx/examples/ex4.subx (renamed from subx/ex4.subx)0
-rwxr-xr-xsubx/examples/ex5 (renamed from subx/ex5)bin138 -> 138 bytes
-rw-r--r--subx/examples/ex5.subx (renamed from subx/ex5.subx)0
-rwxr-xr-xsubx/examples/ex6 (renamed from subx/ex6)bin166 -> 166 bytes
-rw-r--r--subx/examples/ex6.subx (renamed from subx/ex6.subx)0
-rwxr-xr-xsubx/examples/ex7 (renamed from subx/ex7)bin156 -> 156 bytes
-rw-r--r--subx/examples/ex7.subx (renamed from subx/ex7.subx)0
-rwxr-xr-xsubx/examples/ex8 (renamed from subx/ex8)bin313 -> 313 bytes
-rw-r--r--subx/examples/ex8.subx (renamed from subx/ex8.subx)0
-rwxr-xr-xsubx/examples/ex9 (renamed from subx/ex9)bin144 -> 144 bytes
-rw-r--r--subx/examples/ex9.subx (renamed from subx/ex9.subx)0
-rwxr-xr-xsubx/test_layers2
21 files changed, 11 insertions, 12 deletions
diff --git a/subx/Readme.md b/subx/Readme.md
index cf279f32..b909f20c 100644
--- a/subx/Readme.md
+++ b/subx/Readme.md
@@ -107,25 +107,24 @@ Running `subx` will transparently compile it as necessary.
 
 Putting them together, build and run one of the example programs:
 
-<img alt='ex1.1.subx' src='html/ex1.png'>
+<img alt='examples/ex1.1.subx' src='html/ex1.png'>
 
 ```
-$ ./subx translate ex1.1.subx ex1
-$ ./subx run ex1
+$ ./subx translate examples/ex1.1.subx examples/ex1
+$ ./subx run examples/ex1
 ```
 
 If you're running on Linux, `ex1` will also be runnable directly:
 ```
-$ chmod +x ex1
-$ ./ex1
+$ examples/ex1
 ```
 
-There are a few such example programs here. At any commit an example's binary
-should be identical bit for bit with the output of translating the .subx file.
-The binary should also be natively runnable on a 32-bit Linux system. If
-either of these invariants is broken it's a bug on my part. The binary should
-also be runnable on a 64-bit Linux system. I can't guarantee it, but I'd
-appreciate hearing if it doesn't run.
+There are a few such example programs in the examples/ directory. At any
+commit an example's binary should be identical bit for bit with the output of
+translating the .subx file. The binary should also be natively runnable on a
+32-bit Linux system. If either of these invariants is broken it's a bug on my
+part. The binary should also be runnable on a 64-bit Linux system. I can't
+guarantee it, but I'd appreciate hearing if it doesn't run.
 
 However, not all 32-bit Linux binaries are guaranteed to be runnable by
 `subx`. I'm not building general infrastructure here for all of the x86 ISA
diff --git a/subx/ex1 b/subx/examples/ex1
index f3c9730d..f3c9730d 100755
--- a/subx/ex1
+++ b/subx/examples/ex1
Binary files differdiff --git a/subx/ex1.1.subx b/subx/examples/ex1.1.subx
index 1cbe5dc1..1cbe5dc1 100644
--- a/subx/ex1.1.subx
+++ b/subx/examples/ex1.1.subx
diff --git a/subx/ex1.2.subx b/subx/examples/ex1.2.subx
index 2652037a..2652037a 100644
--- a/subx/ex1.2.subx
+++ b/subx/examples/ex1.2.subx
diff --git a/subx/ex2 b/subx/examples/ex2
index 3bbd979b..3bbd979b 100755
--- a/subx/ex2
+++ b/subx/examples/ex2
Binary files differdiff --git a/subx/ex2.subx b/subx/examples/ex2.subx
index 6463132b..6463132b 100644
--- a/subx/ex2.subx
+++ b/subx/examples/ex2.subx
diff --git a/subx/ex3 b/subx/examples/ex3
index aa209b92..aa209b92 100755
--- a/subx/ex3
+++ b/subx/examples/ex3
Binary files differdiff --git a/subx/ex3.subx b/subx/examples/ex3.subx
index a4012f92..a4012f92 100644
--- a/subx/ex3.subx
+++ b/subx/examples/ex3.subx
diff --git a/subx/ex4 b/subx/examples/ex4
index 7721c94b..7721c94b 100755
--- a/subx/ex4
+++ b/subx/examples/ex4
Binary files differdiff --git a/subx/ex4.subx b/subx/examples/ex4.subx
index cd7003d3..cd7003d3 100644
--- a/subx/ex4.subx
+++ b/subx/examples/ex4.subx
diff --git a/subx/ex5 b/subx/examples/ex5
index 536ddcd6..536ddcd6 100755
--- a/subx/ex5
+++ b/subx/examples/ex5
Binary files differdiff --git a/subx/ex5.subx b/subx/examples/ex5.subx
index e4a2db81..e4a2db81 100644
--- a/subx/ex5.subx
+++ b/subx/examples/ex5.subx
diff --git a/subx/ex6 b/subx/examples/ex6
index b897bc05..b897bc05 100755
--- a/subx/ex6
+++ b/subx/examples/ex6
Binary files differdiff --git a/subx/ex6.subx b/subx/examples/ex6.subx
index 4c75c617..4c75c617 100644
--- a/subx/ex6.subx
+++ b/subx/examples/ex6.subx
diff --git a/subx/ex7 b/subx/examples/ex7
index daea2cf4..daea2cf4 100755
--- a/subx/ex7
+++ b/subx/examples/ex7
Binary files differdiff --git a/subx/ex7.subx b/subx/examples/ex7.subx
index 86e018c8..86e018c8 100644
--- a/subx/ex7.subx
+++ b/subx/examples/ex7.subx
diff --git a/subx/ex8 b/subx/examples/ex8
index d756271e..d756271e 100755
--- a/subx/ex8
+++ b/subx/examples/ex8
Binary files differdiff --git a/subx/ex8.subx b/subx/examples/ex8.subx
index 6f8d3979..6f8d3979 100644
--- a/subx/ex8.subx
+++ b/subx/examples/ex8.subx
diff --git a/subx/ex9 b/subx/examples/ex9
index 47c79e3c..47c79e3c 100755
--- a/subx/ex9
+++ b/subx/examples/ex9
Binary files differdiff --git a/subx/ex9.subx b/subx/examples/ex9.subx
index 9ea547f1..9ea547f1 100644
--- a/subx/ex9.subx
+++ b/subx/examples/ex9.subx
diff --git a/subx/test_layers b/subx/test_layers
index 709601ff..9ade9ee1 100755
--- a/subx/test_layers
+++ b/subx/test_layers
@@ -11,7 +11,7 @@ do
 done
 
 ./clean top
-for f in ex*.subx
+for f in examples/ex*.subx
 do
   echo checking $f
   target=`echo $f |sed 's/\..*//'`