Skip to content

Commit c82f3cc

Browse files
committed
Fix Bochs. Fix #9
1 parent 3ab70cc commit c82f3cc

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ bochs: $(RUN_FILE)
5454
bochs -qf /dev/null \
5555
'ata0-master: type=disk, path="$(RUN_FILE)", mode=flat, cylinders='"$$CYLINDERS"', heads=1, spt=1' \
5656
'boot: disk' \
57-
'display_library: sdl' \
57+
'display_library: sdl2' \
5858
'megs: 128'
5959

6060
BIG_IMG_DIR := big_img$(TMP_EXT)

README.adoc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,15 @@ Run the default OS on QEMU:
3838
Run a given OS:
3939

4040
....
41-
./run min
41+
./run bios_hello_world
4242
./run bios_putc
4343
....
4444

45+
Examples described at:
46+
47+
* <<bios-examples>>
48+
* <<bios-hello-world>>
49+
4550
Extensions are ignored for perfect tab completion, so all the following are equivalent:
4651

4752
....
@@ -57,15 +62,15 @@ Use Bochs instead of QEMU:
5762
./run bios_hello_world bochs
5863
....
5964

60-
TODO broken on Ubuntu 19.04. Not sure I care: https://github.com/cirosantilli/x86-bare-metal-examples/issues/9
61-
6265
Then on the terminal start the simulation with:
6366

6467
....
6568
c
6669
....
6770

68-
https://stackoverflow.com/questions/6142925/how-can-i-use-bochs-to-run-assembly-code/32871939#32871939
71+
TODO: automate this step.
72+
73+
Bibliography: https://stackoverflow.com/questions/6142925/how-can-i-use-bochs-to-run-assembly-code/32871939#32871939
6974

7075
=== Getting started with real hardware
7176

0 commit comments

Comments
 (0)