summaryrefslogtreecommitdiff
path: root/ldlinux.asm
diff options
context:
space:
mode:
authorhpa <hpa>2004-12-17 05:37:52 +0000
committerhpa <hpa>2004-12-17 05:37:52 +0000
commit7da4d04f57c549c1e6cf850d75400ded5ac82cb8 (patch)
tree7398045e8180d1a693e31d8d07a094e9871535dc /ldlinux.asm
parent303c60d5b20217ff70fbb115bc8818f0ae1b4bfd (diff)
downloadsyslinux-7da4d04f57c549c1e6cf850d75400ded5ac82cb8.tar.gz
Move the .bss to a separate section so we can at least begin to move
bss variables near the code where they're defined
Diffstat (limited to 'ldlinux.asm')
-rw-r--r--ldlinux.asm34
1 files changed, 15 insertions, 19 deletions
diff --git a/ldlinux.asm b/ldlinux.asm
index 8eaa396b..082ebce2 100644
--- a/ldlinux.asm
+++ b/ldlinux.asm
@@ -125,26 +125,13 @@ file_left resd 1 ; Number of sectors left
;
; Memory below this point is reserved for the BIOS and the MBR
;
- absolute 1000h
+BSS_START equ 1000h
+ section .bss start=BSS_START
trackbufsize equ 8192
trackbuf resb trackbufsize ; Track buffer goes here
getcbuf resb trackbufsize
-; ends at 5000h
+ ; ends at 5000h
-
-;
-; Constants for the xfer_buf_seg
-;
-; The xfer_buf_seg is also used to store message file buffers. We
-; need two trackbuffers (text and graphics), plus a work buffer
-; for the graphics decompressor.
-;
-xbs_textbuf equ 0 ; Also hard-coded, do not change
-xbs_vgabuf equ trackbufsize
-xbs_vgatmpbuf equ 2*trackbufsize
-
-
- absolute 5000h ; Here we keep our BSS stuff
VKernelBuf: resb vk_size ; "Current" vkernel
alignb 4
AppendBuf resb max_cmd_len+1 ; append=
@@ -247,6 +234,18 @@ default_cmd resb max_cmd_len+1 ; "default" command line
alignb open_file_t_size
Files resb MAX_OPEN*open_file_t_size
+;
+; Constants for the xfer_buf_seg
+;
+; The xfer_buf_seg is also used to store message file buffers. We
+; need two trackbuffers (text and graphics), plus a work buffer
+; for the graphics decompressor.
+;
+xbs_textbuf equ 0 ; Also hard-coded, do not change
+xbs_vgabuf equ trackbufsize
+xbs_vgatmpbuf equ 2*trackbufsize
+
+
section .text
org 7C00h
;
@@ -318,9 +317,6 @@ SecPerClust equ bxSecPerClust
; Note we don't check the constraints above now; we did that at install
; time (we hope!)
;
-
-;floppy_table equ $ ; No sense in wasting memory, overwrite start
-
start:
cli ; No interrupts yet, please
cld ; Copy upwards