Commit de83cd02 authored by bellard's avatar bellard
Browse files

arm emulation support


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@246 c046a42c-6fe2-441c-8c8c-71466251a162
parent 6380ab5e
version 0.3: version 0.3:
- initial support for ARM emulation
- added fnsave, frstor, fnstenv, fldenv FPU instructions - added fnsave, frstor, fnstenv, fldenv FPU instructions
- added FPU register save in signal emulation - added FPU register save in signal emulation
- ARM port - ARM port
- Sparc and Alpha ports work on the regression test
- generic ioctl number conversion
- fixed ioctl type conversion
version 0.2: version 0.2:
......
...@@ -86,24 +86,38 @@ LDFLAGS+=-p ...@@ -86,24 +86,38 @@ LDFLAGS+=-p
main.o: CFLAGS+=-p main.o: CFLAGS+=-p
endif endif
OBJS= elfload.o main.o syscall.o mmap.o signal.o vm86.o path.o OBJS= elfload.o main.o syscall.o mmap.o signal.o path.o
ifeq ($(TARGET_ARCH), i386)
OBJS+= vm86.o
endif
SRCS:= $(OBJS:.o=.c) SRCS:= $(OBJS:.o=.c)
OBJS+= libqemu.a OBJS+= libqemu.a
LIBOBJS+=thunk.o translate-i386.o op-i386.o helper-i386.o exec-i386.o exec.o # cpu emulator library
LIBOBJS=thunk.o exec.o translate.o cpu-exec.o
ifeq ($(TARGET_ARCH), i386)
LIBOBJS+=translate-i386.o op-i386.o helper-i386.o
endif
ifeq ($(TARGET_ARCH), arm)
LIBOBJS+=translate-arm.o op-arm.o
endif
# NOTE: the disassembler code is only needed for debugging # NOTE: the disassembler code is only needed for debugging
LIBOBJS+=disas.o i386-dis.o LIBOBJS+=disas.o
ifeq ($(ARCH),alpha) ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386)
LIBOBJS+=i386-dis.o
endif
ifeq ($(findstring alpha, $(TARGET_ARCH) $(ARCH)),alpha)
LIBOBJS+=alpha-dis.o LIBOBJS+=alpha-dis.o
endif endif
ifeq ($(ARCH),ppc) ifeq ($(findstring ppc, $(TARGET_ARCH) $(ARCH)),ppc)
LIBOBJS+=ppc-dis.o LIBOBJS+=ppc-dis.o
endif endif
ifeq ($(ARCH),sparc) ifeq ($(findstring sparc, $(TARGET_ARCH) $(ARCH)),sparc)
LIBOBJS+=sparc-dis.o LIBOBJS+=sparc-dis.o
endif endif
ifeq ($(ARCH),arm) ifeq ($(findstring arm, $(TARGET_ARCH) $(ARCH)),arm)
LIBOBJS+=arm-dis.o LIBOBJS+=arm-dis.o
endif endif
...@@ -133,20 +147,29 @@ libqemu.a: $(LIBOBJS) ...@@ -133,20 +147,29 @@ libqemu.a: $(LIBOBJS)
dyngen: dyngen.c dyngen: dyngen.c
$(HOST_CC) -O2 -Wall -g $< -o $@ $(HOST_CC) -O2 -Wall -g $< -o $@
translate-i386.o: translate-i386.c op-i386.h opc-i386.h cpu-i386.h translate-$(TARGET_ARCH).o: translate-$(TARGET_ARCH).c gen-op-$(TARGET_ARCH).h opc-$(TARGET_ARCH).h cpu-$(TARGET_ARCH).h
translate.o: translate.c op-$(TARGET_ARCH).h opc-$(TARGET_ARCH).h cpu-$(TARGET_ARCH).h
op-i386.h: op-i386.o dyngen op-$(TARGET_ARCH).h: op-$(TARGET_ARCH).o dyngen
./dyngen -o $@ $< ./dyngen -o $@ $<
opc-i386.h: op-i386.o dyngen opc-$(TARGET_ARCH).h: op-$(TARGET_ARCH).o dyngen
./dyngen -c -o $@ $< ./dyngen -c -o $@ $<
op-i386.o: op-i386.c opreg_template.h ops_template.h gen-op-$(TARGET_ARCH).h: op-$(TARGET_ARCH).o dyngen
./dyngen -g -o $@ $<
op-$(TARGET_ARCH).o: op-$(TARGET_ARCH).c
$(CC) $(OP_CFLAGS) $(DEFINES) -c -o $@ $< $(CC) $(OP_CFLAGS) $(DEFINES) -c -o $@ $<
helper-i386.o: helper-i386.c helper-$(TARGET_ARCH).o: helper-$(TARGET_ARCH).c
$(CC) $(HELPER_CFLAGS) $(DEFINES) -c -o $@ $< $(CC) $(HELPER_CFLAGS) $(DEFINES) -c -o $@ $<
op-i386.o: op-i386.c opreg_template.h ops_template.h
op-arm.o: op-arm.c op-arm-template.h
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
...@@ -173,17 +196,24 @@ qemu-doc.html: qemu-doc.texi ...@@ -173,17 +196,24 @@ qemu-doc.html: qemu-doc.texi
FILES= \ FILES= \
README README.distrib COPYING COPYING.LIB TODO Changelog VERSION \ README README.distrib COPYING COPYING.LIB TODO Changelog VERSION \
dyngen.c dyngen.h ioctls.h ops_template.h op_string.h syscall_types.h\ configure \
Makefile elf.h thunk.c\ dyngen.c dyngen.h dyngen-exec.h ioctls.h syscall_types.h \
elfload.c main.c signal.c thunk.h exec.h\ Makefile elf.h elfload.c main.c signal.c qemu.h \
cpu-i386.h qemu.h op-i386.c helper-i386.c syscall-i386.h translate-i386.c\ syscall.c syscall_defs.h vm86.c path.c mmap.c \
syscall.c opreg_template.h syscall_defs.h vm86.c\ ppc.ld alpha.ld s390.ld sparc.ld arm.ld\
dis-asm.h disas.c disas.h alpha-dis.c ppc-dis.c i386-dis.c sparc-dis.c arm-dis.c\ thunk.c cpu-exec.c translate.c cpu-all.h thunk.h exec.h\
ppc.ld alpha.ld s390.ld sparc.ld arm.ld exec-i386.h exec-i386.c path.c exec.c mmap.c configure \ exec.c cpu-exec.c\
tests/Makefile\ cpu-i386.h op-i386.c helper-i386.c syscall-i386.h translate-i386.c \
tests/test-i386.c tests/test-i386-shift.h tests/test-i386.h\ exec-i386.h ops_template.h op_string.h opreg_template.h \
tests/test-i386-muldiv.h tests/test-i386-code16.S\ cpu-arm.h syscall-arm.h exec-arm.h op-arm.c translate-arm.c op-arm-template.h \
tests/hello.c tests/hello tests/sha1.c \ dis-asm.h disas.c disas.h alpha-dis.c ppc-dis.c i386-dis.c sparc-dis.c \
arm-dis.c \
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 tests/test-i386-vm86.S \
tests/hello.c tests/hello \
tests/hello-arm.c tests/hello-arm \
tests/sha1.c \
tests/testsig.c tests/testclone.c tests/testthread.c \ tests/testsig.c tests/testclone.c tests/testthread.c \
tests/runcom.c tests/pi_10.com \ tests/runcom.c tests/pi_10.com \
tests/test_path.c \ tests/test_path.c \
......
0.2 0.3
\ No newline at end of file \ No newline at end of file
...@@ -28,6 +28,7 @@ ar="ar" ...@@ -28,6 +28,7 @@ ar="ar"
make="make" make="make"
strip="strip" strip="strip"
target_cpu="x86" target_cpu="x86"
target_bigendian="default"
cpu=`uname -m` cpu=`uname -m`
case "$cpu" in case "$cpu" in
i386|i486|i586|i686|i86pc|BePC) i386|i486|i586|i686|i86pc|BePC)
...@@ -103,6 +104,12 @@ for opt do ...@@ -103,6 +104,12 @@ for opt do
;; ;;
--cpu=*) cpu=`echo $opt | cut -d '=' -f 2` --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
;; ;;
--target-cpu=*) target_cpu=`echo $opt | cut -d '=' -f 2`
;;
--target-big-endian) target_bigendian="yes"
;;
--target-little-endian) target_bigendian="no"
;;
--enable-gprof) gprof="yes" --enable-gprof) gprof="yes"
;; ;;
--static) static="yes" --static) static="yes"
...@@ -162,6 +169,16 @@ if $cc -o $TMPO $TMPC 2> /dev/null ; then ...@@ -162,6 +169,16 @@ if $cc -o $TMPO $TMPC 2> /dev/null ; then
gcc_major="3" gcc_major="3"
fi fi
if test "$target_bigendian" = "default" ; then
if test "$target_cpu" = "x86" ; then
target_bigendian="no"
elif test "$target_cpu" = "arm" ; then
target_bigendian="no"
else
target_bigendian="no"
fi
fi
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
cat << EOF cat << EOF
...@@ -173,6 +190,7 @@ echo "Standard options:" ...@@ -173,6 +190,7 @@ echo "Standard options:"
echo " --help print this message" echo " --help print this message"
echo " --prefix=PREFIX install in PREFIX [$prefix]" echo " --prefix=PREFIX install in PREFIX [$prefix]"
echo " --interp-prefix=PREFIX where to find shared libraries, etc. [$interp_prefix]" echo " --interp-prefix=PREFIX where to find shared libraries, etc. [$interp_prefix]"
echo " --target_cpu=CPU set target cpu (x86 or arm) [$target_cpu]"
echo "" echo ""
echo "Advanced options (experts only):" echo "Advanced options (experts only):"
echo " --source-path=PATH path of source code [$source_path]" echo " --source-path=PATH path of source code [$source_path]"
...@@ -191,8 +209,9 @@ echo "ELF interp prefix $interp_prefix" ...@@ -191,8 +209,9 @@ echo "ELF interp prefix $interp_prefix"
echo "C compiler $cc" echo "C compiler $cc"
echo "make $make" echo "make $make"
echo "host CPU $cpu" echo "host CPU $cpu"
echo "Big Endian $bigendian" echo "host big endian $bigendian"
echo "target CPU $target_cpu" echo "target CPU $target_cpu"
echo "target big endian $target_bigendian"
echo "gprof enabled $gprof" echo "gprof enabled $gprof"
echo "static build $static" echo "static build $static"
...@@ -246,6 +265,24 @@ if test "$bigendian" = "yes" ; then ...@@ -246,6 +265,24 @@ if test "$bigendian" = "yes" ; then
echo "WORDS_BIGENDIAN=yes" >> config.mak echo "WORDS_BIGENDIAN=yes" >> config.mak
echo "#define WORDS_BIGENDIAN 1" >> $TMPH echo "#define WORDS_BIGENDIAN 1" >> $TMPH
fi fi
if test "$target_cpu" = "x86" ; then
echo "TARGET_ARCH=i386" >> config.mak
echo "#define TARGET_ARCH \"i386\"" >> $TMPH
echo "#define TARGET_I386 1" >> $TMPH
elif test "$target_cpu" = "arm" ; then
echo "TARGET_ARCH=arm" >> config.mak
echo "#define TARGET_ARCH \"arm\"" >> $TMPH
echo "#define TARGET_ARM 1" >> $TMPH
else
echo "Unsupported target CPU"
exit 1
fi
if test "$target_bigendian" = "yes" ; then
echo "TARGET_WORDS_BIGENDIAN=yes" >> config.mak
echo "#define TARGET_WORDS_BIGENDIAN 1" >> $TMPH
fi
if test "$gprof" = "yes" ; then if test "$gprof" = "yes" ; then
echo "TARGET_GPROF=yes" >> config.mak echo "TARGET_GPROF=yes" >> config.mak
echo "#define HAVE_GPROF 1" >> $TMPH echo "#define HAVE_GPROF 1" >> $TMPH
......
...@@ -123,7 +123,7 @@ int cpu_gen_code(TranslationBlock *tb, ...@@ -123,7 +123,7 @@ int cpu_gen_code(TranslationBlock *tb,
static const unsigned short opc_copy_size[] = { static const unsigned short opc_copy_size[] = {
#define DEF(s, n, copy_size) copy_size, #define DEF(s, n, copy_size) copy_size,
#include "opc-i386.h" #include "opc-" TARGET_ARCH ".h"
#undef DEF #undef DEF
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment