diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 08:59:32 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 08:59:32 -0500 |
| commit | 9d0baba1104c51f5d95d632ff41406e5aca83216 (patch) | |
| tree | 0edd64c45cb6a32f85c11a2116ce603f3cf3d71d | |
| parent | a60fce0bcc193c37c92972b8217341d81f7a9860 (diff) | |
| parent | 9f4facbce9dc4037b23baa77950381fc2f92e2d3 (diff) | |
| download | qemu-9d0baba1104c51f5d95d632ff41406e5aca83216.tar.gz | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
| -rw-r--r-- | hw/sh_intc.c | 9 | ||||
| -rw-r--r-- | libcacard/Makefile | 2 | ||||
| -rw-r--r-- | target-i386/op_helper.c | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/hw/sh_intc.c b/hw/sh_intc.c index ecb46e5856..e07424f2a1 100644 --- a/hw/sh_intc.c +++ b/hw/sh_intc.c @@ -382,13 +382,14 @@ void sh_intc_register_sources(struct intc_desc *desc, sh_intc_register_source(desc, vect->enum_id, groups, nr_groups); s = sh_intc_source(desc, vect->enum_id); - if (s) - s->vect = vect->vect; + if (s) { + s->vect = vect->vect; #ifdef DEBUG_INTC_SOURCES - printf("sh_intc: registered source %d -> 0x%04x (%d/%d)\n", - vect->enum_id, s->vect, s->enable_count, s->enable_max); + printf("sh_intc: registered source %d -> 0x%04x (%d/%d)\n", + vect->enum_id, s->vect, s->enable_count, s->enable_max); #endif + } } if (groups) { diff --git a/libcacard/Makefile b/libcacard/Makefile index bf052bcc12..81d9eb5206 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -56,7 +56,7 @@ install-libcacard: libcacard.pc libcacard.la vscclient $(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)" $(INSTALL_DIR) "$(DESTDIR)$(bindir)" $(LIBTOOL) --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)" - $(LIBTOOL) --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)" + $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.la "$(DESTDIR)$(libdir)" $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig" for inc in *.h; do \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index 1bbc3b56dc..1fc248fa17 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -1970,20 +1970,20 @@ void helper_aas(void) void helper_daa(void) { - int al, af, cf; + int old_al, al, af, cf; int eflags; eflags = helper_cc_compute_all(CC_OP); cf = eflags & CC_C; af = eflags & CC_A; - al = EAX & 0xff; + old_al = al = EAX & 0xff; eflags = 0; if (((al & 0x0f) > 9 ) || af) { al = (al + 6) & 0xff; eflags |= CC_A; } - if ((al > 0x9f) || cf) { + if ((old_al > 0x99) || cf) { al = (al + 0x60) & 0xff; eflags |= CC_C; } |