diff -Nur plex86/kernel/monitor.c plex86-jens/kernel/monitor.c --- plex86/kernel/monitor.c Tue Mar 28 12:59:04 2000 +++ plex86-jens/kernel/monitor.c Thu Apr 6 15:02:08 2000 @@ -384,6 +384,9 @@ vm->host.guest_context->cs = Selector(1, 0, RPL3); /* fixed for now */ vm->host.guest_context->ss = Selector(2, 0, RPL3); /* fixed for now */ + vm->host.guest_context->ds = Selector(2, 0, RPL3); /* fixed for now */ + vm->host.guest_context->es = Selector(2, 0, RPL3); /* fixed for now */ + vm->host.guest_context->fs = Selector(2, 0, RPL3); /* fixed for now */ vm->host.guest_context->eflags = FLG_REAL_BASE; diff -Nur plex86/user/bin.c plex86-jens/user/bin.c --- plex86/user/bin.c Sun Mar 26 19:00:34 2000 +++ plex86-jens/user/bin.c Thu Apr 6 15:12:33 2000 @@ -23,11 +23,13 @@ #include #include #include +#include #include "plex86.h" #include "user.h" #include "bin.h" #include "elf.h" +#include "multiboot.h" /************************************************************************/ @@ -41,7 +43,8 @@ int virtno; struct stat stat_buf; char *image; - + int i, multi_boot, multiboot_header_flags = 0; + struct multiboot_header mbh; /* load guest code */ @@ -151,6 +154,53 @@ } free (image); + + /* is it multiboot compliant? */ + + multi_boot = 0; + for(i = 0; iflags; + memcpy(&mbh,ptr + context.eip + i,sizeof(mbh)); + break; + } + } + if(multi_boot) + { + struct multiboot_info mbi; + + memset(&mbi,0,sizeof(mbi)); + if(multiboot_header_flags & MULTIBOOT_PAGE_ALIGN) + { + fprintf(stderr,"Should align all boot modules to page boundaries.\n"); + } + //if(multiboot_header_flags & MULTIBOOT_MEMORY_INFO) + { + fprintf(stderr,"Must provide memory information in multiboot info structure.\n"); + mbi.flags |= MULTIBOOT_MEMORY; + mbi.mem_lower = 1024; + mbi.mem_upper = (vm_conf.max_memory - 1) * 1024; + } + if(multiboot_header_flags & MULTIBOOT_AOUT_KLUDGE) + { + fprintf(stderr,"found a.out kludge in ELF binary!\n"); + fprintf(stderr,"header_addr: 0x%x\n",mbh.header_addr); + fprintf(stderr,"load_addr: 0x%x\n",mbh.load_addr); + fprintf(stderr,"load_end_addr: 0x%x\n",mbh.load_end_addr); + fprintf(stderr,"bss_end_addr: 0x%x\n",mbh.bss_end_addr); + fprintf(stderr,"entry_addr: 0x%x\n",mbh.entry); + } + /* FIXME: find a nice, warm and dry place for multiboot info structure */ + fprintf(stderr,"put mbi at 0x%x\n",vm_conf.max_memory * 1024 * 1024 - sizeof(mbi)); + memcpy(ptr + vm_conf.max_memory * 1024 * 1024 - sizeof(mbi),&mbi,sizeof(mbi)); + context.ebx = vm_conf.max_memory * 1024 * 1024 - sizeof(mbi); + context.eax = MULTIBOOT_VALID; + } + } diff -Nur plex86/user/multiboot.h plex86-jens/user/multiboot.h --- plex86/user/multiboot.h Thu Jan 1 01:00:00 1970 +++ plex86-jens/user/multiboot.h Thu Apr 6 15:10:21 2000 @@ -0,0 +1,181 @@ +/* + * Copyright (c) 1994-1995, 1998 University of Utah and the Flux Group. + * All rights reserved. + * + * This file is part of the Flux OSKit. The OSKit is free software, also known + * as "open source;" you can redistribute it and/or modify it under the terms + * of the GNU General Public License (GPL), version 2, as published by the Free + * Software Foundation (FSF). To explore alternate licensing terms, contact + * the University of Utah at csl-dist@cs.utah.edu or +1-801-585-3271. + * + * The OSKit is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GPL for more details. You should have + * received a copy of the GPL along with the OSKit; see the file COPYING. If + * not, write to the FSF, 59 Temple Place #330, Boston, MA 02111-1307, USA. + */ +#ifndef _OSKIT_X86_MULTIBOOT_H_ +#define _OSKIT_X86_MULTIBOOT_H_ + +#ifndef ASSEMBLER +#include "oskit_types.h" + +/* For a.out kernel boot images, the following header must appear + somewhere in the first 8192 bytes of the kernel image file. */ +struct multiboot_header +{ + /* Must be MULTIBOOT_MAGIC */ + unsigned magic; + + /* Feature flags - see below. */ + unsigned flags; + + /* Checksum: magic + flags + checksum == 0 */ + unsigned checksum; + + /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ + oskit_addr_t header_addr; + oskit_addr_t load_addr; + oskit_addr_t load_end_addr; + oskit_addr_t bss_end_addr; + oskit_addr_t entry; +}; + +#endif /* not defined ASSEMBLER */ + +/* The entire multiboot_header must be contained + within the first MULTIBOOT_SEARCH bytes of the kernel image. */ +#define MULTIBOOT_SEARCH 8192 + +/* Magic value identifying the multiboot_header. */ +#define MULTIBOOT_MAGIC 0x1badb002 + +/* Features flags for 'flags'. + If a boot loader sees a flag in MULTIBOOT_MUSTKNOW set + and it doesn't understand it, it must fail. */ +#define MULTIBOOT_MUSTKNOW 0x0000ffff + +/* Align all boot modules on page (4KB) boundaries. */ +#define MULTIBOOT_PAGE_ALIGN 0x00000001 + +/* Must be provided memory information in multiboot_info structure */ +#define MULTIBOOT_MEMORY_INFO 0x00000002 + +/* Use the load address fields above instead of the ones in the a.out header + to figure out what to load where, and what to do afterwards. + This should only be needed for a.out kernel images + (ELF and other formats can generally provide the needed information). */ +#define MULTIBOOT_AOUT_KLUDGE 0x00010000 + +/* The boot loader passes this value in register EAX to signal the kernel + that the multiboot method is being used */ +#define MULTIBOOT_VALID 0x2badb002 + +/* The boot loader passes this data structure to the kernel in + register EBX on entry. */ +#ifndef ASSEMBLER +struct multiboot_info +{ + /* These flags indicate which parts of the multiboot_info are valid; + see below for the actual flag bit definitions. */ + unsigned flags; + + /* Lower/Upper memory installed in the machine. + Valid only if MULTIBOOT_MEMORY is set in flags word above. */ + oskit_size_t mem_lower; + oskit_size_t mem_upper; + + /* BIOS disk device the kernel was loaded from. + Valid only if MULTIBOOT_BOOT_DEVICE is set in flags word above. */ + unsigned char boot_device[4]; + + /* Command-line for the OS kernel: a null-terminated ASCII string. + Valid only if MULTIBOOT_CMDLINE is set in flags word above. */ + oskit_addr_t cmdline; + + /* List of boot modules loaded with the kernel. + Valid only if MULTIBOOT_MODS is set in flags word above. */ + unsigned mods_count; + oskit_addr_t mods_addr; + + /* Symbol information for a.out or ELF executables. */ + union + { + struct + { + /* a.out symbol information valid only if MULTIBOOT_AOUT_SYMS + is set in flags word above. */ + oskit_size_t tabsize; + oskit_size_t strsize; + oskit_addr_t addr; + unsigned reserved; + } a; + + struct + { + /* ELF section header information valid only if + MULTIBOOT_ELF_SHDR is set in flags word above. */ + unsigned num; + oskit_size_t size; + oskit_addr_t addr; + unsigned shndx; + } e; + } syms; + + /* Memory map buffer. + Valid only if MULTIBOOT_MEM_MAP is set in flags word above. */ + oskit_size_t mmap_count; + oskit_addr_t mmap_addr; +}; + +#define MULTIBOOT_MEMORY (1L<<0) +#define MULTIBOOT_BOOT_DEVICE (1L<<1) +#define MULTIBOOT_CMDLINE (1L<<2) +#define MULTIBOOT_MODS (1L<<3) +#define MULTIBOOT_AOUT_SYMS (1L<<4) +#define MULTIBOOT_ELF_SHDR (1L<<5) +#define MULTIBOOT_MEM_MAP (1L<<6) + +/* For use with printf's %b format. */ +#define MULTIBOOT_FLAGS_FORMAT \ + "\20\1MEMORY\2BOOT_DEVICE\3CMDLINE\4MODS\5AOUT_SYMS\6ELF_SHDR\7MEM_MAP" + +/* The mods_addr field above contains the physical address of the first + of 'mods_count' multiboot_module structures. */ +struct multiboot_module +{ + /* Physical start and end addresses of the module data itself. */ + oskit_addr_t mod_start; + oskit_addr_t mod_end; + + /* Arbitrary ASCII string associated with the module. */ + oskit_addr_t string; + + /* Boot loader must set to 0; OS must ignore. */ + unsigned reserved; +}; + + +/* The mmap_addr field above contains the physical address of the first + of the AddrRangeDesc structure. "size" represents the size of the + rest of the structure and optional padding. The offset to the beginning + of the next structure is therefore "size + 4". */ +struct AddrRangeDesc +{ + unsigned long size; + unsigned long BaseAddrLow; + unsigned long BaseAddrHigh; + unsigned long LengthLow; + unsigned long LengthHigh; + unsigned long Type; + + /* unspecified optional padding... */ +}; + +#endif /* ifndef ASSEMBLER */ + +/* usable memory "Type", all others are reserved. */ +#define MB_ARD_MEMORY 1 + + +#endif /* _OSKIT_X86_MULTIBOOT_H_ */ diff -Nur plex86/user/oskit_types.h plex86-jens/user/oskit_types.h --- plex86/user/oskit_types.h Thu Jan 1 01:00:00 1970 +++ plex86-jens/user/oskit_types.h Thu Apr 6 15:10:38 2000 @@ -0,0 +1,74 @@ +/* + * Copyright (c) 1997-1998 University of Utah and the Flux Group. + * All rights reserved. + * + * This file is part of the Flux OSKit. The OSKit is free software, also known + * as "open source;" you can redistribute it and/or modify it under the terms + * of the GNU General Public License (GPL), version 2, as published by the Free + * Software Foundation (FSF). To explore alternate licensing terms, contact + * the University of Utah at csl-dist@cs.utah.edu or +1-801-585-3271. + * + * The OSKit is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GPL for more details. You should have + * received a copy of the GPL along with the OSKit; see the file COPYING. If + * not, write to the FSF, 59 Temple Place #330, Boston, MA 02111-1307, USA. + */ +/* + * Basic Flux OS Toolkit types for the x86 architecture. + */ +#ifndef _OSKIT_X86_TYPES_H_ +#define _OSKIT_X86_TYPES_H_ + +/* + * On any anchitecture, + * these types are _exactly_ as wide as indicated in their names. + * The signed types essentially have the same meanings + * as Java's byte, short, int, and long types, respectively. + */ +typedef signed char oskit_s8_t; +typedef signed short int oskit_s16_t; +typedef signed int oskit_s32_t; +typedef signed long long oskit_s64_t; +typedef unsigned char oskit_u8_t; +typedef unsigned short int oskit_u16_t; +typedef unsigned int oskit_u32_t; +typedef unsigned long long oskit_u64_t; +typedef float oskit_f32_t; +typedef double oskit_f64_t; + +/* + * Just yer ordinary boolean type. + * On the x86, bytes are fast, so we use it; + * on other architectures this will generally be an int. + */ +typedef unsigned char oskit_bool_t; + +/* + * Type compatible with `va_list' from . + */ +typedef char * oskit_va_list; + +/* + * A oskit_addr_t is a type-neutral pointer, + * e.g. an offset into a virtual memory space. + */ +typedef oskit_u32_t oskit_addr_t; + +/* + * A oskit_size_t is the proper type for + * expressing the difference between two + * oskit_addr_t entities. + */ +typedef oskit_u32_t oskit_size_t; +typedef oskit_s32_t oskit_ssize_t; + +/* + * Integer types the size of a general-purpose processor register. + * Generally the same size as oskit_addr_t and oskit_size_t. + */ +typedef oskit_u32_t oskit_reg_t; +typedef oskit_s32_t oskit_sreg_t; + + +#endif /* _OSKIT_X86_TYPES_H_ */