ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Anthony Liguori 2011-09-08 08:59:32 -05:00
parent a60fce0bcc 9f4facbce9
commit 9d0baba110
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/sh_intc.c
View File

@ -382,7 +382,7 @@ void sh_intc_register_sources(struct intc_desc *desc,
sh_intc_register_source(desc, vect->enum_id, groups, nr_groups); sh_intc_register_source(desc, vect->enum_id, groups, nr_groups);
s = sh_intc_source(desc, vect->enum_id); s = sh_intc_source(desc, vect->enum_id);
if (s) if (s) {
s->vect = vect->vect; s->vect = vect->vect;
#ifdef DEBUG_INTC_SOURCES #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); vect->enum_id, s->vect, s->enable_count, s->enable_max);
#endif #endif
} }
}
if (groups) { if (groups) {
for (i = 0; i < nr_groups; i++) { for (i = 0; i < nr_groups; i++) {

2
libcacard/Makefile
View File

@ -56,7 +56,7 @@ install-libcacard: libcacard.pc libcacard.la vscclient
$(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)" $(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)"
$(INSTALL_DIR) "$(DESTDIR)$(bindir)" $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
$(LIBTOOL) --mode=install $(INSTALL_PROG) vscclient "$(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" $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig"
for inc in *.h; do \ for inc in *.h; do \
$(LIBTOOL) --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \

6
target-i386/op_helper.c
View File

@ -1970,20 +1970,20 @@ void helper_aas(void)
void helper_daa(void) void helper_daa(void)
{ {
int al, af, cf; int old_al, al, af, cf;
int eflags; int eflags;
eflags = helper_cc_compute_all(CC_OP); eflags = helper_cc_compute_all(CC_OP);
cf = eflags & CC_C; cf = eflags & CC_C;
af = eflags & CC_A; af = eflags & CC_A;
al = EAX & 0xff; old_al = al = EAX & 0xff;
eflags = 0; eflags = 0;
if (((al & 0x0f) > 9 ) || af) { if (((al & 0x0f) > 9 ) || af) {
al = (al + 6) & 0xff; al = (al + 6) & 0xff;
eflags |= CC_A; eflags |= CC_A;
} }
if ((al > 0x9f) || cf) { if ((old_al > 0x99) || cf) {
al = (al + 0x60) & 0xff; al = (al + 0x60) & 0xff;
eflags |= CC_C; eflags |= CC_C;
} }