[make] Clean up a bunch of stuff (thanks Dave)
This commit is contained in:
parent
c60d48bea4
commit
1fdddc482e
@ -1,5 +1,5 @@
|
||||
CC = gcc
|
||||
LD = ld -m elf_i386
|
||||
CFLAGS = -Wall -m32 -O0 -fstrength-reduce -fomit-frame-pointer -finline-functions -nostdinc -fno-builtin
|
||||
CFLAGS = -Wall -Wextra -pedantic -m32 -O0 -std=c99 -finline-functions -nostdinc -ffreestanding
|
||||
NASM = nasm -f elf
|
||||
|
||||
|
BIN
bootdisk.img
BIN
bootdisk.img
Binary file not shown.
19
start.asm
19
start.asm
@ -1,32 +1,21 @@
|
||||
[BITS 32]
|
||||
global start
|
||||
start:
|
||||
mov esp, _sys_stack
|
||||
jmp stublet
|
||||
|
||||
ALIGN 4
|
||||
mboot:
|
||||
MULTIBOOT_PAGE_ALIGN equ 1<<0
|
||||
MULTIBOOT_MEMORY_INFO equ 1<<1
|
||||
MULTIBOOT_AOUT_KLUDGE equ 1<<16
|
||||
MULTIBOOT_HEADER_MAGIC equ 0x1BADB002
|
||||
MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_AOUT_KLUDGE
|
||||
MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO
|
||||
MULTIBOOT_CHECKSUM equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
|
||||
EXTERN code, bss, end
|
||||
; GRUB Multiboot header, boot signature
|
||||
dd MULTIBOOT_HEADER_MAGIC
|
||||
dd MULTIBOOT_HEADER_FLAGS
|
||||
dd MULTIBOOT_CHECKSUM
|
||||
; AOUT kludge (must be physical addresses)
|
||||
; Linker script fills these in
|
||||
dd mboot
|
||||
dd code
|
||||
dd bss
|
||||
dd end
|
||||
dd start
|
||||
|
||||
; Main entrypoint
|
||||
stublet:
|
||||
global start
|
||||
start:
|
||||
mov esp, _sys_stack
|
||||
extern main
|
||||
call main
|
||||
jmp $
|
||||
|
Loading…
Reference in New Issue
Block a user