Commit 687fa640d49ce19b9b9a2258fde19e1500bfabb4
1 parent
d34cab9f
Random bug fixes from code inspection, by Wang Cheng Yeh.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2580 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
3 changed files
with
6 additions
and
5 deletions
hw/lsi53c895a.c
| @@ -1046,6 +1046,7 @@ again: | @@ -1046,6 +1046,7 @@ again: | ||
| 1046 | case 5: /* SHR */ | 1046 | case 5: /* SHR */ |
| 1047 | op1 = op0 & 1; | 1047 | op1 = op0 & 1; |
| 1048 | op0 = (op0 >> 1) | (s->carry << 7); | 1048 | op0 = (op0 >> 1) | (s->carry << 7); |
| 1049 | + s->carry = op1; | ||
| 1049 | break; | 1050 | break; |
| 1050 | case 6: /* ADD */ | 1051 | case 6: /* ADD */ |
| 1051 | op0 += op1; | 1052 | op0 += op1; |
hw/smc91c111.c
| @@ -446,7 +446,9 @@ static uint32_t smc91c111_readb(void *opaque, target_phys_addr_t offset) | @@ -446,7 +446,9 @@ static uint32_t smc91c111_readb(void *opaque, target_phys_addr_t offset) | ||
| 446 | case 7: | 446 | case 7: |
| 447 | /* Not implemented. */ | 447 | /* Not implemented. */ |
| 448 | return 0; | 448 | return 0; |
| 449 | - case 8: /* Free memory available. */ | 449 | + case 8: /* Memory size. */ |
| 450 | + return NUM_PACKETS; | ||
| 451 | + case 9: /* Free memory available. */ | ||
| 450 | { | 452 | { |
| 451 | int i; | 453 | int i; |
| 452 | int n; | 454 | int n; |
| @@ -457,8 +459,6 @@ static uint32_t smc91c111_readb(void *opaque, target_phys_addr_t offset) | @@ -457,8 +459,6 @@ static uint32_t smc91c111_readb(void *opaque, target_phys_addr_t offset) | ||
| 457 | } | 459 | } |
| 458 | return n; | 460 | return n; |
| 459 | } | 461 | } |
| 460 | - case 9: /* Memory size. */ | ||
| 461 | - return NUM_PACKETS; | ||
| 462 | case 10: case 11: /* RPCR */ | 462 | case 10: case 11: /* RPCR */ |
| 463 | /* Not implemented. */ | 463 | /* Not implemented. */ |
| 464 | return 0; | 464 | return 0; |
target-arm/translate.c
| @@ -2583,8 +2583,8 @@ void cpu_dump_state(CPUState *env, FILE *f, | @@ -2583,8 +2583,8 @@ void cpu_dump_state(CPUState *env, FILE *f, | ||
| 2583 | cpu_fprintf(f, " "); | 2583 | cpu_fprintf(f, " "); |
| 2584 | } | 2584 | } |
| 2585 | psr = cpsr_read(env); | 2585 | psr = cpsr_read(env); |
| 2586 | - cpu_fprintf(f, "PSR=%08x %c%c%c%c %c %s%d %x\n", | ||
| 2587 | - psr, | 2586 | + cpu_fprintf(f, "PSR=%08x %c%c%c%c %c %s%d\n", |
| 2587 | + psr, | ||
| 2588 | psr & (1 << 31) ? 'N' : '-', | 2588 | psr & (1 << 31) ? 'N' : '-', |
| 2589 | psr & (1 << 30) ? 'Z' : '-', | 2589 | psr & (1 << 30) ? 'Z' : '-', |
| 2590 | psr & (1 << 29) ? 'C' : '-', | 2590 | psr & (1 << 29) ? 'C' : '-', |