ARM emulation support

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index c1b3d56..12cba29 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,11 @@ CFLAGS=-Wall -O2 -g
 LDFLAGS=-g
 LIBS=
 DEFINES=-DHAVE_BYTESWAP_H
+HELPER_CFLAGS=$(CFLAGS)
+
+ifdef CONFIG_STATIC
+LDFLAGS+=-static
+endif
 
 ifeq ($(ARCH),i386)
 CFLAGS+=-fomit-frame-pointer
@@ -13,11 +18,15 @@ OP_CFLAGS+= -falign-functions=0
 else
 OP_CFLAGS+= -malign-functions=0
 endif
+ifdef TARGET_GPROF
+LDFLAGS+=-Wl,-T,i386.ld
+else
 # WARNING: this LDFLAGS is _very_ tricky : qemu is an ELF shared object
 # that the kernel ELF loader considers as an executable. I think this
 # is the simplest way to make it self virtualizable!
 LDFLAGS+=-Wl,-shared
 endif
+endif
 
 ifeq ($(ARCH),ppc)
 OP_CFLAGS=$(CFLAGS)
@@ -29,12 +38,26 @@ OP_CFLAGS=$(CFLAGS)
 LDFLAGS+=-Wl,-T,s390.ld
 endif
 
+ifeq ($(ARCH),sparc)
+CFLAGS+=-m32 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6
+LDFLAGS+=-m32
+OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0
+HELPER_CFLAGS=$(CFLAGS) -ffixed-i0 -mflat
+LDFLAGS+=-Wl,-T,sparc.ld
+endif
+
+ifeq ($(ARCH),sparc64)
+CFLAGS+=-m64 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6
+LDFLAGS+=-m64
+OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0
+endif
+
 ifeq ($(ARCH),alpha)
 # -msmall-data is not used because we want two-instruction relocations
 # for the constant constructions
 OP_CFLAGS=-Wall -O2 -g
 # Ensure there's only a single GP
-CFLAGS += -msmall-data -msmall-text
+CFLAGS += -msmall-data
 LDFLAGS+=-Wl,-T,alpha.ld
 endif
 
@@ -42,6 +65,11 @@ ifeq ($(ARCH),ia64)
 OP_CFLAGS=$(CFLAGS)
 endif
 
+ifeq ($(ARCH),arm)
+OP_CFLAGS=$(CFLAGS) -mno-sched-prolog
+LDFLAGS+=-Wl,-T,arm.ld
+endif
+
 ifeq ($(GCC_MAJOR),3)
 # very important to generate a return at the end of every operation
 OP_CFLAGS+=-fno-reorder-blocks -fno-optimize-sibling-calls
@@ -62,9 +90,22 @@ OBJS= elfload.o main.o syscall.o mmap.o signal.o vm86.o path.o
 SRCS:= $(OBJS:.o=.c)
 OBJS+= libqemu.a
 
-LIBOBJS+=thunk.o translate-i386.o op-i386.o exec-i386.o exec.o
+LIBOBJS+=thunk.o translate-i386.o op-i386.o helper-i386.o exec-i386.o exec.o
+
 # NOTE: the disassembler code is only needed for debugging
-LIBOBJS+=disas.o ppc-dis.o i386-dis.o alpha-dis.o dis-buf.o
+LIBOBJS+=disas.o i386-dis.o
+ifeq ($(ARCH),alpha)
+LIBOBJS+=alpha-dis.o
+endif
+ifeq ($(ARCH),ppc)
+LIBOBJS+=ppc-dis.o
+endif
+ifeq ($(ARCH),sparc)
+LIBOBJS+=sparc-dis.o
+endif
+ifeq ($(ARCH),arm)
+LIBOBJS+=arm-dis.o
+endif
 
 ifeq ($(ARCH),ia64)
 OBJS += ia64-syscall.o
@@ -92,14 +133,20 @@ libqemu.a: $(LIBOBJS)
 dyngen: dyngen.c
        $(HOST_CC) -O2 -Wall -g $< -o $@
 
-translate-i386.o: translate-i386.c op-i386.h cpu-i386.h
+translate-i386.o: translate-i386.c op-i386.h opc-i386.h cpu-i386.h
 
 op-i386.h: op-i386.o dyngen
        ./dyngen -o $@ $<
 
+opc-i386.h: op-i386.o dyngen
+       ./dyngen -c -o $@ $<
+
 op-i386.o: op-i386.c opreg_template.h ops_template.h
        $(CC) $(OP_CFLAGS) $(DEFINES) -c -o $@ $<
 
+helper-i386.o: helper-i386.c
+       $(CC) $(HELPER_CFLAGS) $(DEFINES) -c -o $@ $<
+
 %.o: %.c
        $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
 
@@ -126,13 +173,13 @@ qemu-doc.html: qemu-doc.texi
 
 FILES= \
 README README.distrib COPYING COPYING.LIB TODO Changelog VERSION \
-dyngen.c ioctls.h ops_template.h op_string.h  syscall_types.h\
+dyngen.c dyngen.h ioctls.h ops_template.h op_string.h  syscall_types.h\
 Makefile     elf.h       thunk.c\
-elfload.c   main.c            signal.c        thunk.h\
-cpu-i386.h qemu.h op-i386.c opc-i386.h syscall-i386.h  translate-i386.c\
-dis-asm.h    gen-i386.h  syscall.c\
-dis-buf.c disas.c disas.h ppc-dis.c i386-dis.c  opreg_template.h  syscall_defs.h\
-ppc.ld s390.ld exec-i386.h exec-i386.c path.c configure \
+elfload.c   main.c            signal.c        thunk.h exec.h\
+cpu-i386.h qemu.h op-i386.c helper-i386.c syscall-i386.h  translate-i386.c\
+syscall.c opreg_template.h  syscall_defs.h vm86.c\
+dis-asm.h disas.c disas.h alpha-dis.c ppc-dis.c i386-dis.c sparc-dis.c arm-dis.c\
+ppc.ld alpha.ld s390.ld sparc.ld arm.ld exec-i386.h exec-i386.c path.c exec.c mmap.c configure \
 tests/Makefile\
 tests/test-i386.c tests/test-i386-shift.h tests/test-i386.h\
 tests/test-i386-muldiv.h tests/test-i386-code16.S\