diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2021-08-29 20:33:54 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2021-08-29 20:33:54 -0700 |
commit | 354c72a6377d04574efe1c5cfb4b29d91c939b15 (patch) | |
tree | 45bfab2a7d425d2bdfa15cfade0b0a5df87c9bae | |
parent | 14cfa3e109c1685d3263414f61e1767722298e67 (diff) | |
download | mu-354c72a6377d04574efe1c5cfb4b29d91c939b15.tar.gz |
.
-rw-r--r-- | apps/boot0.hex | 2 | ||||
-rw-r--r-- | apps/ex1.mu | 2 | ||||
-rw-r--r-- | apps/ex10.mu | 2 | ||||
-rw-r--r-- | apps/ex11.mu | 2 | ||||
-rw-r--r-- | apps/ex12.mu | 2 | ||||
-rw-r--r-- | apps/ex2.mu | 2 | ||||
-rw-r--r-- | apps/ex3.mu | 2 | ||||
-rw-r--r-- | apps/ex4.mu | 2 | ||||
-rw-r--r-- | apps/ex5.mu | 2 | ||||
-rw-r--r-- | apps/ex6.mu | 2 | ||||
-rw-r--r-- | apps/ex7.mu | 2 | ||||
-rw-r--r-- | apps/ex8.mu | 4 | ||||
-rw-r--r-- | apps/ex9.mu | 3 |
13 files changed, 3 insertions, 26 deletions
diff --git a/apps/boot0.hex b/apps/boot0.hex index 929d2fd9..ca3ec81d 100644 --- a/apps/boot0.hex +++ b/apps/boot0.hex @@ -15,8 +15,6 @@ # dd if=boot.bin of=code.img conv=notrunc # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.img # # Since we start out in 16-bit mode, we need instructions SubX doesn't # support. diff --git a/apps/ex1.mu b/apps/ex1.mu index a96bed07..3755ccc7 100644 --- a/apps/ex1.mu +++ b/apps/ex1.mu @@ -4,8 +4,6 @@ # ./translate apps/ex1.mu # emits code.img # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.img # # Expected output: blank screen with no errors diff --git a/apps/ex10.mu b/apps/ex10.mu index 05198738..246c16ff 100644 --- a/apps/ex10.mu +++ b/apps/ex10.mu @@ -4,8 +4,6 @@ # ./translate apps/ex10.mu # emits code.img # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.img # # Expected output: # Values between -256 and +255 as you move the mouse over the window. diff --git a/apps/ex11.mu b/apps/ex11.mu index 6b967724..90e4f3c6 100644 --- a/apps/ex11.mu +++ b/apps/ex11.mu @@ -4,8 +4,6 @@ # ./translate apps/ex11.mu # emits code.img # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.img # # Expected output: a spline with 3 control points. Use `Tab` to switch cursor # between control points, and arrow keys to move the control point at the diff --git a/apps/ex12.mu b/apps/ex12.mu index 79c259b8..e7f3049c 100644 --- a/apps/ex12.mu +++ b/apps/ex12.mu @@ -4,8 +4,6 @@ # ./translate apps/ex12.mu # emits code.img # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.img # # Expected output: text with slowly updating colors diff --git a/apps/ex2.mu b/apps/ex2.mu index be66d883..161bd91a 100644 --- a/apps/ex2.mu +++ b/apps/ex2.mu @@ -4,8 +4,6 @@ # ./translate apps/ex2.mu # emits code.img # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.img fn main screen: (addr screen), keyboard: (addr keyboard), data-disk: (addr disk) { var y/eax: int <- copy 0 diff --git a/apps/ex3.mu b/apps/ex3.mu index 155457c6..b3f6cfea 100644 --- a/apps/ex3.mu +++ b/apps/ex3.mu @@ -5,8 +5,6 @@ # ./translate apps/ex3.mu # emits code.img # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.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/apps/ex4.mu b/apps/ex4.mu index f5df8706..92424e32 100644 --- a/apps/ex4.mu +++ b/apps/ex4.mu @@ -4,8 +4,6 @@ # ./translate apps/ex4.mu # emits code.img # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.img # # Expected output: letter 'A' in green near the top-left corner of screen diff --git a/apps/ex5.mu b/apps/ex5.mu index 07e8bc1a..21b7fec7 100644 --- a/apps/ex5.mu +++ b/apps/ex5.mu @@ -5,8 +5,6 @@ # ./translate apps/ex5.mu # emits code.img # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.img # # Expected output: text in green near the top-left corner of screen diff --git a/apps/ex6.mu b/apps/ex6.mu index fbad3c13..f8fc3a0d 100644 --- a/apps/ex6.mu +++ b/apps/ex6.mu @@ -4,8 +4,6 @@ # ./translate apps/ex6.mu # emits code.img # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.img # # Expected output: a box and text that doesn't overflow it diff --git a/apps/ex7.mu b/apps/ex7.mu index bd0afd20..b41b6f72 100644 --- a/apps/ex7.mu +++ b/apps/ex7.mu @@ -4,8 +4,6 @@ # ./translate apps/ex7.mu # emits code.img # To run: # qemu-system-i386 code.img -# Or: -# bochs -f bochsrc # bochsrc loads code.img # # Expected output: an interactive game a bit like "snakes". Try pressing h, j, # k, l. diff --git a/apps/ex8.mu b/apps/ex8.mu index c5e695ed..91d2eabc 100644 --- a/apps/ex8.mu +++ b/apps/ex8.mu @@ -3,8 +3,8 @@ # To build a disk image: # ./translate apps/ex8.mu # emits code.img # To run: -# bochs -f bochsrc # bochsrc loads code.img -# Set a breakpoint at 0x7c00 and start stepping. +# qemu-system-i386 code.img +# You shouldn't see any exceptions. fn main screen: (addr screen), keyboard: (addr keyboard), data-disk: (addr disk) { var n/eax: int <- copy 0 diff --git a/apps/ex9.mu b/apps/ex9.mu index 30853c69..deb3f2f7 100644 --- a/apps/ex9.mu +++ b/apps/ex9.mu @@ -8,9 +8,8 @@ # echo 'abc def ghi' |dd of=data.img conv=notrunc # 3. Familiarize yourself with how the data disk looks within xxd: # xxd data.img |head -# 4. Run in an emulator, either Qemu or Bochs. +# 4. Run: # qemu-system-i386 -hda code.img -hdb data.img -# bochs -f bochsrc.2disks # 5. Exit the emulator. # 6. Notice that the data disk now contains the word count of the original text. # xxd data.img |head |