copy only ~11K down to low memory
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/flat.lds b/flat.lds
index be84ec3..933ed60 100644
--- a/flat.lds
+++ b/flat.lds
@@ -14,12 +14,14 @@
. = ALIGN(16);
edata = .;
. = 1024K - 128;
+ sinit = .;
.init : {
*(.init);
. = 128 - 16;
*(.resetvector);
. = 128;
}
+ einit = .;
}
ENTRY(main)
diff --git a/hwsetup.c b/hwsetup.c
index 6c7b019..2924383 100644
--- a/hwsetup.c
+++ b/hwsetup.c
@@ -85,8 +85,8 @@
void setup_hw(void)
{
const int bdf = 0;
- const uint8_t *bios_start = (uint8_t *)0xffff0000;
- uint8_t *low_start = (uint8_t *)0xf0000;
+ const uint8_t *bios_start = &stext + 0xfff00000;
+ const uint8_t *init_start = &sinit + 0xfff00000;
int pambase;
uint32_t id = pci_config_readl(bdf, 0);
@@ -111,7 +111,8 @@
// Make ram from 0xf0000-0x100000 read-write and shadow BIOS
// We're still running from 0xffff0000
pci_config_writeb(bdf, pambase, 0x30);
- memcpy(low_start, bios_start, 0x10000);
+ memcpy(&stext, bios_start, &edata - &stext);
+ memcpy(&sinit, init_start, &einit - &sinit);
setup_pic();
}
diff --git a/include/bios.h b/include/bios.h
index eddca6b..bc96f87 100644
--- a/include/bios.h
+++ b/include/bios.h
@@ -47,6 +47,11 @@
extern uint16_t e820_seg;
extern uint32_t lowmem;
+extern uint8_t stext;
+extern uint8_t edata;
+extern uint8_t sinit;
+extern uint8_t einit;
+
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
static inline void __attribute__((noreturn)) panic(void)
diff --git a/malloc.c b/malloc.c
index 3ab95ed..c8d865b 100644
--- a/malloc.c
+++ b/malloc.c
@@ -1,10 +1,8 @@
#include <inttypes.h>
#include "string.h"
+#include "bios.h"
-extern uint8_t edata;
static uint8_t *fseg_base = &edata;
-
-extern uint8_t stext;
static uint8_t *malloc_top = &stext;
void *malloc(int n)
