Skip to content

Commit aee5cd8

Browse files
committed
asm: Make assembly code a module
This makes the directory/module structure more consistent. It also avoids cluttering `main.rs`. Signed-off-by: Joe Richey <[email protected]>
1 parent 5b779b3 commit aee5cd8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/asm/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
global_asm!(include_str!("ram64.s"));

src/main.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ mod serial;
3131
#[macro_use]
3232
mod common;
3333

34+
#[cfg(not(test))]
35+
mod asm;
3436
mod block;
3537
mod bzimage;
3638
mod efi;
@@ -43,9 +45,6 @@ mod pci;
4345
mod pe;
4446
mod virtio;
4547

46-
#[cfg(not(test))]
47-
global_asm!(include_str!("asm/ram64.s"));
48-
4948
#[cfg(all(not(test), feature = "log-panic"))]
5049
#[panic_handler]
5150
fn panic(info: &PanicInfo) -> ! {

0 commit comments

Comments
 (0)