Merge pull request #139 from rust-osdev/mov-offset

Fix linker errors on latest nightlies

Author: phil-opp

.github/workflows/build.yml

@@ -14,6 +14,7 @@ jobs:
     name: "Test"
 
     strategy:
+      fail-fast: false
       matrix:
         platform: [
           ubuntu-latest,
@@ -83,7 +84,6 @@ jobs:
         if [ $? -eq 123 ]; then (exit 0); else (exit 1); fi
       shell: 'bash {0}'
 
-
   build_example_kernel:
     name: "Build Example Kernel"
     strategy:

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bootloader"
-version = "0.9.14"
+version = "0.9.15"
 authors = ["Philipp Oppermann <dev@phil-opp.com>"]
 license = "MIT/Apache-2.0"
 description = "An experimental pure-Rust x86 bootloader."

Cargo.toml

@@ -1,5 +1,9 @@
 # Unreleased
 
+# 0.9.15 – 2021-03-07
+
+- Fix linker errors on latest nightlies ([#139](https://github.com/rust-osdev/bootloader/pull/139))
+
 # 0.9.14 – 2021-02-24
 
 - Fix "panic message is not a string literal" warning ([#138](https://github.com/rust-osdev/bootloader/pull/138))

Changelog.md

@@ -78,7 +78,7 @@ check_int13h_extensions:
     jc no_int13h_extensions
 
 load_rest_of_bootloader_from_disk:
-    lea eax, _rest_of_bootloader_start_addr
+    mov eax, offset _rest_of_bootloader_start_addr
 
     # dap buffer segment
     mov ebx, eax
@@ -90,10 +90,10 @@ load_rest_of_bootloader_from_disk:
     sub eax, ebx
     mov [dap_buffer_addr], ax
 
-    lea eax, _rest_of_bootloader_start_addr
+    mov eax, offset _rest_of_bootloader_start_addr
 
     # number of disk blocks to load
-    lea ebx, _rest_of_bootloader_end_addr
+    mov ebx, offset _rest_of_bootloader_end_addr
     sub ebx, eax # end - start
     shr ebx, 9 # divide by 512 (block size)
     mov [dap_blocks], bx

src/stage_1.s

@@ -40,8 +40,8 @@ load_kernel_from_disk:
     mov word ptr [dap_blocks], 1
 
     # number of start block
-    lea eax, _kernel_start_addr
-    lea ebx, _start
+    mov eax, offset _kernel_start_addr
+    mov ebx, offset _start
     sub eax, ebx
     shr eax, 9 # divide by 512 (block size)
     mov [dap_start_lba], eax