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
This commit is contained in:
		
							parent
							
								
									d34cab9f49
								
							
						
					
					
						commit
						687fa640d4
					
				@ -1046,6 +1046,7 @@ again:
 | 
				
			|||||||
            case 5: /* SHR */
 | 
					            case 5: /* SHR */
 | 
				
			||||||
                op1 = op0 & 1;
 | 
					                op1 = op0 & 1;
 | 
				
			||||||
                op0 = (op0 >> 1) | (s->carry << 7);
 | 
					                op0 = (op0 >> 1) | (s->carry << 7);
 | 
				
			||||||
 | 
					                s->carry = op1;
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
            case 6: /* ADD */
 | 
					            case 6: /* ADD */
 | 
				
			||||||
                op0 += op1;
 | 
					                op0 += op1;
 | 
				
			||||||
 | 
				
			|||||||
@ -446,7 +446,9 @@ static uint32_t smc91c111_readb(void *opaque, target_phys_addr_t offset)
 | 
				
			|||||||
        case 7:
 | 
					        case 7:
 | 
				
			||||||
            /* Not implemented.  */
 | 
					            /* Not implemented.  */
 | 
				
			||||||
            return 0;
 | 
					            return 0;
 | 
				
			||||||
        case 8: /* Free memory available.  */
 | 
					        case 8: /* Memory size.  */
 | 
				
			||||||
 | 
					            return NUM_PACKETS;
 | 
				
			||||||
 | 
					        case 9: /* Free memory available.  */
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                int i;
 | 
					                int i;
 | 
				
			||||||
                int n;
 | 
					                int n;
 | 
				
			||||||
@ -457,8 +459,6 @@ static uint32_t smc91c111_readb(void *opaque, target_phys_addr_t offset)
 | 
				
			|||||||
                }
 | 
					                }
 | 
				
			||||||
                return n;
 | 
					                return n;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        case 9: /* Memory size.  */
 | 
					 | 
				
			||||||
            return NUM_PACKETS;
 | 
					 | 
				
			||||||
        case 10: case 11: /* RPCR */
 | 
					        case 10: case 11: /* RPCR */
 | 
				
			||||||
            /* Not implemented.  */
 | 
					            /* Not implemented.  */
 | 
				
			||||||
            return 0;
 | 
					            return 0;
 | 
				
			||||||
 | 
				
			|||||||
@ -2583,7 +2583,7 @@ void cpu_dump_state(CPUState *env, FILE *f,
 | 
				
			|||||||
            cpu_fprintf(f, " ");
 | 
					            cpu_fprintf(f, " ");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    psr = cpsr_read(env);
 | 
					    psr = cpsr_read(env);
 | 
				
			||||||
    cpu_fprintf(f, "PSR=%08x %c%c%c%c %c %s%d %x\n", 
 | 
					    cpu_fprintf(f, "PSR=%08x %c%c%c%c %c %s%d\n",
 | 
				
			||||||
                psr,
 | 
					                psr,
 | 
				
			||||||
                psr & (1 << 31) ? 'N' : '-',
 | 
					                psr & (1 << 31) ? 'N' : '-',
 | 
				
			||||||
                psr & (1 << 30) ? 'Z' : '-',
 | 
					                psr & (1 << 30) ? 'Z' : '-',
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user