about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2020-12-23 10:02:15 -0800
committerKartik Agaram <vc@akkartik.com>2020-12-23 10:04:21 -0800
commit895aa716169ed48d0509dce403786c8c34846275 (patch)
treec1c9cfc61984a60fb13913ac949dfbd4ec687852
parentd70711e1b0cce6e9b6c4bd7a4775f218e220e3b2 (diff)
downloadmu-895aa716169ed48d0509dce403786c8c34846275.tar.gz
7385
Commit 7379 excluding 7376.
-rw-r--r--apps/boot.hex12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/boot.hex b/apps/boot.hex
index d09287a8..6b2c8c2e 100644
--- a/apps/boot.hex
+++ b/apps/boot.hex
@@ -31,7 +31,7 @@
 #   from some bootable image (see the boot sector marker at the end of this file)
 #   to the address range [0x7c00, 0x7e00)
 
-# 00:
+# offset 00 (address 0x7c00):
   fa  # cli  # TODO: don't forget to reenable interrupts in a real program
 
   # initialize segment registers
@@ -166,16 +166,17 @@ e9 fb ff  # loop forever
   8e c0  # es <- ax
   8e e0  # fs <- ax
   8e e8  # gs <- ax
-  e9 1d 00 00 00  # jump to 0x7cf0
+  e9 2d 00 00 00  # jump to 0x7d00
 
 # padding
 # d3:
          00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 ## 'application' SubX code: print one character to top-left of screen
 
-# f0:
+# offset 100 (address 0x7d00):
 # Entry:
   # eax <- *0x7e04  # random address in second segment containing 'H'
   8b  # copy rm32 to r32
@@ -191,7 +192,7 @@ e9 fb ff  # loop forever
 e9 fb ff ff ff  # loop forever
 
 # padding to 512 bytes
-# 101:
+# 111:
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
@@ -206,7 +207,6 @@ e9 fb ff ff ff  # loop forever
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 55 aa  # final 2 bytes: boot sector marker
@@ -214,7 +214,7 @@ e9 fb ff ff ff  # loop forever
 ## sector 2
 # not loaded on boot; loaded by load_disk
 
-# 200:
+# offset 200 (address 0x7e00):
 00 00 00 00 48 0f 00 00 00 00 00 00 00 00 00 00  # spot the 'H' with attributes
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00