diff options
| -rw-r--r-- | bochsrc (renamed from boot.bochsrc) | 0 | ||||
| -rw-r--r-- | boot0.hex | 2 | ||||
| -rw-r--r-- | ex1.subx | 2 | ||||
| -rw-r--r-- | ex2.mu | 4 | ||||
| -rw-r--r-- | ex2.subx | 2 | ||||
| -rw-r--r-- | ex3.mu | 4 | ||||
| -rw-r--r-- | ex4.mu | 4 | ||||
| -rw-r--r-- | ex5.mu | 4 | ||||
| -rw-r--r-- | ex6.mu | 4 | ||||
| -rw-r--r-- | ex7.mu | 4 | ||||
| -rw-r--r-- | ex8.mu | 6 |
11 files changed, 21 insertions, 15 deletions
diff --git a/boot.bochsrc b/bochsrc index a1c8a4bc..a1c8a4bc 100644 --- a/boot.bochsrc +++ b/bochsrc diff --git a/boot0.hex b/boot0.hex index 01cc9c56..e1ea98bd 100644 --- a/boot0.hex +++ b/boot0.hex @@ -16,7 +16,7 @@ # To run: # qemu-system-i386 disk.img # Or: -# bochs -f boot.bochsrc # boot.bochsrc loads disk.img +# bochs -f bochsrc # bochsrc loads disk.img # # Since we start out in 16-bit mode, we need instructions SubX doesn't # support. diff --git a/ex1.subx b/ex1.subx index e1f784bd..bf6b5486 100644 --- a/ex1.subx +++ b/ex1.subx @@ -8,7 +8,7 @@ # To run: # qemu-system-i386 disk.img # Or: -# bochs -f baremetal/boot.bochsrc # boot.bochsrc loads disk.img +# bochs -f bochsrc # bochsrc loads disk.img == code diff --git a/ex2.mu b/ex2.mu index bfced514..0d6e91cf 100644 --- a/ex2.mu +++ b/ex2.mu @@ -1,11 +1,11 @@ # Test out the video mode by filling in the screen with pixels. # # To build a disk image: -# ./translate ex2.mu # emits disk.img +# ./translate ex2.mu # emits disk.img # To run: # qemu-system-i386 disk.img # Or: -# bochs -f baremetal/boot.bochsrc # boot.bochsrc loads disk.img +# bochs -f bochsrc # bochsrc loads disk.img fn main { var y/eax: int <- copy 0 diff --git a/ex2.subx b/ex2.subx index 91eca105..3a1f770e 100644 --- a/ex2.subx +++ b/ex2.subx @@ -5,7 +5,7 @@ # To run: # qemu-system-i386 disk.img # Or: -# bochs -f baremetal/boot.bochsrc # boot.bochsrc loads disk.img +# bochs -f bochsrc # bochsrc loads disk.img == code diff --git a/ex3.mu b/ex3.mu index b98304b1..c05a2f47 100644 --- a/ex3.mu +++ b/ex3.mu @@ -2,11 +2,11 @@ # and in raster order. # # To build a disk image: -# ./translate ex3.mu # emits disk.img +# ./translate ex3.mu # emits disk.img # To run: # qemu-system-i386 disk.img # Or: -# bochs -f baremetal/boot.bochsrc # boot.bochsrc loads disk.img +# bochs -f bochsrc # bochsrc loads disk.img # # Expected output: a new green pixel starting from the top left corner of the # screen every time you press a key (letter or digit) diff --git a/ex4.mu b/ex4.mu index 54da7c20..8f0cbd7a 100644 --- a/ex4.mu +++ b/ex4.mu @@ -1,11 +1,11 @@ # Draw a character using the built-in font (GNU unifont) # # To build a disk image: -# ./translate ex4.mu # emits disk.img +# ./translate ex4.mu # emits disk.img # To run: # qemu-system-i386 disk.img # Or: -# bochs -f baremetal/boot.bochsrc # boot.bochsrc loads disk.img +# bochs -f bochsrc # bochsrc loads disk.img # # Expected output: letter 'A' in green near the top-left corner of screen diff --git a/ex5.mu b/ex5.mu index 3a3c1563..cb0ec063 100644 --- a/ex5.mu +++ b/ex5.mu @@ -2,11 +2,11 @@ # Also demonstrates bounds-checking _before_ drawing. # # To build a disk image: -# ./translate ex5.mu # emits disk.img +# ./translate ex5.mu # emits disk.img # To run: # qemu-system-i386 disk.img # Or: -# bochs -f baremetal/boot.bochsrc # boot.bochsrc loads disk.img +# bochs -f bochsrc # bochsrc loads disk.img # # Expected output: text in green near the top-left corner of screen diff --git a/ex6.mu b/ex6.mu index 7d11069c..bd0978fe 100644 --- a/ex6.mu +++ b/ex6.mu @@ -1,11 +1,11 @@ # Drawing ASCII text incrementally. # # To build a disk image: -# ./translate ex6.mu # emits disk.img +# ./translate ex6.mu # emits disk.img # To run: # qemu-system-i386 disk.img # Or: -# bochs -f baremetal/boot.bochsrc # boot.bochsrc loads disk.img +# bochs -f bochsrc # bochsrc loads disk.img # # Expected output: a box and text that doesn't overflow it diff --git a/ex7.mu b/ex7.mu index 63ac5e51..5b53dbdc 100644 --- a/ex7.mu +++ b/ex7.mu @@ -1,11 +1,11 @@ # Cursor-based motions. # # To build a disk image: -# ./translate ex7.mu # emits disk.img +# ./translate ex7.mu # emits disk.img # To run: # qemu-system-i386 disk.img # Or: -# bochs -f baremetal/boot.bochsrc # boot.bochsrc loads disk.img +# bochs -f bochsrc # bochsrc loads disk.img # # Expected output: an interactive game a bit like "snakes". Try pressing h, j, # k, l. diff --git a/ex8.mu b/ex8.mu index 367c665f..eb013eeb 100644 --- a/ex8.mu +++ b/ex8.mu @@ -1,4 +1,10 @@ # Demo of floating-point +# +# To build a disk image: +# ./translate ex8.mu # emits disk.img +# To run: +# bochs -f bochsrc # bochsrc loads disk.img +# Set a breakpoint at 0x7c00 and start stepping. fn main { var n/eax: int <- copy 0 |