float fixes - added bsr/bsf support

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 9f71211333f6451740a1c5f365700341ec082931..c0a2915beda7e85311a9667da8309a0f785f2788 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
 ARCH=i386
 #ARCH=ppc
+HOST_CC=gcc
 
 ifeq ($(ARCH),i386)
-CFLAGS=-Wall -O2 -g
+CFLAGS=-Wall -O2 -g -fomit-frame-pointer
 LDFLAGS=-g
 LIBS=
 CC=gcc
 DEFINES=-DHAVE_BYTESWAP_H
+OP_CFLAGS=$(CFLAGS) -malign-functions=0 -mpreferred-stack-boundary=2
 endif
 
 ifeq ($(ARCH),ppc)
@@ -23,42 +25,77 @@ CRTEND=$(GCC_LIBS_DIR)/crtend.o
 LDFLAGS=-static -g -nostdlib $(CRT1) $(CRTI) $(CRTBEGIN) 
 LIBS=-L$(LIBS_DIR) -ltinyc -lgcc $(CRTEND) $(CRTN)
 DEFINES=-Dsocklen_t=int
+OP_CFLAGS=$(CFLAGS)
 endif
 
 #########################################################
 
-DEFINES+=-D_GNU_SOURCE -DGEMU -DDOSEMU #-DNO_TRACE_MSGS
+DEFINES+=-D_GNU_SOURCE
+DEFINES+=-DCONFIG_PREFIX=\"/usr/local\"
 LDSCRIPT=$(ARCH).ld
+LIBS+=-ldl -lm
+VERSION=0.1
 
-OBJS= i386/fp87.o i386/interp_main.o i386/interp_modrm.o i386/interp_16_32.o \
-      i386/interp_32_16.o i386/interp_32_32.o i386/emu-utils.o \
-      i386/dis8086.o i386/emu-ldt.o
-OBJS+= elfload.o main.o thunk.o syscall.o
-
+OBJS= elfload.o main.o thunk.o syscall.o
+OBJS+=translate-i386.o op-i386.o
+# NOTE: the disassembler code is only needed for debugging
+OBJS+=i386-dis.o dis-buf.o
 SRCS = $(OBJS:.o=.c)
 
 all: gemu
 
 gemu: $(OBJS)
-       $(CC) -Wl,-T,$(LDSCRIPT) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+       $(CC) -Wl,-T,$(LDSCRIPT) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 depend: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
+# new i386 emulator
+dyngen: dyngen.c
+       $(HOST_CC) -O2 -Wall -g $< -o $@
+
+translate-i386.o: translate-i386.c op-i386.h cpu-i386.h
+
+op-i386.h: op-i386.o dyngen
+       ./dyngen -o $@ $<
+
+op-i386.o: op-i386.c opreg_template.h ops_template.h
+       $(CC) $(OP_CFLAGS) $(DEFINES) -c -o $@ $<
+
 %.o: %.c
        $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
 
 clean:
-       rm -f *.o *~ i386/*.o i386/*~ gemu hello test1 test2 TAGS
+       rm -f *.o *~ gemu dyngen TAGS
+
+# various test targets
+test speed: gemu
+       make -C tests $@
+
+TAGS: 
+       etags *.[ch] i386/*.[ch]
 
-hello: hello.c
-       $(CC) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $<
+FILES= \
+COPYING.LIB  dyngen.c    ioctls.h          ops_template.h  syscall_types.h\
+Makefile     elf.h       linux_bin.h       segment.h       thunk.c\
+TODO         elfload.c   main.c            signal.c        thunk.h\
+cpu-i386.h   gemu.h      op-i386.c         syscall-i386.h  translate-i386.c\
+dis-asm.h    gen-i386.h  op-i386.h         syscall.c\
+dis-buf.c    i386-dis.c  opreg_template.h  syscall_defs.h\
+i386.ld ppc.ld\
+tests/Makefile\
+tests/test-i386.c tests/test-i386-shift.h tests/test-i386.h\
+tests/test-i386-muldiv.h\
+tests/test2.c tests/hello.c tests/sha1.c tests/test1.c
 
-test1: test1.c
-       $(CC) $(CFLAGS) -static $(LDFLAGS) -o $@ $<
+FILE=gemu-$(VERSION)
 
-test2: test2.c
-       $(CC) $(CFLAGS) -static $(LDFLAGS) -o $@ $<
+tar:
+       rm -rf /tmp/$(FILE)
+       mkdir -p /tmp/$(FILE)
+       cp -P $(FILES) /tmp/$(FILE)
+       ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) )
+       rm -rf /tmp/$(FILE)
 
 ifneq ($(wildcard .depend),)
 include .depend