summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-05-14 17:49:55 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-05-14 17:49:55 +0000
commitfd608b090a49be0989830bbc32c271ba453194f6 (patch)
tree8ad2923908b73f8885ef4e441d1dc21f4b924e2e /sys
parent4c03a91eb6c5e39b1eb8d31fda4d9bfd13d9ae19 (diff)
Deal with arbitrary load addresses. Necessary for upcoming netboot code.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/aviion/stand/a2coff/a2coff.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/sys/arch/aviion/stand/a2coff/a2coff.c b/sys/arch/aviion/stand/a2coff/a2coff.c
index 49228ffd33a..36a7f123434 100644
--- a/sys/arch/aviion/stand/a2coff/a2coff.c
+++ b/sys/arch/aviion/stand/a2coff/a2coff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a2coff.c,v 1.1 2006/05/09 18:22:59 miod Exp $ */
+/* $OpenBSD: a2coff.c,v 1.2 2006/05/14 17:49:54 miod Exp $ */
/*
* Copyright (c) 2006, Miodrag Vallat
*
@@ -190,7 +190,6 @@ main(int argc, char *argv[])
strncpy(escn[0].s_name, ".text", sizeof escn[0].s_name);
escn[0].s_paddr = N_TXTADDR(head); /* ignored, 1:1 mapping */
- escn[0].s_vaddr = N_TXTADDR(head);
escn[0].s_size = round(head.a_text, 8);
escn[0].s_scnptr = round(sizeof(ehead) + sizeof(escn), 0x10);
escn[0].s_relptr = 0;
@@ -200,7 +199,6 @@ main(int argc, char *argv[])
strncpy(escn[1].s_name, ".data", sizeof escn[1].s_name);
escn[1].s_paddr = N_DATADDR(head); /* ignored, 1:1 mapping */
- escn[1].s_vaddr = N_DATADDR(head);
escn[1].s_scnptr = escn[0].s_scnptr + escn[0].s_size;
escn[1].s_size = round(head.a_data + head.a_bss, 8);
escn[1].s_relptr = 0;
@@ -210,7 +208,6 @@ main(int argc, char *argv[])
strncpy(escn[2].s_name, ".bss", sizeof escn[2].s_name);
escn[2].s_paddr = N_BSSADDR(head) + head.a_bss; /* ignored, 1:1 mapping */
- escn[2].s_vaddr = N_BSSADDR(head) + head.a_bss;
escn[2].s_scnptr = 0; /* nothing in the file */
escn[2].s_size = 0;
escn[2].s_relptr = 0;
@@ -218,6 +215,14 @@ main(int argc, char *argv[])
escn[2].s_nlnno = 0;
escn[2].s_flags = 0x80; /* STYP_BSS */
+ /* adjust load addresses */
+ escn[0].s_paddr += (head.a_entry & ~(__LDPGSZ - 1)) - __LDPGSZ;
+ escn[1].s_paddr += (head.a_entry & ~(__LDPGSZ - 1)) - __LDPGSZ;
+ escn[2].s_paddr += (head.a_entry & ~(__LDPGSZ - 1)) - __LDPGSZ;
+ escn[0].s_vaddr = escn[0].s_paddr;
+ escn[1].s_vaddr = escn[1].s_paddr;
+ escn[2].s_vaddr = escn[2].s_paddr;
+
n = write(outfd, &escn, sizeof(escn));
if (n < sizeof(escn))
err(1, "write");
@@ -226,8 +231,10 @@ main(int argc, char *argv[])
* Copy text section
*/
+#ifdef DEBUG
printf("copying %s: source %lx dest %lx size %x\n",
escn[0].s_name, N_TXTOFF(head), escn[0].s_scnptr, head.a_text);
+#endif
lseek(outfd, escn[0].s_scnptr, SEEK_SET);
lseek(infd, N_TXTOFF(head), SEEK_SET);
copybits(infd, outfd, head.a_text);
@@ -236,8 +243,10 @@ main(int argc, char *argv[])
* Copy data section
*/
+#ifdef DEBUG
printf("copying %s: source %lx dest %lx size %x\n",
escn[1].s_name, N_DATOFF(head), escn[1].s_scnptr, head.a_data);
+#endif
lseek(outfd, escn[1].s_scnptr, SEEK_SET);
lseek(infd, N_DATOFF(head), SEEK_SET);
copybits(infd, outfd, head.a_data);
@@ -246,8 +255,10 @@ main(int argc, char *argv[])
* ``Copy'' bss section
*/
+#ifdef DEBUG
printf("copying %s: size %lx\n",
escn[2].s_name, round(head.a_data + head.a_bss, 8) - head.a_data);
+#endif
zerobits(outfd, round(head.a_data + head.a_bss, 8) - head.a_data);
close(infd);