diff options
| author |   Isaku Yamahata <yamahata@valinux.co.jp> | 2009-07-02 19:32:10 +0900 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2009-07-09 16:06:40 -0500 |
| commit | 5f6504956066090d81936c1621750b397f444c7b (patch) | |
| tree | b558b8d8f134b34ef3eca1c11d3a5e2feab2c5c7 /tests | |
| parent | ioport: consolidate duplicated logic in register_ioport_{read, write}(). (diff) | |
| download | qemu-kvm-5f6504956066090d81936c1621750b397f444c7b.tar.gz qemu-kvm-5f6504956066090d81936c1621750b397f444c7b.tar.bz2 qemu-kvm-5f6504956066090d81936c1621750b397f444c7b.zip | |
consolidate user cpu_{in, out}[bwl] into ioport-user.c
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 4 | ||||
| -rw-r--r-- | tests/qruncom.c | 33 |
2 files changed, 2 insertions, 35 deletions
diff --git a/tests/Makefile b/tests/Makefile index 326b7335a..69092e548 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -78,9 +78,9 @@ runcom: runcom.c $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< # NOTE: -fomit-frame-pointer is currently needed : this is a bug in libqemu -qruncom: qruncom.c ../i386-user/libqemu.a +qruncom: qruncom.c ../ioport-user.c ../i386-user/libqemu.a $(CC) $(CFLAGS) -fomit-frame-pointer $(LDFLAGS) -I../target-i386 -I.. -I../i386-user -I../fpu \ - -o $@ $< -L../i386-user -lqemu -lm + -o $@ $(filter %.c, $^) -L../i386-user -lqemu -lm # arm test hello-arm: hello-arm.o diff --git a/tests/qruncom.c b/tests/qruncom.c index 5e503bccc..a8d0ef640 100644 --- a/tests/qruncom.c +++ b/tests/qruncom.c @@ -16,39 +16,6 @@ //#define SIGTEST -void cpu_outb(CPUState *env, int addr, int val) -{ - fprintf(stderr, "outb: port=0x%04x, data=%02x\n", addr, val); -} - -void cpu_outw(CPUState *env, int addr, int val) -{ - fprintf(stderr, "outw: port=0x%04x, data=%04x\n", addr, val); -} - -void cpu_outl(CPUState *env, int addr, int val) -{ - fprintf(stderr, "outl: port=0x%04x, data=%08x\n", addr, val); -} - -int cpu_inb(CPUState *env, int addr) -{ - fprintf(stderr, "inb: port=0x%04x\n", addr); - return 0; -} - -int cpu_inw(CPUState *env, int addr) -{ - fprintf(stderr, "inw: port=0x%04x\n", addr); - return 0; -} - -int cpu_inl(CPUState *env, int addr) -{ - fprintf(stderr, "inl: port=0x%04x\n", addr); - return 0; -} - int cpu_get_pic_interrupt(CPUState *env) { return -1; |