| bootinfo32.c (40107) | bootinfo32.c (40146) |
|---|---|
| 1/*- 2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * | 1/*- 2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * |
| 26 * $Id: bootinfo.c,v 1.10 1998/10/07 10:55:46 peter Exp $ | 26 * $Id: bootinfo.c,v 1.11 1998/10/09 07:11:19 msmith Exp $ |
| 27 */ 28 29#include <stand.h> 30#include <sys/param.h> 31#include <sys/reboot.h> | 27 */ 28 29#include <stand.h> 30#include <sys/param.h> 31#include <sys/reboot.h> |
| 32#include <sys/linker.h> |
|
| 32#include <machine/bootinfo.h> 33#include "bootstrap.h" 34#include "libi386.h" 35#include "btxv86.h" 36 37static struct bootinfo bi; 38 39/* --- 120 unchanged lines hidden (view full) --- 160 i386_copyin(&x, a, sizeof(x)); \ 161 a += sizeof(x); \ 162} 163 164#define MOD_STR(t, a, s) { \ 165 COPY32(t, a); \ 166 COPY32(strlen(s) + 1, a); \ 167 i386_copyin(s, a, strlen(s) + 1); \ | 33#include <machine/bootinfo.h> 34#include "bootstrap.h" 35#include "libi386.h" 36#include "btxv86.h" 37 38static struct bootinfo bi; 39 40/* --- 120 unchanged lines hidden (view full) --- 161 i386_copyin(&x, a, sizeof(x)); \ 162 a += sizeof(x); \ 163} 164 165#define MOD_STR(t, a, s) { \ 166 COPY32(t, a); \ 167 COPY32(strlen(s) + 1, a); \ 168 i386_copyin(s, a, strlen(s) + 1); \ |
| 168 a += strlen(s) + 1; \ | 169 a += roundup(strlen(s) + 1, sizeof(u_int32_t));\ |
| 169} 170 171#define MOD_NAME(a, s) MOD_STR(MODINFO_NAME, a, s) 172#define MOD_TYPE(a, s) MOD_STR(MODINFO_TYPE, a, s) 173 174#define MOD_VAR(t, a, s) { \ 175 COPY32(t, a); \ 176 COPY32(sizeof(s), a); \ 177 i386_copyin(&s, a, sizeof(s)); \ | 170} 171 172#define MOD_NAME(a, s) MOD_STR(MODINFO_NAME, a, s) 173#define MOD_TYPE(a, s) MOD_STR(MODINFO_TYPE, a, s) 174 175#define MOD_VAR(t, a, s) { \ 176 COPY32(t, a); \ 177 COPY32(sizeof(s), a); \ 178 i386_copyin(&s, a, sizeof(s)); \ |
| 178 a += sizeof(s); \ | 179 a += roundup(sizeof(s), sizeof(u_int32_t)); \ |
| 179} 180 181#define MOD_ADDR(a, s) MOD_VAR(MODINFO_ADDR, a, s) 182#define MOD_SIZE(a, s) MOD_VAR(MODINFO_SIZE, a, s) 183 184#define MOD_METADATA(a, mm) { \ 185 COPY32(MODINFO_METADATA | mm->md_type, a); \ 186 COPY32(mm->md_size, a); \ 187 i386_copyin(mm->md_data, a, mm->md_size); \ | 180} 181 182#define MOD_ADDR(a, s) MOD_VAR(MODINFO_ADDR, a, s) 183#define MOD_SIZE(a, s) MOD_VAR(MODINFO_SIZE, a, s) 184 185#define MOD_METADATA(a, mm) { \ 186 COPY32(MODINFO_METADATA | mm->md_type, a); \ 187 COPY32(mm->md_size, a); \ 188 i386_copyin(mm->md_data, a, mm->md_size); \ |
| 188 a += mm->md_size; \ | 189 a += roundup(mm->md_size, sizeof(u_int32_t));\ |
| 189} 190 191#define MOD_END(a) { \ 192 COPY32(MODINFO_END, a); \ 193 COPY32(0, a); \ 194} 195 196vm_offset_t 197bi_copymodules(vm_offset_t addr) 198{ 199 struct loaded_module *mp; 200 struct module_metadata *md; 201 202 /* start with the first module on the list, should be the kernel */ 203 for (mp = mod_findmodule(NULL, NULL); mp != NULL; mp = mp->m_next) { | 190} 191 192#define MOD_END(a) { \ 193 COPY32(MODINFO_END, a); \ 194 COPY32(0, a); \ 195} 196 197vm_offset_t 198bi_copymodules(vm_offset_t addr) 199{ 200 struct loaded_module *mp; 201 struct module_metadata *md; 202 203 /* start with the first module on the list, should be the kernel */ 204 for (mp = mod_findmodule(NULL, NULL); mp != NULL; mp = mp->m_next) { |
| 204 | 205 |
| 205 MOD_NAME(addr, mp->m_name); /* this field must come first */ 206 MOD_TYPE(addr, mp->m_type); 207 MOD_ADDR(addr, mp->m_addr); 208 MOD_SIZE(addr, mp->m_size); 209 for (md = mp->m_metadata; md != NULL; md = md->md_next) 210 if (!(md->md_type & MODINFOMD_NOCOPY)) 211 MOD_METADATA(addr, md); 212 } --- 105 unchanged lines hidden --- | 206 MOD_NAME(addr, mp->m_name); /* this field must come first */ 207 MOD_TYPE(addr, mp->m_type); 208 MOD_ADDR(addr, mp->m_addr); 209 MOD_SIZE(addr, mp->m_size); 210 for (md = mp->m_metadata; md != NULL; md = md->md_next) 211 if (!(md->md_type & MODINFOMD_NOCOPY)) 212 MOD_METADATA(addr, md); 213 } --- 105 unchanged lines hidden --- |