ram64: Use an external file for 64-bit assembly

This allows us to define all of our long-mode assembly in a separate
file, making maintaince easier.

Signed-off-by: Joe Richey <[email protected]>

Author: josephlr

layout.ld

@@ -1,4 +1,4 @@
-ENTRY(_start)
+ENTRY(ram64_start)
 
 PHDRS
 {
@@ -25,7 +25,10 @@ SECTIONS
 
 	.rodata : { *(.rodata .rodata.*)            } :rodata
 	.data   : { *(.data .data.*) *(.bss .bss.*) } :data
-	.text   : { *(.text .text.*)                } :text
+	.text   : {
+		*(.text .text.*)
+		*(.ram64)
+	} :text
 
 	firmware_ram_size = . - ram_min;
 

src/asm/ram64.s

@@ -0,0 +1,29 @@
+.section .ram64, "ax"
+.global ram64_start
+.code64
+
+ram64_start:
+    # Indicate (via serial) that we are in long/64-bit mode
+    movw $0x3f8, %dx
+    movb $'L', %al
+    outb %al, %dx
+
+    # Enable SSE2 for XMM registers (needed for EFI calling)
+    # Clear CR0.EM and Set CR0.MP
+    movq %cr0, %rax
+    andb $0b11111011, %al # Clear bit 2
+    orb  $0b00000010, %al # Set bit 1
+    movq %rax, %cr0
+    # Set CR4.OSFXSR and CR4.OSXMMEXCPT
+    movq %cr4, %rax
+    orb  $0b00000110, %ah # Set bits 9 and 10
+    movq %rax, %cr4
+
+    # Setup the stack (at the end of our RAM region)
+    movq $ram_max, %rsp
+
+    jmp rust64_start
+
+halt_loop:
+    hlt
+    jmp halt_loop

src/main.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![feature(asm)]
+#![feature(global_asm)]
 #![cfg_attr(not(test), no_std)]
 #![cfg_attr(not(test), no_main)]
 #![cfg_attr(test, allow(unused_imports))]
@@ -38,28 +38,16 @@ mod pci;
 mod pe;
 mod virtio;
 
-fn halt() -> ! {
-    loop {
-        unsafe { asm!("hlt") };
-    }
+global_asm!(include_str!("asm/ram64.s"));
+
+extern "C" {
+    fn halt_loop() -> !;
 }
 
 #[cfg_attr(not(test), panic_handler)]
 fn panic(info: &PanicInfo) -> ! {
     log!("PANIC: {}", info);
-    halt()
-}
-
-/// Enable SSE2 for XMM registers (needed for EFI calling)
-fn enable_sse2() {
-    unsafe {
-        asm!("movq %cr0, %rax");
-        asm!("or $$0x2, %ax");
-        asm!("movq %rax, %cr0");
-        asm!("movq %cr4, %rax");
-        asm!("or $$0x600, %ax");
-        asm!("movq %rax, %cr4");
-    }
+    unsafe { halt_loop() }
 }
 
 /// Setup page tables to provide an identity mapping over the full 4GiB range
@@ -167,14 +155,8 @@ fn boot_from_device(device: &mut block::VirtioBlockDevice) -> bool {
 }
 
 #[cfg_attr(not(test), no_mangle)]
-pub extern "C" fn _start() -> ! {
-    unsafe {
-        asm!("movq $$0x180000, %rsp");
-    }
-
-    log!("Starting..");
-
-    enable_sse2();
+pub extern "C" fn rust64_start() -> ! {
+    log!("\nStarting..");
     setup_pagetables();
 
     pci::print_bus();
@@ -194,5 +176,5 @@ pub extern "C" fn _start() -> ! {
     let mut device = block::VirtioBlockDevice::new(&mut mmio_transport);
     boot_from_device(&mut device);
 
-    halt()
+    unsafe { halt_loop() }
 }