diff options
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | Makefile.target | 12 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | block.c | 54 | ||||
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | cpu-exec.c | 4 | ||||
| -rw-r--r-- | dyngen.c | 1060 | ||||
| -rw-r--r-- | exec-all.h | 12 | ||||
| -rw-r--r-- | exec.c | 12 | ||||
| -rw-r--r-- | gdbstub.c | 10 | ||||
| -rw-r--r-- | hw/dma.c | 5 | ||||
| -rw-r--r-- | hw/fdc.c | 5 | ||||
| -rw-r--r-- | hw/i8254.c | 20 | ||||
| -rw-r--r-- | hw/i8259.c | 20 | ||||
| -rw-r--r-- | hw/ide.c | 136 | ||||
| -rw-r--r-- | hw/mc146818rtc.c | 20 | ||||
| -rw-r--r-- | hw/ne2000.c | 20 | ||||
| -rw-r--r-- | hw/pc.c | 26 | ||||
| -rw-r--r-- | hw/pckbd.c | 20 | ||||
| -rw-r--r-- | hw/sb16.c | 5 | ||||
| -rw-r--r-- | hw/serial.c | 20 | ||||
| -rw-r--r-- | hw/vga.c | 22 | ||||
| -rw-r--r-- | monitor.c | 23 | ||||
| -rw-r--r-- | osdep.c | 5 | ||||
| -rw-r--r-- | oss.c | 44 | ||||
| -rw-r--r-- | qemu-mkcow.c | 5 | ||||
| -rw-r--r-- | sdl.c | 29 | ||||
| -rw-r--r-- | target-i386/helper2.c | 9 | ||||
| -rw-r--r-- | target-i386/translate-copy.c | 9 | ||||
| -rw-r--r-- | target-i386/translate.c | 1 | ||||
| -rw-r--r-- | vl.c | 185 | ||||
| -rw-r--r-- | vl.h | 69 |
33 files changed, 1153 insertions, 756 deletions
@@ -24,6 +24,7 @@ version 0.5.3: - VM save/restore commands - new timer API - more precise RTC emulation (periodic timers + time updates) + - Win32 port (initial patch by Kazu) version 0.5.2: @@ -1,12 +1,17 @@ include config-host.mak CFLAGS=-Wall -O2 -g +ifdef CONFIG_WIN32 +CFLAGS+=-fpack-struct +endif LDFLAGS=-g LIBS= DEFINES+=-D_GNU_SOURCE +ifndef CONFIG_WIN32 TOOLS=qemu-mkcow +endif -all: dyngen $(TOOLS) qemu-doc.html qemu.1 +all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu.1 for d in $(TARGET_DIRS); do \ make -C $$d $@ || exit 1 ; \ done @@ -14,7 +19,7 @@ all: dyngen $(TOOLS) qemu-doc.html qemu.1 qemu-mkcow: qemu-mkcow.o $(HOST_CC) -o $@ $^ $(LIBS) -dyngen: dyngen.o +dyngen$(EXESUF): dyngen.o $(HOST_CC) -o $@ $^ $(LIBS) %.o: %.c @@ -23,7 +28,7 @@ dyngen: dyngen.o clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h - rm -f *.o *.a $(TOOLS) dyngen TAGS qemu.pod + rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS qemu.pod make -C tests clean for d in $(TARGET_DIRS); do \ make -C $$d $@ || exit 1 ; \ diff --git a/Makefile.target b/Makefile.target index 7b79a8b094..1b578d0fd2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -11,12 +11,12 @@ CFLAGS=-Wall -O2 -g LDFLAGS=-g LIBS= HELPER_CFLAGS=$(CFLAGS) -DYNGEN=../dyngen +DYNGEN=../dyngen$(EXESUF) # user emulator name QEMU_USER=qemu-$(TARGET_ARCH) # system emulator name ifdef CONFIG_SOFTMMU -QEMU_SYSTEM=qemu +QEMU_SYSTEM=qemu$(EXESUF) else QEMU_SYSTEM=qemu-fast endif @@ -146,6 +146,9 @@ endif DEFINES+=-D_GNU_SOURCE LIBS+=-lm +ifdef CONFIG_WIN32 +LIBS+=-lwinmm +endif # profiling code ifdef TARGET_GPROF @@ -219,9 +222,12 @@ ifeq ($(ARCH),alpha) endif # must use static linking to avoid leaving stuff in virtual address space -VL_OBJS=vl.o osdep.o block.o monitor.o gdbstub.o \ +VL_OBJS=vl.o osdep.o block.o monitor.o \ ide.o ne2000.o pckbd.o vga.o sb16.o dma.o oss.o \ fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o +ifdef CONFIG_GDBSTUB +VL_OBJS+=gdbstub.o +endif ifeq ($(TARGET_ARCH), ppc) VL_OBJS+= hw.o endif @@ -1,9 +1,12 @@ short term: ---------- +- handle fast timers + add explicit clocks +- OS/2 install bug +- win 95 install bug +- handle Self Modifying Code even if modifying current TB (BE OS 5 install) - physical memory cache (reduce qemu-fast address space size to about 32 MB) - better code fetch - XP security bug -- handle Self Modifying Code even if modifying current TB (BE OS 5 install) - cycle counter for all archs - TLB code protection support for PPC - add sysenter/sysexit and fxsr for L4 pistachio 686 @@ -21,29 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> - #include "vl.h" -#define NO_THUNK_TYPE_SIZE -#include "thunk.h" +#ifndef _WIN32 +#include <sys/mman.h> +#endif #include "cow.h" @@ -97,11 +79,14 @@ BlockDriverState *bdrv_new(const char *device_name) int bdrv_open(BlockDriverState *bs, const char *filename, int snapshot) { - int fd, cow_fd; + int fd; int64_t size; - char template[] = "/tmp/vl.XXXXXX"; struct cow_header_v2 cow_header; +#ifndef _WIN32 + char template[] = "/tmp/vl.XXXXXX"; + int cow_fd; struct stat st; +#endif bs->read_only = 0; bs->fd = -1; @@ -110,10 +95,18 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int snapshot) strcpy(bs->filename, filename); /* open standard HD image */ +#ifdef _WIN32 + fd = open(filename, O_RDWR | O_BINARY); +#else fd = open(filename, O_RDWR | O_LARGEFILE); +#endif if (fd < 0) { /* read only image on disk */ +#ifdef _WIN32 + fd = open(filename, O_RDONLY | O_BINARY); +#else fd = open(filename, O_RDONLY | O_LARGEFILE); +#endif if (fd < 0) { perror(filename); goto fail; @@ -128,8 +121,9 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int snapshot) fprintf(stderr, "%s: could not read header\n", filename); goto fail; } - if (cow_header.magic == htonl(COW_MAGIC) && - cow_header.version == htonl(COW_VERSION)) { +#ifndef _WIN32 + if (be32_to_cpu(cow_header.magic) == COW_MAGIC && + be32_to_cpu(cow_header.version) == COW_VERSION) { /* cow image found */ size = cow_header.size; #ifndef WORDS_BIGENDIAN @@ -144,7 +138,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int snapshot) fprintf(stderr, "%s: could not find original disk image '%s'\n", filename, cow_header.backing_file); goto fail; } - if (st.st_mtime != htonl(cow_header.mtime)) { + if (st.st_mtime != be32_to_cpu(cow_header.mtime)) { fprintf(stderr, "%s: original raw disk image '%s' does not match saved timestamp\n", filename, cow_header.backing_file); goto fail; } @@ -164,13 +158,16 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int snapshot) bs->cow_bitmap = bs->cow_bitmap_addr + sizeof(cow_header); bs->cow_sectors_offset = (bs->cow_bitmap_size + 511) & ~511; snapshot = 0; - } else { + } else +#endif + { /* standard raw image */ size = lseek64(fd, 0, SEEK_END); bs->total_sectors = size / 512; bs->fd = fd; } +#ifndef _WIN32 if (snapshot) { /* create a temporary COW file */ cow_fd = mkstemp(template); @@ -190,6 +187,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int snapshot) bs->cow_bitmap = bs->cow_bitmap_addr; bs->cow_sectors_offset = 0; } +#endif bs->inserted = 1; @@ -206,9 +204,11 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int snapshot) void bdrv_close(BlockDriverState *bs) { if (bs->inserted) { +#ifndef _WIN32 /* we unmap the mapping so that it is written to the COW file */ if (bs->cow_bitmap_addr) munmap(bs->cow_bitmap_addr, bs->cow_bitmap_size); +#endif if (bs->cow_fd >= 0) close(bs->cow_fd); if (bs->fd >= 0) @@ -68,10 +68,16 @@ case "$cpu" in esac gprof="no" bigendian="no" +mingw32="no" +EXESUF="" +gdbstub="yes" # OS specific targetos=`uname -s` case $targetos in +MINGW32*) +mingw32="yes" +;; *) ;; esac @@ -136,6 +142,8 @@ for opt do ;; --disable-sdl) sdl="no" ;; + --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" + ;; esac done @@ -148,6 +156,14 @@ cc="${cross_prefix}${cc}" ar="${cross_prefix}${ar}" strip="${cross_prefix}${strip}" +if test "$mingw32" = "yes" ; then + host_cc="$cc" + target_list="i386-softmmu" + prefix="/c/Program Files/Qemu" + EXESUF=".exe" + gdbstub="no" +fi + if test -z "$cross_prefix" ; then # --- @@ -206,6 +222,7 @@ echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]" echo " --cc=CC use C compiler CC [$cc]" echo " --make=MAKE use specified make [$make]" echo " --static enable static build [$static]" +echo " --enable-mingw32 enable Win32 cross compilation with mingw32" echo "" echo "NOTE: The object files are build at the place where configure is launched" exit 1 @@ -227,6 +244,8 @@ echo "target list $target_list" echo "gprof enabled $gprof" echo "static build $static" echo "SDL support $sdl" +echo "mingw32 support $mingw32" + if test $sdl_too_old = "yes"; then echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support" fi @@ -253,6 +272,7 @@ echo "AR=$ar" >> $config_mak echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak echo "CFLAGS=$CFLAGS" >> $config_mak echo "LDFLAGS=$LDFLAGS" >> $config_mak +echo "EXESUF=$EXESUF" >> $config_mak if test "$cpu" = "i386" ; then echo "ARCH=i386" >> $config_mak echo "#define HOST_I386 1" >> $config_h @@ -294,7 +314,15 @@ if test "$bigendian" = "yes" ; then echo "WORDS_BIGENDIAN=yes" >> $config_mak echo "#define WORDS_BIGENDIAN 1" >> $config_h fi -echo "#define HAVE_BYTESWAP_H 1" >> $config_h +if test "$mingw32" = "yes" ; then + echo "CONFIG_WIN32=yes" >> $config_mak +else + echo "#define HAVE_BYTESWAP_H 1" >> $config_h +fi +if test "$gdbstub" = "yes" ; then + echo "CONFIG_GDBSTUB=yes" >> $config_mak + echo "#define CONFIG_GDBSTUB 1" >> $config_h +fi if test "$gprof" = "yes" ; then echo "TARGET_GPROF=yes" >> $config_mak echo "#define HAVE_GPROF 1" >> $config_h diff --git a/cpu-exec.c b/cpu-exec.c index cdbebd39be..9b049dc616 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -592,6 +592,8 @@ void cpu_x86_frstor(CPUX86State *s, uint8_t *ptr, int data32) #endif /* TARGET_I386 */ +#if !defined(CONFIG_SOFTMMU) + #undef EAX #undef ECX #undef EDX @@ -925,3 +927,5 @@ int cpu_signal_handler(int host_signum, struct siginfo *info, #error host CPU specific signal handler needed #endif + +#endif /* !defined(CONFIG_SOFTMMU) */ @@ -3,6 +3,9 @@ * * Copyright (c) 2003 Fabrice Bellard * + * The COFF object format support was extracted from Kazu's QEMU port + * to Win32. + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -27,6 +30,14 @@ #include "config-host.h" +#if defined(_WIN32) +#define CONFIG_FORMAT_COFF +#else +#define CONFIG_FORMAT_ELF +#endif + +#ifdef CONFIG_FORMAT_ELF + /* elf format definitions. We use these macros to test the CPU to allow cross compilation (this tool must be ran on the build platform) */ @@ -122,6 +133,40 @@ typedef uint64_t host_ulong; #define SHT_RELOC SHT_REL #endif +#define EXE_RELOC ELF_RELOC +#define EXE_SYM ElfW(Sym) + +#endif /* CONFIG_FORMAT_ELF */ + +#ifdef CONFIG_FORMAT_COFF + +#include "a.out.h" + +typedef int32_t host_long; +typedef uint32_t host_ulong; + +#define FILENAMELEN 256 + +typedef struct coff_sym { + struct external_syment *st_syment; + char st_name[FILENAMELEN]; + uint32_t st_value; + int st_size; + uint8_t st_type; + uint8_t st_shndx; +} coff_Sym; + +typedef struct coff_rel { + struct external_reloc *r_reloc; + int r_offset; + uint8_t r_type; +} coff_Rel; + +#define EXE_RELOC struct coff_rel +#define EXE_SYM struct coff_sym + +#endif /* CONFIG_FORMAT_COFF */ + #include "bswap.h" enum { @@ -133,18 +178,67 @@ enum { /* all dynamically generated functions begin with this code */ #define OP_PREFIX "op_" -int elf_must_swap(struct elfhdr *h) +int do_swap; + +void __attribute__((noreturn)) __attribute__((format (printf, 1, 2))) error(const char *fmt, ...) { - union { - uint32_t i; - uint8_t b[4]; - } swaptest; + va_list ap; + va_start(ap, fmt); + fprintf(stderr, "dyngen: "); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + va_end(ap); + exit(1); +} - swaptest.i = 1; - return (h->e_ident[EI_DATA] == ELFDATA2MSB) != - (swaptest.b[0] == 0); +void *load_data(int fd, long offset, unsigned int size) +{ + char *data; + + data = malloc(size); + if (!data) + return NULL; + lseek(fd, offset, SEEK_SET); + if (read(fd, data, size) != size) { + free(data); + return NULL; + } + return data; } - + +int strstart(const char *str, const char *val, const char **ptr) +{ + const char *p, *q; + p = str; + q = val; + while (*q != '\0') { + if (*p != *q) + return 0; + p++; + q++; + } + if (ptr) + *ptr = p; + return 1; +} + +void pstrcpy(char *buf, int buf_size, const char *str) +{ + int c; + char *q = buf; + + if (buf_size <= 0) + return; + + for(;;) { + c = *str++; + if (c == 0 || q >= buf + buf_size - 1) + break; + *q++ = c; + } + *q = '\0'; +} + void swab16s(uint16_t *p) { *p = bswap16(*p); @@ -160,6 +254,66 @@ void swab64s(uint64_t *p) *p = bswap64(*p); } +uint16_t get16(uint16_t *p) +{ + uint16_t val; + val = *p; + if (do_swap) + val = bswap16(val); + return val; +} + +uint32_t get32(uint32_t *p) +{ + uint32_t val; + val = *p; + if (do_swap) + val = bswap32(val); + return val; +} + +void put16(uint16_t *p, uint16_t val) +{ + if (do_swap) + val = bswap16(val); + *p = val; +} + +void put32(uint32_t *p, uint32_t val) +{ + if (do_swap) + val = bswap32(val); + *p = val; +} + +/* executable information */ +EXE_SYM *symtab; +int nb_syms; +int text_shndx; +uint8_t *text; +EXE_RELOC *relocs; +int nb_relocs; + +#ifdef CONFIG_FORMAT_ELF + +/* ELF file info */ +struct elf_shdr *shdr; +uint8_t **sdata; +struct elfhdr ehdr; +char *strtab; + +int elf_must_swap(struct elfhdr *h) +{ + union { + uint32_t i; + uint8_t b[4]; + } swaptest; + + swaptest.i = 1; + return (h->e_ident[EI_DATA] == ELFDATA2MSB) != + (swaptest.b[0] == 0); +} + void elf_swap_ehdr(struct elfhdr *h) { swab16s(&h->e_type); /* Object file type */ @@ -212,122 +366,396 @@ void elf_swap_rel(ELF_RELOC *rel) #endif } -/* ELF file info */ -int do_swap; -struct elf_shdr *shdr; -uint8_t **sdata; -struct elfhdr ehdr; -ElfW(Sym) *symtab; -int nb_syms; -char *strtab; -int text_shndx; +struct elf_shdr *find_elf_section(struct elf_shdr *shdr, int shnum, const char *shstr, + const char *name) +{ + int i; + const char *shname; + struct elf_shdr *sec; -uint16_t get16(uint16_t *p) + for(i = 0; i < shnum; i++) { + sec = &shdr[i]; + if (!sec->sh_name) + continue; + shname = shstr + sec->sh_name; + if (!strcmp(shname, name)) + return sec; + } + return NULL; +} + +int find_reloc(int sh_index) { - uint16_t val; - val = *p; - if (do_swap) - val = bswap16(val); - return val; + struct elf_shdr *sec; + int i; + + for(i = 0; i < ehdr.e_shnum; i++) { + sec = &shdr[i]; + if (sec->sh_type == SHT_RELOC && sec->sh_info == sh_index) + return i; + } + return 0; } -uint32_t get32(uint32_t *p) +static char *get_rel_sym_name(EXE_RELOC *rel) { - uint32_t val; - val = *p; - if (do_swap) - val = bswap32(val); - return val; + return strtab + symtab[ELFW(R_SYM)(rel->r_info)].st_name; } -void put16(uint16_t *p, uint16_t val) +static char *get_sym_name(EXE_SYM *sym) { - if (do_swap) - val = bswap16(val); - *p = val; + return strtab + sym->st_name; } -void put32(uint32_t *p, uint32_t val) +/* load an elf object file */ +int load_object(const char *filename) { + int fd; + struct elf_shdr *sec, *symtab_sec, *strtab_sec, *text_sec; + int i, j; + ElfW(Sym) *sym; + char *shstr; + ELF_RELOC *rel; + + fd = open(filename, O_RDONLY); + if (fd < 0) + error("can't open file '%s'", filename); + + /* Read ELF header. */ + if (read(fd, &ehdr, sizeof (ehdr)) != sizeof (ehdr)) + error("unable to read file header"); + + /* Check ELF identification. */ + if (ehdr.e_ident[EI_MAG0] != ELFMAG0 + || ehdr.e_ident[EI_MAG1] != ELFMAG1 + || ehdr.e_ident[EI_MAG2] != ELFMAG2 + || ehdr.e_ident[EI_MAG3] != ELFMAG3 + || ehdr.e_ident[EI_VERSION] != EV_CURRENT) { + error("bad ELF header"); + } + + do_swap = elf_must_swap(&ehdr); if (do_swap) - val = bswap32(val); - *p = val; + elf_swap_ehdr(&ehdr); + if (ehdr.e_ident[EI_CLASS] != ELF_CLASS) + error("Unsupported ELF class"); + if (ehdr.e_type != ET_REL) + error("ELF object file expected"); + if (ehdr.e_version != EV_CURRENT) + error("Invalid ELF version"); + if (!elf_check_arch(ehdr.e_machine)) + error("Unsupported CPU (e_machine=%d)", ehdr.e_machine); + + /* read section headers */ + shdr = load_data(fd, ehdr.e_shoff, ehdr.e_shnum * sizeof(struct elf_shdr)); + if (do_swap) { + for(i = 0; i < ehdr.e_shnum; i++) { + elf_swap_shdr(&shdr[i]); + } + } + + /* read all section data */ + sdata = malloc(sizeof(void *) * ehdr.e_shnum); + memset(sdata, 0, sizeof(void *) * ehdr.e_shnum); + + for(i = 0;i < ehdr.e_shnum; i++) { + sec = &shdr[i]; + if (sec->sh_type != SHT_NOBITS) + sdata[i] = load_data(fd, sec->sh_offset, sec->sh_size); + } + + sec = &shdr[ehdr.e_shstrndx]; + shstr = sdata[ehdr.e_shstrndx]; + + /* swap relocations */ + for(i = 0; i < ehdr.e_shnum; i++) { + sec = &shdr[i]; + if (sec->sh_type == SHT_RELOC) { + nb_relocs = sec->sh_size / sec->sh_entsize; + if (do_swap) { + for(j = 0, rel = (ELF_RELOC *)sdata[i]; j < nb_relocs; j++, rel++) + elf_swap_rel(rel); + } + } + } + /* text section */ + + text_sec = find_elf_section(shdr, ehdr.e_shnum, shstr, ".text"); + if (!text_sec) + error("could not find .text section"); + text_shndx = text_sec - shdr; + text = sdata[text_shndx]; + + /* find text relocations, if any */ + relocs = NULL; + nb_relocs = 0; + i = find_reloc(text_shndx); + if (i != 0) { + relocs = (ELF_RELOC *)sdata[i]; + nb_relocs = shdr[i].sh_size / shdr[i].sh_entsize; + } + + symtab_sec = find_elf_section(shdr, ehdr.e_shnum, shstr, ".symtab"); + if (!symtab_sec) + error("could not find .symtab section"); + strtab_sec = &shdr[symtab_sec->sh_link]; + + symtab = (ElfW(Sym) *)sdata[symtab_sec - shdr]; + strtab = sdata[symtab_sec->sh_link]; + + nb_syms = symtab_sec->sh_size / sizeof(ElfW(Sym)); + if (do_swap) { + for(i = 0, sym = symtab; i < nb_syms; i++, sym++) { + swab32s(&sym->st_name); + swabls(&sym->st_value); + swabls(&sym->st_size); + swab16s(&sym->st_shndx); + } + } + close(fd); + return 0; } -void __attribute__((noreturn)) __attribute__((format (printf, 1, 2))) error(const char *fmt, ...) +#endif /* CONFIG_FORMAT_ELF */ + +#ifdef CONFIG_FORMAT_COFF + +/* COFF file info */ +struct external_scnhdr *shdr; +uint8_t **sdata; +struct external_filehdr fhdr; +struct external_syment *coff_symtab; +char *strtab; +int coff_text_shndx, coff_data_shndx; + +int data_shndx; + +#define STRTAB_SIZE 4 + +#define DIR32 0x06 +#define DISP32 0x14 + +#define T_FUNCTION 0x20 +#define C_EXTERNAL 2 + +void sym_ent_name(struct external_syment *ext_sym, EXE_SYM *sym) { - va_list ap; - va_start(ap, fmt); - fprintf(stderr, "dyngen: "); - vfprintf(stderr, fmt, ap); - fprintf(stderr, "\n"); - va_end(ap); - exit(1); + char *q; + int c, i, len; + + if (ext_sym->e.e.e_zeroes != 0) { + q = sym->st_name; + for(i = 0; i < 8; i++) { + c = ext_sym->e.e_name[i]; + if (c == '\0') + break; + *q++ = c; + } + *q = '\0'; + } else { + pstrcpy(sym->st_name, sizeof(sym->st_name), strtab + ext_sym->e.e.e_offset); + } + + /* now convert the name to a C name (suppress the leading '_') */ + if (sym->st_name[0] == '_') { + len = strlen(sym->st_name); + memmove(sym->st_name, sym->st_name + 1, len - 1); + sym->st_name[len - 1] = '\0'; + } } +char *name_for_dotdata(struct coff_rel *rel) +{ + int i; + struct coff_sym *sym; + uint32_t text_data; -struct elf_shdr *find_elf_section(struct elf_shdr *shdr, int shnum, const char *shstr, - const char *name) + text_data = *(uint32_t *)(text + rel->r_offset); + + for (i = 0, sym = symtab; i < nb_syms; i++, sym++) { + if (sym->st_syment->e_scnum == data_shndx && + text_data >= sym->st_value && + text_data < sym->st_value + sym->st_size) { + + return sym->st_name; + + } + } + return NULL; +} + +static char *get_sym_name(EXE_SYM *sym) +{ + return sym->st_name; +} + +static char *get_rel_sym_name(EXE_RELOC *rel) +{ + char *name; + name = get_sym_name(symtab + *(uint32_t *)(rel->r_reloc->r_symndx)); + if (!strcmp(name, ".data")) + name = name_for_dotdata(rel); + return name; +} + +struct external_scnhdr *find_coff_section(struct external_scnhdr *shdr, int shnum, const char *name) { int i; const char *shname; - struct elf_shdr *sec; + struct external_scnhdr *sec; for(i = 0; i < shnum; i++) { sec = &shdr[i]; - if (!sec->sh_name) + if (!sec->s_name) continue; - shname = shstr + sec->sh_name; + shname = sec->s_name; if (!strcmp(shname, name)) return sec; } return NULL; } -int find_reloc(int sh_index) +/* load a coff object file */ +int load_object(const char *filename) { - struct elf_shdr *sec; + int fd; + struct external_scnhdr *sec, *text_sec, *data_sec; int i; + struct external_syment *ext_sym; + struct external_reloc *coff_relocs; + struct external_reloc *ext_rel; + uint32_t *n_strtab; + EXE_SYM *sym; + EXE_RELOC *rel; + + fd = open(filename, O_RDONLY +#ifdef _WIN32 + | O_BINARY +#endif + ); + if (fd < 0) + error("can't open file '%s'", filename); + + /* Read COFF header. */ + if (read(fd, &fhdr, sizeof (fhdr)) != sizeof (fhdr)) + error("unable to read file header"); - for(i = 0; i < ehdr.e_shnum; i++) { + /* Check COFF identification. */ + if (fhdr.f_magic != I386MAGIC) { + error("bad COFF header"); + } + do_swap = 0; + + /* read section headers */ + shdr = load_data(fd, sizeof(struct external_filehdr) + fhdr.f_opthdr, fhdr.f_nscns * sizeof(struct external_scnhdr)); + + /* read all section data */ + sdata = malloc(sizeof(void *) * fhdr.f_nscns); + memset(sdata, 0, sizeof(void *) * fhdr.f_nscns); + + const char *p; + for(i = 0;i < fhdr.f_nscns; i++) { sec = &shdr[i]; - if (sec->sh_type == SHT_RELOC && sec->sh_info == sh_index) - return i; + if (!strstart(sec->s_name, ".bss", &p)) + sdata[i] = load_data(fd, sec->s_scnptr, sec->s_size); } - return 0; -} -void *load_data(int fd, long offset, unsigned int size) -{ - char *data; - data = malloc(size); - if (!data) - return NULL; - lseek(fd, offset, SEEK_SET); - if (read(fd, data, size) != size) { - free(data); - return NULL; + /* text section */ + text_sec = find_coff_section(shdr, fhdr.f_nscns, ".text"); + if (!text_sec) + error("could not find .text section"); + coff_text_shndx = text_sec - shdr; + text = sdata[coff_text_shndx]; + + /* data section */ + data_sec = find_coff_section(shdr, fhdr.f_nscns, ".data"); + if (!data_sec) + error("could not find .data section"); + coff_data_shndx = data_sec - shdr; + + coff_symtab = load_data(fd, fhdr.f_symptr, fhdr.f_nsyms*SYMESZ); + for (i = 0, ext_sym = coff_symtab; i < nb_syms; i++, ext_sym++) { + for(i=0;i<8;i++) + printf(" %02x", ((uint8_t *)ext_sym->e.e_name)[i]); + printf("\n"); } - return data; -} -int strstart(const char *str, const char *val, const char **ptr) -{ - const char *p, *q; - p = str; - q = val; - while (*q != '\0') { - if (*p != *q) - return 0; - p++; - q++; + + n_strtab = load_data(fd, (fhdr.f_symptr + fhdr.f_nsyms*SYMESZ), STRTAB_SIZE); + strtab = load_data(fd, (fhdr.f_symptr + fhdr.f_nsyms*SYMESZ), *n_strtab); + + nb_syms = fhdr.f_nsyms; + + for (i = 0, ext_sym = coff_symtab; i < nb_syms; i++, ext_sym++) { + if (strstart(ext_sym->e.e_name, ".text", NULL)) + text_shndx = ext_sym->e_scnum; + if (strstart(ext_sym->e.e_name, ".data", NULL)) + data_shndx = ext_sym->e_scnum; } - if (ptr) - *ptr = p; - return 1; + + /* set coff symbol */ + symtab = malloc(sizeof(struct coff_sym) * nb_syms); + + int aux_size, j; + for (i = 0, ext_sym = coff_symtab, sym = symtab; i < nb_syms; i++, ext_sym++, sym++) { + memset(sym, 0, sizeof(*sym)); + sym->st_syment = ext_sym; + sym_ent_name(ext_sym, sym); + sym->st_value = ext_sym->e_value; + + aux_size = *(int8_t *)ext_sym->e_numaux; + if (ext_sym->e_scnum == text_shndx && ext_sym->e_type == T_FUNCTION) { + for (j = aux_size + 1; j < nb_syms - i; j++) { + if ((ext_sym + j)->e_scnum == text_shndx && + (ext_sym + j)->e_type == T_FUNCTION ){ + sym->st_size = (ext_sym + j)->e_value - ext_sym->e_value; + break; + } else if (j == nb_syms - i - 1) { + sec = &shdr[coff_text_shndx]; + sym->st_size = sec->s_size - ext_sym->e_value; + break; + } + } + } else if (ext_sym->e_scnum == data_shndx && *(uint8_t *)ext_sym->e_sclass == C_EXTERNAL) { + for (j = aux_size + 1; j < nb_syms - i; j++) { + if ((ext_sym + j)->e_scnum == data_shndx) { + sym->st_size = (ext_sym + j)->e_value - ext_sym->e_value; + break; + } else if (j == nb_syms - i - 1) { + sec = &shdr[coff_data_shndx]; + sym->st_size = sec->s_size - ext_sym->e_value; + break; + } + } + } else { + sym->st_size = 0; + } + + sym->st_type = ext_sym->e_type; + sym->st_shndx = ext_sym->e_scnum; + } + + + /* find text relocations, if any */ + sec = &shdr[coff_text_shndx]; + coff_relocs = load_data(fd, sec->s_relptr, sec->s_nreloc*RELSZ); + nb_relocs = sec->s_nreloc; + + /* set coff relocation */ + relocs = malloc(sizeof(struct coff_rel) * nb_relocs); + for (i = 0, ext_rel = coff_relocs, rel = relocs; i < nb_relocs; + i++, ext_rel++, rel++) { + memset(rel, 0, sizeof(*rel)); + rel->r_reloc = ext_rel; + rel->r_offset = *(uint32_t *)ext_rel->r_vaddr; + rel->r_type = *(uint16_t *)ext_rel->r_type; + } + return 0; } +#endif /* CONFIG_FORMAT_COFF */ + #ifdef HOST_ARM int arm_emit_ldr_info(const char *name, unsigned long start_offset, @@ -385,7 +813,7 @@ int arm_emit_ldr_info(const char *name, unsigned long start_offset, relname[0] = '\0'; for(i = 0, rel = relocs;i < nb_relocs; i++, rel++) { if (rel->r_offset == (pc_offset + start_offset)) { - sym_name = strtab + symtab[ELFW(R_SYM)(rel->r_info)].st_name; + sym_name = get_rel_sym_name(rel); /* the compiler leave some unnecessary references to the code */ if (strstart(sym_name, "__op_param", &p)) { snprintf(relname, sizeof(relname), "param%s", p); @@ -432,8 +860,7 @@ int arm_emit_ldr_info(const char *name, unsigned long start_offset, /* generate op code */ void gen_code(const char *name, host_ulong offset, host_ulong size, - FILE *outfile, uint8_t *text, ELF_RELOC *relocs, int nb_relocs, - int gen_switch) + FILE *outfile, int gen_switch) { int copy_size = 0; uint8_t *p_start, *p_end; @@ -441,7 +868,7 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, int nb_args, i, n; uint8_t args_present[MAX_ARGS]; const char *sym_name, *p; - ELF_RELOC *rel; + EXE_RELOC *rel; /* Compute exact size excluding prologue and epilogue instructions. * Increment start_offset to skip epilogue instructions, then compute @@ -451,136 +878,141 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, p_start = text + offset; p_end = p_start + size; start_offset = offset; - switch(ELF_ARCH) { - case EM_386: - case EM_X86_64: - { - int len; - len = p_end - p_start; - if (len == 0) - error("empty code for %s", name); - if (p_end[-1] == 0xc3) { - len--; - } else { +#if defined(HOST_I386) || defined(HOST_AMD64) +#ifdef CONFIG_FORMAT_COFF + { + uint8_t *p; + p = p_end - 1; + if (p == p_start) + error("empty code for %s", name); + while (*p != 0xc3) { + p--; + if (p <= p_start) error("ret or jmp expected at the end of %s", name); - } - copy_size = len; } - break; - case EM_PPC: - { - uint8_t *p; - p = (void *)(p_end - 4); - if (p == p_start) - error("empty code for %s", name); - if (get32((uint32_t *)p) != 0x4e800020) - error("blr expected at the end of %s", name); - copy_size = p - p_start; + copy_size = p - p_start; + } +#else + { + int len; + len = p_end - p_start; + if (len == 0) + error("empty code for %s", name); + if (p_end[-1] == 0xc3) { + len--; + } else { + error("ret or jmp expected at the end of %s", name); } - break; - case EM_S390: - { - uint8_t *p; - p = (void *)(p_end - 2); - if (p == p_start) - error("empty code for %s", name); - if (get16((uint16_t *)p) != 0x07fe && get16((uint16_t *)p) != 0x07f4) - error("br %%r14 expected at the end of %s", name); - copy_size = p - p_start; - } - break; - case EM_ALPHA: - { - uint8_t *p; - p = p_end - 4; + copy_size = len; + } +#endif +#elif defined(HOST_PPC) + { + uint8_t *p; + p = (void *)(p_end - 4); + if (p == p_start) + error("empty code for %s", name); + if (get32((uint32_t *)p) != 0x4e800020) + error("blr expected at the end of %s", name); + copy_size = p - p_start; + } +#elif defined(HOST_S390) + { + uint8_t *p; + p = (void *)(p_end - 2); + if (p == p_start) + error("empty code for %s", name); + if (get16((uint16_t *)p) != 0x07fe && get16((uint16_t *)p) != 0x07f4) + error("br %%r14 expected at the end of %s", name); + copy_size = p - p_start; + } +#elif defined(HOST_ALPHA) + { + uint8_t *p; + p = p_end - 4; #if 0 - /* XXX: check why it occurs */ - if (p == p_start) - error("empty code for %s", name); + /* XXX: check why it occurs */ + if (p == p_start) + error("empty code for %s", name); #endif - if (get32((uint32_t *)p) != 0x6bfa8001) - error("ret expected at the end of %s", name); - copy_size = p - p_start; - } - break; - case EM_IA_64: - { - uint8_t *p; - p = (void *)(p_end - 4); - if (p == p_start) - error("empty code for %s", name); - /* br.ret.sptk.many b0;; */ - /* 08 00 84 00 */ - if (get32((uint32_t *)p) != 0x00840008) - error("br.ret.sptk.many b0;; expected at the end of %s", name); - copy_size = p - p_start; - } - break; - case EM_SPARC: - case EM_SPARC32PLUS: - { - uint32_t start_insn, end_insn1, end_insn2; - uint8_t *p; - p = (void *)(p_end - 8); - if (p <= p_start) - error("empty code for %s", name); - start_insn = get32((uint32_t *)(p_start + 0x0)); - end_insn1 = get32((uint32_t *)(p + 0x0)); - end_insn2 = get32((uint32_t *)(p + 0x4)); - if ((start_insn & ~0x1fff) == 0x9de3a000) { - p_start += 0x4; - start_offset += 0x4; - if ((int)(start_insn | ~0x1fff) < -128) - error("Found bogus save at the start of %s", name); - if (end_insn1 != 0x81c7e008 || end_insn2 != 0x81e80000) - error("ret; restore; not found at end of %s", name); - } else { - error("No save at the beginning of %s", name); - } + if (get32((uint32_t *)p) != 0x6bfa8001) + error("ret expected at the end of %s", name); + copy_size = p - p_start; + } +#elif defined(HOST_IA64) + { + uint8_t *p; + p = (void *)(p_end - 4); + if (p == p_start) + error("empty code for %s", name); + /* br.ret.sptk.many b0;; */ + /* 08 00 84 00 */ + if (get32((uint32_t *)p) != 0x00840008) + error("br.ret.sptk.many b0;; expected at the end of %s", name); + copy_size = p - p_start; + } +#elif defined(HOST_SPARC) + { + uint32_t start_insn, end_insn1, end_insn2; + uint8_t *p; + p = (void *)(p_end - 8); + if (p <= p_start) + error("empty code for %s", name); + start_insn = get32((uint32_t *)(p_start + 0x0)); + end_insn1 = get32((uint32_t *)(p + 0x0)); + end_insn2 = get32((uint32_t *)(p + 0x4)); + if ((start_insn & ~0x1fff) == 0x9de3a000) { + p_start += 0x4; + start_offset += 0x4; + if ((int)(start_insn | ~0x1fff) < -128) + error("Found bogus save at the start of %s", name); + if (end_insn1 != 0x81c7e008 || end_insn2 != 0x81e80000) + error("ret; restore; not found at end of %s", name); + } else { + error("No save at the beginning of %s", name); + } #if 0 - /* Skip a preceeding nop, if present. */ - if (p > p_start) { - skip_insn = get32((uint32_t *)(p - 0x4)); - if (skip_insn == 0x01000000) - p -= 4; - } + /* Skip a preceeding nop, if present. */ + if (p > p_start) { + skip_insn = get32((uint32_t *)(p - 0x4)); + if (skip_insn == 0x01000000) + p -= 4; + } #endif - copy_size = p - p_start; - } - break; - case EM_SPARCV9: - { - uint32_t start_insn, end_insn1, end_insn2, skip_insn; - uint8_t *p; - p = (void *)(p_end - 8); - if (p <= p_start) - error("empty code for %s", name); - start_insn = get32((uint32_t *)(p_start + 0x0)); - end_insn1 = get32((uint32_t *)(p + 0x0)); - end_insn2 = get32((uint32_t *)(p + 0x4)); - if ((start_insn & ~0x1fff) == 0x9de3a000) { - p_start += 0x4; - start_offset += 0x4; - if ((int)(start_insn | ~0x1fff) < -256) - error("Found bogus save at the start of %s", name); - if (end_insn1 != 0x81c7e008 || end_insn2 != 0x81e80000) - error("ret; restore; not found at end of %s", name); - } else { - error("No save at the beginning of %s", name); - } - - /* Skip a preceeding nop, if present. */ - if (p > p_start) { - skip_insn = get32((uint32_t *)(p - 0x4)); - if (skip_insn == 0x01000000) - p -= 4; - } - - copy_size = p - p_start; - } - break; -#ifdef HOST_ARM - case EM_ARM: + copy_size = p - p_start; + } +#elif defined(HOST_SPARC64) + { + uint32_t start_insn, end_insn1, end_insn2, skip_insn; + uint8_t *p; + p = (void *)(p_end - 8); + if (p <= p_start) + error("empty code for %s", name); + start_insn = get32((uint32_t *)(p_start + 0x0)); + end_insn1 = get32((uint32_t *)(p + 0x0)); + end_insn2 = get32((uint32_t *)(p + 0x4)); + if ((start_insn & ~0x1fff) == 0x9de3a000) { + p_start += 0x4; + start_offset += 0x4; + if ((int)(start_insn | ~0x1fff) < -256) + error("Found bogus save at the start of %s", name); + if (end_insn1 != 0x81c7e008 || end_insn2 != 0x81e80000) + error("ret; restore; not found at end of %s", name); + } else { + error("No save at the beginning of %s", name); + } + + /* Skip a preceeding nop, if present. */ + if (p > p_start) { + skip_insn = get32((uint32_t *)(p - 0x4)); + if (skip_insn == 0x01000000) + p -= 4; + } + + copy_size = p - p_start; + } +#elif defined(HOST_ARM) + { if ((p_end - p_start) <= 16) error("%s: function too small", name); if (get32((uint32_t *)p_start) != 0xe1a0c00d || @@ -591,26 +1023,24 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, start_offset += 12; copy_size = arm_emit_ldr_info(name, start_offset, NULL, p_start, p_end, relocs, nb_relocs); - break; -#endif - case EM_68K: - { - uint8_t *p; - p = (void *)(p_end - 2); - if (p == p_start) - error("empty code for %s", name); - // remove NOP's, probably added for alignment - while ((get16((uint16_t *)p) == 0x4e71) && - (p>p_start)) - p -= 2; - if (get16((uint16_t *)p) != 0x4e75) - error("rts expected at the end of %s", name); - copy_size = p - p_start; - } - break; - default: - error("unknown ELF architecture"); } +#elif defined(HOST_M68K) + { + uint8_t *p; + p = (void *)(p_end - 2); + if (p == p_start) + error("empty code for %s", name); + // remove NOP's, probably added for alignment + while ((get16((uint16_t *)p) == 0x4e71) && + (p>p_start)) + p -= 2; + if (get16((uint16_t *)p) != 0x4e75) + error("rts expected at the end of %s", name); + copy_size = p - p_start; + } +#else +#error unsupported CPU +#endif /* compute the number of arguments by looking at the relocations */ for(i = 0;i < MAX_ARGS; i++) @@ -619,7 +1049,7 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, for(i = 0, rel = relocs;i < nb_relocs; i++, rel++) { if (rel->r_offset >= start_offset && rel->r_offset < start_offset + (p_end - p_start)) { - sym_name = strtab + symtab[ELFW(R_SYM)(rel->r_info)].st_name; + sym_name = get_rel_sym_name(rel); if (strstart(sym_name, "__op_param", &p)) { n = strtoul(p, NULL, 10); if (n > MAX_ARGS) @@ -657,7 +1087,7 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, for(i = 0, rel = relocs;i < nb_relocs; i++, rel++) { if (rel->r_offset >= start_offset && rel->r_offset < start_offset + (p_end - p_start)) { - sym_name = strtab + symtab[ELFW(R_SYM)(rel->r_info)].st_name; + sym_name = get_rel_sym_name(rel); if (*sym_name && !strstart(sym_name, "__op_param", NULL) && !strstart(sym_name, "__op_jmp", NULL)) { @@ -678,20 +1108,30 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, /* emit code offset information */ { - ElfW(Sym) *sym; + EXE_SYM *sym; const char *sym_name, *p; unsigned long val; int n; for(i = 0, sym = symtab; i < nb_syms; i++, sym++) { - sym_name = strtab + sym->st_name; + sym_name = get_sym_name(sym); if (strstart(sym_name, "__op_label", &p)) { uint8_t *ptr; unsigned long offset; /* test if the variable refers to a label inside the code we are generating */ +#ifdef CONFIG_FORMAT_COFF + if (sym->st_shndx == text_shndx) { + ptr = sdata[coff_text_shndx]; + } else if (sym->st_shndx == data_shndx) { + ptr = sdata[coff_data_shndx]; + } else { + ptr = NULL; + } +#else ptr = sdata[sym->st_shndx]; +#endif if (!ptr) error("__op_labelN in invalid section"); offset = sym->st_value; @@ -739,7 +1179,7 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, for(i = 0, rel = relocs;i < nb_relocs; i++, rel++) { if (rel->r_offset >= start_offset && rel->r_offset < start_offset + copy_size) { - sym_name = strtab + symtab[ELFW(R_SYM)(rel->r_info)].st_name; + sym_name = get_rel_sym_name(rel); if (strstart(sym_name, "__op_jmp", &p)) { int n; n = strtol(p, NULL, 10); @@ -757,8 +1197,9 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, } else { snprintf(name, sizeof(name), "(long)(&%s)", sym_name); } - type = ELF32_R_TYPE(rel->r_info); addend = get32((uint32_t *)(text + rel->r_offset)); +#ifdef CONFIG_FORMAT_ELF + type = ELF32_R_TYPE(rel->r_info); switch(type) { case R_386_32: fprintf(outfile, " *(uint32_t *)(gen_code_ptr + %d) = %s + %d;\n", @@ -771,6 +1212,23 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, default: error("unsupported i386 relocation (%d)", type); } +#elif defined(CONFIG_FORMAT_COFF) + type = rel->r_type; + switch(type) { + case DIR32: + fprintf(outfile, " *(uint32_t *)(gen_code_ptr + %d) = %s + %d;\n", + rel->r_offset - start_offset, name, addend); + break; + case DISP32: + fprintf(outfile, " *(uint32_t *)(gen_code_ptr + %d) = %s - (long)(gen_code_ptr + %d) + %d -4;\n", + rel->r_offset - start_offset, name, rel->r_offset - start_offset, addend); + break; + default: + error("unsupported i386 relocation (%d)", type); + } +#else +#error unsupport object format +#endif } } } @@ -1204,114 +1662,10 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, } } -/* load an elf object file */ -int load_elf(const char *filename, FILE *outfile, int out_type) +int gen_file(FILE *outfile, int out_type) { - int fd; - struct elf_shdr *sec, *symtab_sec, *strtab_sec, *text_sec; - int i, j; - ElfW(Sym) *sym; - char *shstr; - uint8_t *text; - ELF_RELOC *relocs; - int nb_relocs; - ELF_RELOC *rel; - - fd = open(filename, O_RDONLY); - if (fd < 0) - error("can't open file '%s'", filename); - - /* Read ELF header. */ - if (read(fd, &ehdr, sizeof (ehdr)) != sizeof (ehdr)) - error("unable to read file header"); - - /* Check ELF identification. */ - if (ehdr.e_ident[EI_MAG0] != ELFMAG0 - || ehdr.e_ident[EI_MAG1] != ELFMAG1 - || ehdr.e_ident[EI_MAG2] != ELFMAG2 - || ehdr.e_ident[EI_MAG3] != ELFMAG3 - || ehdr.e_ident[EI_VERSION] != EV_CURRENT) { - error("bad ELF header"); - } - - do_swap = elf_must_swap(&ehdr); - if (do_swap) - elf_swap_ehdr(&ehdr); - if (ehdr.e_ident[EI_CLASS] != ELF_CLASS) - error("Unsupported ELF class"); - if (ehdr.e_type != ET_REL) - error("ELF object file expected"); - if (ehdr.e_version != EV_CURRENT) - error("Invalid ELF version"); - if (!elf_check_arch(ehdr.e_machine)) - error("Unsupported CPU (e_machine=%d)", ehdr.e_machine); - - /* read section headers */ - shdr = load_data(fd, ehdr.e_shoff, ehdr.e_shnum * sizeof(struct elf_shdr)); - if (do_swap) { - for(i = 0; i < ehdr.e_shnum; i++) { - elf_swap_shdr(&shdr[i]); - } - } - - /* read all section data */ - sdata = malloc(sizeof(void *) * ehdr.e_shnum); - memset(sdata, 0, sizeof(void *) * ehdr.e_shnum); - - for(i = 0;i < ehdr.e_shnum; i++) { - sec = &shdr[i]; - if (sec->sh_type != SHT_NOBITS) - sdata[i] = load_data(fd, sec->sh_offset, sec->sh_size); - } - - sec = &shdr[ehdr.e_shstrndx]; - shstr = sdata[ehdr.e_shstrndx]; - - /* swap relocations */ - for(i = 0; i < ehdr.e_shnum; i++) { - sec = &shdr[i]; - if (sec->sh_type == SHT_RELOC) { - nb_relocs = sec->sh_size / sec->sh_entsize; - if (do_swap) { - for(j = 0, rel = (ELF_RELOC *)sdata[i]; j < nb_relocs; j++, rel++) - elf_swap_rel(rel); - } - } - } - /* text section */ - - text_sec = find_elf_section(shdr, ehdr.e_shnum, shstr, ".text"); - if (!text_sec) - error("could not find .text section"); - text_shndx = text_sec - shdr; - text = sdata[text_shndx]; - - /* find text relocations, if any */ - relocs = NULL; - nb_relocs = 0; - i = find_reloc(text_shndx); - if (i != 0) { - relocs = (ELF_RELOC *)sdata[i]; - nb_relocs = shdr[i].sh_size / shdr[i].sh_entsize; - } - - symtab_sec = find_elf_section(shdr, ehdr.e_shnum, shstr, ".symtab"); - if (!symtab_sec) - error("could not find .symtab section"); - strtab_sec = &shdr[symtab_sec->sh_link]; - - symtab = (ElfW(Sym) *)sdata[symtab_sec - shdr]; - strtab = sdata[symtab_sec->sh_link]; - - nb_syms = symtab_sec->sh_size / sizeof(ElfW(Sym)); - if (do_swap) { - for(i = 0, sym = symtab; i < nb_syms; i++, sym++) { - swab32s(&sym->st_name); - swabls(&sym->st_value); - swabls(&sym->st_size); - swab16s(&sym->st_shndx); - } - } + int i; + EXE_SYM *sym; if (out_type == OUT_INDEX_OP) { fprintf(outfile, "DEF(end, 0, 0)\n"); @@ -1321,10 +1675,9 @@ int load_elf(const char *filename, FILE *outfile, int out_type) fprintf(outfile, "DEF(nop3, 3, 0)\n"); for(i = 0, sym = symtab; i < nb_syms; i++, sym++) { const char *name, *p; - name = strtab + sym->st_name; + name = get_sym_name(sym); if (strstart(name, OP_PREFIX, &p)) { - gen_code(name, sym->st_value, sym->st_size, outfile, - text, relocs, nb_relocs, 2); + gen_code(name, sym->st_value, sym->st_size, outfile, 2); } } } else if (out_type == OUT_GEN_OP) { @@ -1332,12 +1685,11 @@ int load_elf(const char *filename, FILE *outfile, int out_type) for(i = 0, sym = symtab; i < nb_syms; i++, sym++) { const char *name; - name = strtab + sym->st_name; + name = get_sym_name(sym); if (strstart(name, OP_PREFIX, NULL)) { - if (sym->st_shndx != (text_sec - shdr)) + if (sym->st_shndx != text_shndx) error("invalid section for opcode (0x%x)", sym->st_shndx); - gen_code(name, sym->st_value, sym->st_size, outfile, - text, relocs, nb_relocs, 0); + gen_code(name, sym->st_value, sym->st_size, outfile, 0); } } @@ -1374,16 +1726,15 @@ fprintf(outfile, for(i = 0, sym = symtab; i < nb_syms; i++, sym++) { const char *name; - name = strtab + sym->st_name; + name = get_sym_name(sym); if (strstart(name, OP_PREFIX, NULL)) { #if 0 printf("%4d: %s pos=0x%08x len=%d\n", i, name, sym->st_value, sym->st_size); #endif - if (sym->st_shndx != (text_sec - shdr)) + if (sym->st_shndx != text_shndx) error("invalid section for opcode (0x%x)", sym->st_shndx); - gen_code(name, sym->st_value, sym->st_size, outfile, - text, relocs, nb_relocs, 1); + gen_code(name, sym->st_value, sym->st_size, outfile, 1); } } @@ -1432,7 +1783,6 @@ fprintf(outfile, "gen_code_ptr = arm_flush_ldr(gen_code_ptr, arm_ldr_table, arm_ } - close(fd); return 0; } @@ -1480,7 +1830,9 @@ int main(int argc, char **argv) outfile = fopen(outfilename, "w"); if (!outfile) error("could not open '%s'", outfilename); - load_elf(filename, outfile, out_type); + + load_object(filename); + gen_file(outfile, out_type); fclose(outfile); return 0; } diff --git a/exec-all.h b/exec-all.h index 9ecf2dca7f..bc16be11aa 100644 --- a/exec-all.h +++ b/exec-all.h @@ -141,7 +141,7 @@ int tlb_set_page(CPUState *env, uint32_t vaddr, uint32_t paddr, int prot, #if defined(__powerpc__) #define USE_DIRECT_JUMP #endif -#if defined(__i386__) +#if defined(__i386__) && !defined(_WIN32) #define USE_DIRECT_JUMP #endif @@ -322,13 +322,19 @@ do {\ #elif defined(__i386__) && defined(USE_DIRECT_JUMP) +#ifdef _WIN32 +#define ASM_PREVIOUS_SECTION ".section .text\n" +#else +#define ASM_PREVIOUS_SECTION ".previous\n" +#endif + /* we patch the jump instruction directly */ #define JUMP_TB(opname, tbparam, n, eip)\ do {\ - asm volatile (".section \".data\"\n"\ + asm volatile (".section .data\n"\ "__op_label" #n "." stringify(opname) ":\n"\ ".long 1f\n"\ - ".previous\n"\ + ASM_PREVIOUS_SECTION \ "jmp __op_jmp" #n "\n"\ "1:\n");\ T0 = (long)(tbparam) + (n);\ @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include <stdlib.h> #include <stdio.h> #include <stdarg.h> @@ -24,9 +25,10 @@ #include <errno.h> #include <unistd.h> #include <inttypes.h> +#if !defined(CONFIG_SOFTMMU) #include <sys/mman.h> +#endif -#include "config.h" #include "cpu.h" #include "exec-all.h" @@ -121,7 +123,11 @@ static void page_init(void) { /* NOTE: we can always suppose that host_page_size >= TARGET_PAGE_SIZE */ +#ifdef _WIN32 + real_host_page_size = 4096; +#else real_host_page_size = getpagesize(); +#endif if (host_page_size == 0) host_page_size = real_host_page_size; if (host_page_size < TARGET_PAGE_SIZE) @@ -1369,14 +1375,14 @@ int tlb_set_page(CPUState *env, uint32_t vaddr, uint32_t paddr, int prot, index = (vaddr >> 12) & (CPU_TLB_SIZE - 1); addend -= vaddr; - if (prot & PROT_READ) { + if (prot & PAGE_READ) { env->tlb_read[is_user][index].address = address; env->tlb_read[is_user][index].addend = addend; } else { env->tlb_read[is_user][index].address = -1; env->tlb_read[is_user][index].addend = -1; } - if (prot & PROT_WRITE) { + if (prot & PAGE_WRITE) { if ((pd & ~TARGET_PAGE_MASK) == IO_MEM_ROM) { /* ROM: access is ignored (same as unassigned) */ env->tlb_write[is_user][index].address = vaddr | IO_MEM_ROM; @@ -17,18 +17,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <errno.h> +#include "vl.h" + #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <signal.h> -#include <fcntl.h> - -#include "vl.h" //#define DEBUG_GDB @@ -21,11 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdio.h> -#include <stdlib.h> -#include <inttypes.h> - -#include "cpu.h" #include "vl.h" #define log(...) fprintf (stderr, "dma: " __VA_ARGS__) @@ -21,11 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <inttypes.h> - #include "vl.h" /********************************************************/ diff --git a/hw/i8254.c b/hw/i8254.c index cedaede1ac..20cca0ef83 100644 --- a/hw/i8254.c +++ b/hw/i8254.c @@ -21,26 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> - -#include "cpu.h" #include "vl.h" //#define DEBUG_PIT diff --git a/hw/i8259.c b/hw/i8259.c index 55488c6819..8fabaf765b 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -21,26 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> - -#include "cpu.h" #include "vl.h" /* debug PIC */ @@ -21,31 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> - -#define NO_THUNK_TYPE_SIZE -#include "thunk.h" - -#include "cpu.h" -#include "exec-all.h" - #include "vl.h" /* debug IDE devices */ @@ -375,6 +350,15 @@ static void padstr8(uint8_t *buf, int buf_size, const char *src) } } +static void put_le16(uint16_t *p, unsigned int v) +{ +#ifdef WORDS_BIGENDIAN + *p = bswap16(v); +#else + *p = v; +#endif +} + static void ide_identify(IDEState *s) { uint16_t *p; @@ -382,43 +366,43 @@ static void ide_identify(IDEState *s) memset(s->io_buffer, 0, 512); p = (uint16_t *)s->io_buffer; - stw_raw(p + 0, 0x0040); - stw_raw(p + 1, s->cylinders); - stw_raw(p + 3, s->heads); - stw_raw(p + 4, 512 * s->sectors); /* XXX: retired, remove ? */ - stw_raw(p + 5, 512); /* XXX: retired, remove ? */ - stw_raw(p + 6, s->sectors); + put_le16(p + 0, 0x0040); + put_le16(p + 1, s->cylinders); + put_le16(p + 3, s->heads); + put_le16(p + 4, 512 * s->sectors); /* XXX: retired, remove ? */ + put_le16(p + 5, 512); /* XXX: retired, remove ? */ + put_le16(p + 6, s->sectors); padstr((uint8_t *)(p + 10), "QM00001", 20); /* serial number */ - stw_raw(p + 20, 3); /* XXX: retired, remove ? */ - stw_raw(p + 21, 512); /* cache size in sectors */ - stw_raw(p + 22, 4); /* ecc bytes */ + put_le16(p + 20, 3); /* XXX: retired, remove ? */ + put_le16(p + 21, 512); /* cache size in sectors */ + put_le16(p + 22, 4); /* ecc bytes */ padstr((uint8_t *)(p + 23), QEMU_VERSION, 8); /* firmware version */ padstr((uint8_t *)(p + 27), "QEMU HARDDISK", 40); /* model */ #if MAX_MULT_SECTORS > 1 - stw_raw(p + 47, 0x8000 | MAX_MULT_SECTORS); + put_le16(p + 47, 0x8000 | MAX_MULT_SECTORS); #endif - stw_raw(p + 48, 1); /* dword I/O */ - stw_raw(p + 49, 1 << 9); /* LBA supported, no DMA */ - stw_raw(p + 51, 0x200); /* PIO transfer cycle */ - stw_raw(p + 52, 0x200); /* DMA transfer cycle */ - stw_raw(p + 53, 1); /* words 54-58 are valid */ - stw_raw(p + 54, s->cylinders); - stw_raw(p + 55, s->heads); - stw_raw(p + 56, s->sectors); + put_le16(p + 48, 1); /* dword I/O */ + put_le16(p + 49, 1 << 9); /* LBA supported, no DMA */ + put_le16(p + 51, 0x200); /* PIO transfer cycle */ + put_le16(p + 52, 0x200); /* DMA transfer cycle */ + put_le16(p + 53, 1); /* words 54-58 are valid */ + put_le16(p + 54, s->cylinders); + put_le16(p + 55, s->heads); + put_le16(p + 56, s->sectors); oldsize = s->cylinders * s->heads * s->sectors; - stw_raw(p + 57, oldsize); - stw_raw(p + 58, oldsize >> 16); + put_le16(p + 57, oldsize); + put_le16(p + 58, oldsize >> 16); if (s->mult_sectors) - stw_raw(p + 59, 0x100 | s->mult_sectors); - stw_raw(p + 60, s->nb_sectors); - stw_raw(p + 61, s->nb_sectors >> 16); - stw_raw(p + 80, (1 << 1) | (1 << 2)); - stw_raw(p + 82, (1 << 14)); - stw_raw(p + 83, (1 << 14)); - stw_raw(p + 84, (1 << 14)); - stw_raw(p + 85, (1 << 14)); - stw_raw(p + 86, 0); - stw_raw(p + 87, (1 << 14)); + put_le16(p + 59, 0x100 | s->mult_sectors); + put_le16(p + 60, s->nb_sectors); + put_le16(p + 61, s->nb_sectors >> 16); + put_le16(p + 80, (1 << 1) | (1 << 2)); + put_le16(p + 82, (1 << 14)); + put_le16(p + 83, (1 << 14)); + put_le16(p + 84, (1 << 14)); + put_le16(p + 85, (1 << 14)); + put_le16(p + 86, 0); + put_le16(p + 87, (1 << 14)); } static void ide_atapi_identify(IDEState *s) @@ -428,32 +412,32 @@ static void ide_atapi_identify(IDEState *s) memset(s->io_buffer, 0, 512); p = (uint16_t *)s->io_buffer; /* Removable CDROM, 50us response, 12 byte packets */ - stw_raw(p + 0, (2 << 14) | (5 << 8) | (1 << 7) | (2 << 5) | (0 << 0)); - stw_raw(p + 1, s->cylinders); - stw_raw(p + 3, s->heads); - stw_raw(p + 4, 512 * s->sectors); /* sectors */ - stw_raw(p + 5, 512); /* sector size */ - stw_raw(p + 6, s->sectors); + put_le16(p + 0, (2 << 14) | (5 << 8) | (1 << 7) | (2 << 5) | (0 << 0)); + put_le16(p + 1, s->cylinders); + put_le16(p + 3, s->heads); + put_le16(p + 4, 512 * s->sectors); /* sectors */ + put_le16(p + 5, 512); /* sector size */ + put_le16(p + 6, s->sectors); padstr((uint8_t *)(p + 10), "QM00001", 20); /* serial number */ - stw_raw(p + 20, 3); /* buffer type */ - stw_raw(p + 21, 512); /* cache size in sectors */ - stw_raw(p + 22, 4); /* ecc bytes */ + put_le16(p + 20, 3); /* buffer type */ + put_le16(p + 21, 512); /* cache size in sectors */ + put_le16(p + 22, 4); /* ecc bytes */ padstr((uint8_t *)(p + 23), QEMU_VERSION, 8); /* firmware version */ padstr((uint8_t *)(p + 27), "QEMU CD-ROM", 40); /* model */ - stw_raw(p + 48, 1); /* dword I/O (XXX: should not be set on CDROM) */ - stw_raw(p + 49, 1 << 9); /* LBA supported, no DMA */ - stw_raw(p + 53, 3); /* words 64-70, 54-58 valid */ - stw_raw(p + 63, 0x103); /* DMA modes XXX: may be incorrect */ - stw_raw(p + 64, 1); /* PIO modes */ - stw_raw(p + 65, 0xb4); /* minimum DMA multiword tx cycle time */ - stw_raw(p + 66, 0xb4); /* recommended DMA multiword tx cycle time */ - stw_raw(p + 67, 0x12c); /* minimum PIO cycle time without flow control */ - stw_raw(p + 68, 0xb4); /* minimum PIO cycle time with IORDY flow control */ + put_le16(p + 48, 1); /* dword I/O (XXX: should not be set on CDROM) */ + put_le16(p + 49, 1 << 9); /* LBA supported, no DMA */ + put_le16(p + 53, 3); /* words 64-70, 54-58 valid */ + put_le16(p + 63, 0x103); /* DMA modes XXX: may be incorrect */ + put_le16(p + 64, 1); /* PIO modes */ + put_le16(p + 65, 0xb4); /* minimum DMA multiword tx cycle time */ + put_le16(p + 66, 0xb4); /* recommended DMA multiword tx cycle time */ + put_le16(p + 67, 0x12c); /* minimum PIO cycle time without flow control */ + put_le16(p + 68, 0xb4); /* minimum PIO cycle time with IORDY flow control */ - stw_raw(p + 71, 30); /* in ns */ - stw_raw(p + 72, 30); /* in ns */ + put_le16(p + 71, 30); /* in ns */ + put_le16(p + 72, 30); /* in ns */ - stw_raw(p + 80, 0x1e); /* support up to ATA/ATAPI-4 */ + put_le16(p + 80, 0x1e); /* support up to ATA/ATAPI-4 */ } static void ide_set_signature(IDEState *s) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 4505fc9586..d5746835a1 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -21,26 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> - -#include "cpu.h" #include "vl.h" //#define DEBUG_CMOS diff --git a/hw/ne2000.c b/hw/ne2000.c index bf76829ed1..63edf03526 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -21,26 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> - -#include "cpu.h" #include "vl.h" /* debug NE2000 card */ @@ -21,26 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> - -#include "cpu.h" #include "vl.h" /* output Bochs bios info messages */ @@ -393,9 +373,13 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device, bs_table[2 * i], bs_table[2 * i + 1]); } kbd_init(); - AUD_init(); DMA_init(); + +#ifndef _WIN32 + /* no audio supported yet for win32 */ + AUD_init(); SB16_init(); +#endif floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table); diff --git a/hw/pckbd.c b/hw/pckbd.c index 21524c8f44..f9f6333315 100644 --- a/hw/pckbd.c +++ b/hw/pckbd.c @@ -21,26 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> - -#include "cpu.h" #include "vl.h" /* debug PC keyboard */ @@ -21,11 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdio.h> -#include <stdlib.h> -#include <inttypes.h> - -#include "cpu.h" #include "vl.h" #define MIN(a, b) ((a)>(b)?(b):(a)) diff --git a/hw/serial.c b/hw/serial.c index e9bfd2a00b..c409659562 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -21,26 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> - -#include "cpu.h" #include "vl.h" //#define DEBUG_SERIAL @@ -21,28 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> - -#include "cpu.h" -#include "exec-all.h" - #include "vl.h" //#define DEBUG_VGA @@ -21,25 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <ctype.h> - -#include "cpu.h" #include "vl.h" //#define DEBUG @@ -311,6 +292,7 @@ static void do_cont(int argc, const char **argv) vm_start(); } +#ifdef CONFIG_GDBSTUB static void do_gdbserver(int argc, const char **argv) { int port; @@ -324,6 +306,7 @@ static void do_gdbserver(int argc, const char **argv) qemu_printf("Waiting gdb connection on port %d\n", port); } } +#endif static term_cmd_t term_cmds[] = { { "help|?", do_help, @@ -348,7 +331,9 @@ static term_cmd_t term_cmds[] = { "filename", "restore the whole virtual machine state from 'filename'" }, { "stop", do_stop, "", "stop emulation", }, { "c|cont", do_cont, "", "resume emulation", }, +#ifdef CONFIG_GDBSTUB { "gdbserver", do_gdbserver, "[port]", "start gdbserver session (default port=1234)", }, +#endif { NULL, NULL, }, }; @@ -25,8 +25,6 @@ #include <stdio.h> #include <stdarg.h> #include <string.h> -#include <sys/mman.h> -#include <sys/ipc.h> #include <errno.h> #include <unistd.h> @@ -34,6 +32,9 @@ #if defined(__i386__) && !defined(CONFIG_SOFTMMU) && !defined(CONFIG_USER_ONLY) +#include <sys/mman.h> +#include <sys/ipc.h> + /* When not using soft mmu, libc independant functions are needed for the CPU core because it needs to use alternates stacks and libc/thread incompatibles settings */ @@ -21,6 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "vl.h" + +#ifndef _WIN32 #include <fcntl.h> #include <errno.h> #include <stdio.h> @@ -33,7 +36,6 @@ #include <sys/ioctl.h> #include <sys/soundcard.h> -#include "vl.h" /* http://www.df.lth.se/~john_e/gems/gem002d.html */ /* http://www.multi-platforms.com/Tips/PopCount.htm */ @@ -510,3 +512,43 @@ void AUD_init (void) conf_fragsize = lsbindex (fsp); } + +#else + +void AUD_run (void) +{ +} + +int AUD_write (void *in_buf, int size) +{ + return 0; +} + +void AUD_reset (int rfreq, int rnchannels, audfmt_e rfmt) +{ +} + +void AUD_adjust_estimate (int _leftover) +{ +} + +int AUD_get_free (void) +{ + return 0; +} + +int AUD_get_live (void) +{ + return 0; +} + +int AUD_get_buffer_size (void) +{ + return 0; +} + +void AUD_init (void) +{ +} + +#endif diff --git a/qemu-mkcow.c b/qemu-mkcow.c index 7968bf9726..d8678a29d1 100644 --- a/qemu-mkcow.c +++ b/qemu-mkcow.c @@ -28,16 +28,11 @@ #include <getopt.h> #include <inttypes.h> #include <unistd.h> -#include <sys/mman.h> #include <fcntl.h> #include <signal.h> #include <time.h> #include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> #include <errno.h> -#include <sys/wait.h> #include <sys/stat.h> #include <netinet/in.h> @@ -21,31 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <getopt.h> -#include <inttypes.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <sys/time.h> -#include <malloc.h> -#include <termios.h> -#include <sys/poll.h> -#include <errno.h> -#include <sys/wait.h> -#include <netinet/in.h> +#include "vl.h" #include <SDL.h> -#include "cpu.h" -#include "exec-all.h" - -#include "vl.h" +#ifndef _WIN32 +#include <signal.h> +#endif static SDL_Surface *screen; static int gui_grab; /* if true, all keyboard/mouse events are grabbed */ @@ -291,9 +273,12 @@ void sdl_display_init(DisplayState *ds) fprintf(stderr, "Could not initialize SDL - exiting\n"); exit(1); } + +#ifndef _WIN32 /* NOTE: we still want Ctrl-C to work, so we undo the SDL redirections */ signal(SIGINT, SIG_DFL); signal(SIGQUIT, SIG_DFL); +#endif ds->dpy_update = sdl_update; ds->dpy_resize = sdl_resize; diff --git a/target-i386/helper2.c b/target-i386/helper2.c index c9c9d7e36e..22e812e098 100644 --- a/target-i386/helper2.c +++ b/target-i386/helper2.c @@ -24,7 +24,6 @@ #include <inttypes.h> #include <signal.h> #include <assert.h> -#include <sys/mman.h> #include "cpu.h" #include "exec-all.h" @@ -334,7 +333,7 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, uint32_t addr, if (!(env->cr[0] & CR0_PG_MASK)) { pte = addr; virt_addr = addr & TARGET_PAGE_MASK; - prot = PROT_READ | PROT_WRITE; + prot = PAGE_READ | PAGE_WRITE; page_size = 4096; goto do_mapping; } @@ -409,17 +408,17 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, uint32_t addr, } /* the page can be put in the TLB */ - prot = PROT_READ; + prot = PAGE_READ; if (pte & PG_DIRTY_MASK) { /* only set write access if already dirty... otherwise wait for dirty access */ if (is_user) { if (ptep & PG_RW_MASK) - prot |= PROT_WRITE; + prot |= PAGE_WRITE; } else { if (!(env->cr[0] & CR0_WP_MASK) || (ptep & PG_RW_MASK)) - prot |= PROT_WRITE; + prot |= PAGE_WRITE; } } diff --git a/target-i386/translate-copy.c b/target-i386/translate-copy.c index fb0bcaa3cf..69927915ee 100644 --- a/target-i386/translate-copy.c +++ b/target-i386/translate-copy.c @@ -17,15 +17,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include <stdarg.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <inttypes.h> -#include <signal.h> #include <assert.h> -#include <sys/mman.h> -#include <sys/ucontext.h> #include "cpu.h" #include "exec-all.h" @@ -33,6 +32,10 @@ #ifdef USE_CODE_COPY +#include <signal.h> +#include <sys/mman.h> +#include <sys/ucontext.h> + extern char exec_loop; /* operand size */ diff --git a/target-i386/translate.c b/target-i386/translate.c index 5866fe4095..3ef614652e 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -24,7 +24,6 @@ #include <inttypes.h> #include <signal.h> #include <assert.h> -#include <sys/mman.h> #include "cpu.h" #include "exec-all.h" @@ -21,35 +21,40 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <ctype.h> +#include "vl.h" + #include <getopt.h> -#include <inttypes.h> #include <unistd.h> -#include <sys/mman.h> #include <fcntl.h> #include <signal.h> #include <time.h> -#include <sys/time.h> #include <malloc.h> -#include <termios.h> -#include <sys/poll.h> #include <errno.h> +#include <sys/time.h> + +#ifndef _WIN32 +#include <sys/times.h> #include <sys/wait.h> #include <pty.h> -#include <sys/times.h> - +#include <termios.h> +#include <sys/poll.h> +#include <sys/mman.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <linux/if.h> #include <linux/if_tun.h> +#endif + +#ifdef _WIN32 +#include <sys/timeb.h> +#include <windows.h> +#define getopt_long_only getopt_long +#define memalign(align, size) malloc(size) +#endif + #include "disas.h" -#include "vl.h" #include "exec-all.h" #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" @@ -375,11 +380,17 @@ void cpu_disable_ticks(void) } } -int64_t get_clock(void) +static int64_t get_clock(void) { +#ifdef _WIN32 + struct _timeb tb; + _ftime(&tb); + return ((int64_t)tb.time * 1000 + (int64_t)tb.millitm) * 1000; +#else struct timeval tv; gettimeofday(&tv, NULL); return tv.tv_sec * 1000000LL + tv.tv_usec; +#endif } void cpu_calibrate_ticks(void) @@ -388,7 +399,11 @@ void cpu_calibrate_ticks(void) usec = get_clock(); ticks = cpu_get_real_ticks(); +#ifdef _WIN32 + Sleep(50); +#else usleep(50 * 1000); +#endif usec = get_clock() - usec; ticks = cpu_get_real_ticks() - ticks; ticks_per_sec = (ticks * 1000000LL + (usec >> 1)) / usec; @@ -438,8 +453,10 @@ QEMUClock *rt_clock; QEMUClock *vm_clock; static QEMUTimer *active_timers[2]; +#ifndef _WIN32 /* frequency of the times() clock tick */ static int timer_freq; +#endif QEMUClock *qemu_new_clock(int type) { @@ -550,12 +567,16 @@ int64_t qemu_get_clock(QEMUClock *clock) { switch(clock->type) { case QEMU_TIMER_REALTIME: +#ifdef _WIN32 + return GetTickCount(); +#else /* XXX: portability among Linux hosts */ if (timer_freq == 100) { return times(NULL) * 10; } else { return ((int64_t)times(NULL) * 1000) / timer_freq; } +#endif default: case QEMU_TIMER_VIRTUAL: return cpu_get_ticks(); @@ -608,7 +629,12 @@ static int timer_load(QEMUFile *f, void *opaque, int version_id) return 0; } +#ifdef _WIN32 +void CALLBACK host_alarm_handler(UINT uTimerID, UINT uMsg, + DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2) +#else static void host_alarm_handler(int host_signum) +#endif { if (qemu_timer_expired(active_timers[QEMU_TIMER_VIRTUAL], qemu_get_clock(vm_clock)) || @@ -621,39 +647,66 @@ static void host_alarm_handler(int host_signum) static void init_timers(void) { - struct sigaction act; - struct itimerval itv; - - /* get times() syscall frequency */ - timer_freq = sysconf(_SC_CLK_TCK); - rt_clock = qemu_new_clock(QEMU_TIMER_REALTIME); vm_clock = qemu_new_clock(QEMU_TIMER_VIRTUAL); - /* timer signal */ - sigfillset(&act.sa_mask); - act.sa_flags = 0; +#ifdef _WIN32 + { + int count=0; + MMRESULT timerID = timeSetEvent(10, // interval (ms) + 0, // resolution + host_alarm_handler, // function + (DWORD)&count, // user parameter + TIME_PERIODIC | TIME_CALLBACK_FUNCTION); + if( !timerID ) { + perror("failed timer alarm"); + exit(1); + } + } + pit_min_timer_count = ((uint64_t)10000 * PIT_FREQ) / 1000000; +#else + { + struct sigaction act; + struct itimerval itv; + + /* get times() syscall frequency */ + timer_freq = sysconf(_SC_CLK_TCK); + + /* timer signal */ + sigfillset(&act.sa_mask); + act.sa_flags = 0; #if defined (TARGET_I386) && defined(USE_CODE_COPY) - act.sa_flags |= SA_ONSTACK; + act.sa_flags |= SA_ONSTACK; +#endif + act.sa_handler = host_alarm_handler; + sigaction(SIGALRM, &act, NULL); + + itv.it_interval.tv_sec = 0; + itv.it_interval.tv_usec = 1000; + itv.it_value.tv_sec = 0; + itv.it_value.tv_usec = 10 * 1000; + setitimer(ITIMER_REAL, &itv, NULL); + /* we probe the tick duration of the kernel to inform the user if + the emulated kernel requested a too high timer frequency */ + getitimer(ITIMER_REAL, &itv); + pit_min_timer_count = ((uint64_t)itv.it_interval.tv_usec * PIT_FREQ) / + 1000000; + } #endif - act.sa_handler = host_alarm_handler; - sigaction(SIGALRM, &act, NULL); - - itv.it_interval.tv_sec = 0; - itv.it_interval.tv_usec = 1000; - itv.it_value.tv_sec = 0; - itv.it_value.tv_usec = 10 * 1000; - setitimer(ITIMER_REAL, &itv, NULL); - /* we probe the tick duration of the kernel to inform the user if - the emulated kernel requested a too high timer frequency */ - getitimer(ITIMER_REAL, &itv); - pit_min_timer_count = ((uint64_t)itv.it_interval.tv_usec * PIT_FREQ) / - 1000000; } /***********************************************************/ /* serial device */ +#ifdef _WIN32 + +int serial_open_device(void) +{ + return -1; +} + +#else + int serial_open_device(void) { char slave_name[1024]; @@ -672,9 +725,24 @@ int serial_open_device(void) } } +#endif + /***********************************************************/ /* Linux network device redirector */ +#ifdef _WIN32 + +static int net_init(void) +{ + return 0; +} + +void net_send_packet(NetDriverState *nd, const uint8_t *buf, int size) +{ +} + +#else + static int tun_open(char *ifname, int ifname_size) { struct ifreq ifr; @@ -753,9 +821,23 @@ void net_send_packet(NetDriverState *nd, const uint8_t *buf, int size) write(nd->fd, buf, size); } +#endif + /***********************************************************/ /* dumb display */ +#ifdef _WIN32 + +static void term_exit(void) +{ +} + +static void term_init(void) +{ +} + +#else + /* init terminal so that we can grab keys */ static struct termios oldtty; @@ -790,6 +872,8 @@ static void term_init(void) fcntl(0, F_SETFL, O_NONBLOCK); } +#endif + static void dumb_update(DisplayState *ds, int x, int y, int w, int h) { } @@ -1396,10 +1480,13 @@ void vm_stop(int reason) int main_loop(void) { +#ifndef _WIN32 struct pollfd ufds[MAX_IO_HANDLERS + 1], *pf; - int ret, n, timeout, max_size; - uint8_t buf[4096]; IOHandlerRecord *ioh, *ioh_next; + uint8_t buf[4096]; + int n, max_size; +#endif + int ret, timeout; CPUState *env = global_env; for(;;) { @@ -1422,6 +1509,7 @@ int main_loop(void) timeout = 10; } +#ifndef _WIN32 /* poll any events */ /* XXX: separate device handlers from system ones */ pf = ufds; @@ -1471,6 +1559,7 @@ int main_loop(void) } } } +#endif if (vm_running) { qemu_run_timers(&active_timers[QEMU_TIMER_VIRTUAL], @@ -1592,7 +1681,10 @@ static uint8_t *signal_stack; int main(int argc, char **argv) { - int c, i, use_gdbstub, gdbstub_port, long_index, has_cdrom; +#ifdef CONFIG_GDBSTUB + int use_gdbstub, gdbstub_port; +#endif + int c, i, long_index, has_cdrom; int snapshot, linux_boot; CPUState *env; const char *initrd_filename; @@ -1601,8 +1693,10 @@ int main(int argc, char **argv) DisplayState *ds = &display_state; int cyls, heads, secs; +#if !defined(CONFIG_SOFTMMU) /* we never want that malloc() uses mmap() */ mallopt(M_MMAP_THRESHOLD, 4096 * 1024); +#endif initrd_filename = NULL; for(i = 0; i < MAX_FD; i++) fd_filename[i] = NULL; @@ -1611,8 +1705,10 @@ int main(int argc, char **argv) ram_size = 32 * 1024 * 1024; vga_ram_size = VGA_RAM_SIZE; pstrcpy(network_script, sizeof(network_script), DEFAULT_NETWORK_SCRIPT); +#ifdef CONFIG_GDBSTUB use_gdbstub = 0; gdbstub_port = DEFAULT_GDBSTUB_PORT; +#endif snapshot = 0; nographic = 0; kernel_filename = NULL; @@ -1773,12 +1869,14 @@ int main(int argc, char **argv) case 'n': pstrcpy(network_script, sizeof(network_script), optarg); break; +#ifdef CONFIG_GDBSTUB case 's': use_gdbstub = 1; break; case 'p': gdbstub_port = atoi(optarg); break; +#endif case 'L': bios_dir = optarg; break; @@ -1976,6 +2074,7 @@ int main(int argc, char **argv) } #endif +#ifndef _WIN32 { struct sigaction act; sigfillset(&act.sa_mask); @@ -1983,10 +2082,12 @@ int main(int argc, char **argv) act.sa_handler = SIG_IGN; sigaction(SIGPIPE, &act, NULL); } +#endif gui_timer = qemu_new_timer(rt_clock, gui_update, NULL); qemu_mod_timer(gui_timer, qemu_get_clock(rt_clock)); +#ifdef CONFIG_GDBSTUB if (use_gdbstub) { if (gdbserver_start(gdbstub_port) < 0) { fprintf(stderr, "Could not open gdbserver socket on port %d\n", @@ -1995,7 +2096,9 @@ int main(int argc, char **argv) } else { printf("Waiting gdb connection on port %d\n", gdbstub_port); } - } else { + } else +#endif + { vm_start(); } term_init(); @@ -24,10 +24,79 @@ #ifndef VL_H #define VL_H +/* we put basic includes here to avoid repeating them in device drivers */ +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <string.h> +#include <inttypes.h> #include <time.h> +#include <ctype.h> +#include <errno.h> +#include <unistd.h> +#include <fcntl.h> + +#ifndef O_LARGEFILE +#define O_LARGEFILE 0 +#endif + +#ifdef _WIN32 +#define lseek64 lseek +#endif #include "cpu.h" +#ifndef glue +#define xglue(x, y) x ## y +#define glue(x, y) xglue(x, y) +#define stringify(s) tostring(s) +#define tostring(s) #s +#endif + +#if defined(WORDS_BIGENDIAN) +static inline uint32_t be32_to_cpu(uint32_t v) +{ + return v; +} + +static inline uint16_t be16_to_cpu(uint16_t v) +{ + return v; +} + +static inline uint32_t le32_to_cpu(uint32_t v) +{ + return bswap32(v); +} + +static inline uint16_t le16_to_cpu(uint16_t v) +{ + return bswap16(v); +} + +#else +static inline uint32_t be32_to_cpu(uint32_t v) +{ + return bswap32(v); +} + +static inline uint16_t be16_to_cpu(uint16_t v) +{ + return bswap16(v); +} + +static inline uint32_t le32_to_cpu(uint32_t v) +{ + return v; +} + +static inline uint16_t le16_to_cpu(uint16_t v) +{ + return v; +} +#endif + + /* vl.c */ extern int reset_requested; |