Commit 9d0baba1 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

parents a60fce0b 9f4facbc

hw/sh_intc.c

+5 −4
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ 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)

        if (s) {

            s->vect = vect->vect;



#ifdef DEBUG_INTC_SOURCES
@@ -390,6 +390,7 @@ void sh_intc_register_sources(struct intc_desc *desc, 
                   vect->enum_id, s->vect, s->enable_count, s->enable_max);

#endif

        }

    }



    if (groups) {

        for (i = 0; i < nr_groups; i++) {

libcacard/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)"; \

target-i386/op_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

    }