fixed invalid type
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3582 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
		
							parent
							
								
									c6ee607c94
								
							
						
					
					
						commit
						44f8625d23
					
				@ -1152,7 +1152,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    TranslationBlock *tb;
 | 
					    TranslationBlock *tb;
 | 
				
			||||||
    CPUState *saved_env;
 | 
					    CPUState *saved_env;
 | 
				
			||||||
    target_phys_addr_t pc;
 | 
					    unsigned long pc;
 | 
				
			||||||
    int ret;
 | 
					    int ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* XXX: hack to restore env in all cases, even if not called from
 | 
					    /* XXX: hack to restore env in all cases, even if not called from
 | 
				
			||||||
@ -1163,7 +1163,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 | 
				
			|||||||
    if (!likely(ret == 0)) {
 | 
					    if (!likely(ret == 0)) {
 | 
				
			||||||
        if (likely(retaddr)) {
 | 
					        if (likely(retaddr)) {
 | 
				
			||||||
            /* now we have a real cpu fault */
 | 
					            /* now we have a real cpu fault */
 | 
				
			||||||
            pc = (target_phys_addr_t)retaddr;
 | 
					            pc = (unsigned long)retaddr;
 | 
				
			||||||
            tb = tb_find_pc(pc);
 | 
					            tb = tb_find_pc(pc);
 | 
				
			||||||
            if (likely(tb)) {
 | 
					            if (likely(tb)) {
 | 
				
			||||||
                /* the PC is inside the translated code. It means that we have
 | 
					                /* the PC is inside the translated code. It means that we have
 | 
				
			||||||
 | 
				
			|||||||
@ -279,7 +279,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    TranslationBlock *tb;
 | 
					    TranslationBlock *tb;
 | 
				
			||||||
    CPUState *saved_env;
 | 
					    CPUState *saved_env;
 | 
				
			||||||
    target_phys_addr_t pc;
 | 
					    unsigned long pc;
 | 
				
			||||||
    int ret;
 | 
					    int ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* XXX: hack to restore env in all cases, even if not called from
 | 
					    /* XXX: hack to restore env in all cases, even if not called from
 | 
				
			||||||
@ -290,7 +290,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 | 
				
			|||||||
    if (__builtin_expect(ret, 0)) {
 | 
					    if (__builtin_expect(ret, 0)) {
 | 
				
			||||||
        if (retaddr) {
 | 
					        if (retaddr) {
 | 
				
			||||||
            /* now we have a real cpu fault */
 | 
					            /* now we have a real cpu fault */
 | 
				
			||||||
            pc = (target_phys_addr_t)retaddr;
 | 
					            pc = (unsigned long)retaddr;
 | 
				
			||||||
            tb = tb_find_pc(pc);
 | 
					            tb = tb_find_pc(pc);
 | 
				
			||||||
            if (tb) {
 | 
					            if (tb) {
 | 
				
			||||||
                /* the PC is inside the translated code. It means that we have
 | 
					                /* the PC is inside the translated code. It means that we have
 | 
				
			||||||
 | 
				
			|||||||
@ -49,7 +49,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    TranslationBlock *tb;
 | 
					    TranslationBlock *tb;
 | 
				
			||||||
    CPUState *saved_env;
 | 
					    CPUState *saved_env;
 | 
				
			||||||
    target_phys_addr_t pc;
 | 
					    unsigned long pc;
 | 
				
			||||||
    int ret;
 | 
					    int ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* XXX: hack to restore env in all cases, even if not called from
 | 
					    /* XXX: hack to restore env in all cases, even if not called from
 | 
				
			||||||
@ -60,7 +60,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 | 
				
			|||||||
    if (__builtin_expect(ret, 0)) {
 | 
					    if (__builtin_expect(ret, 0)) {
 | 
				
			||||||
        if (retaddr) {
 | 
					        if (retaddr) {
 | 
				
			||||||
            /* now we have a real cpu fault */
 | 
					            /* now we have a real cpu fault */
 | 
				
			||||||
            pc = (target_phys_addr_t)retaddr;
 | 
					            pc = (unsigned long)retaddr;
 | 
				
			||||||
            tb = tb_find_pc(pc);
 | 
					            tb = tb_find_pc(pc);
 | 
				
			||||||
            if (tb) {
 | 
					            if (tb) {
 | 
				
			||||||
                /* the PC is inside the translated code. It means that we have
 | 
					                /* the PC is inside the translated code. It means that we have
 | 
				
			||||||
 | 
				
			|||||||
@ -57,7 +57,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    TranslationBlock *tb;
 | 
					    TranslationBlock *tb;
 | 
				
			||||||
    CPUState *saved_env;
 | 
					    CPUState *saved_env;
 | 
				
			||||||
    target_phys_addr_t pc;
 | 
					    unsigned long pc;
 | 
				
			||||||
    int ret;
 | 
					    int ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* XXX: hack to restore env in all cases, even if not called from
 | 
					    /* XXX: hack to restore env in all cases, even if not called from
 | 
				
			||||||
@ -68,7 +68,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 | 
				
			|||||||
    if (__builtin_expect(ret, 0)) {
 | 
					    if (__builtin_expect(ret, 0)) {
 | 
				
			||||||
        if (retaddr) {
 | 
					        if (retaddr) {
 | 
				
			||||||
            /* now we have a real cpu fault */
 | 
					            /* now we have a real cpu fault */
 | 
				
			||||||
            pc = (target_phys_addr_t)retaddr;
 | 
					            pc = (unsigned long)retaddr;
 | 
				
			||||||
            tb = tb_find_pc(pc);
 | 
					            tb = tb_find_pc(pc);
 | 
				
			||||||
            if (tb) {
 | 
					            if (tb) {
 | 
				
			||||||
                /* the PC is inside the translated code. It means that we have
 | 
					                /* the PC is inside the translated code. It means that we have
 | 
				
			||||||
 | 
				
			|||||||
@ -2743,7 +2743,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    TranslationBlock *tb;
 | 
					    TranslationBlock *tb;
 | 
				
			||||||
    CPUState *saved_env;
 | 
					    CPUState *saved_env;
 | 
				
			||||||
    target_phys_addr_t pc;
 | 
					    unsigned long pc;
 | 
				
			||||||
    int ret;
 | 
					    int ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* XXX: hack to restore env in all cases, even if not called from
 | 
					    /* XXX: hack to restore env in all cases, even if not called from
 | 
				
			||||||
@ -2754,7 +2754,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
 | 
				
			|||||||
    if (unlikely(ret != 0)) {
 | 
					    if (unlikely(ret != 0)) {
 | 
				
			||||||
        if (likely(retaddr)) {
 | 
					        if (likely(retaddr)) {
 | 
				
			||||||
            /* now we have a real cpu fault */
 | 
					            /* now we have a real cpu fault */
 | 
				
			||||||
            pc = (target_phys_addr_t)(unsigned long)retaddr;
 | 
					            pc = (unsigned long)retaddr;
 | 
				
			||||||
            tb = tb_find_pc(pc);
 | 
					            tb = tb_find_pc(pc);
 | 
				
			||||||
            if (likely(tb)) {
 | 
					            if (likely(tb)) {
 | 
				
			||||||
                /* the PC is inside the translated code. It means that we have
 | 
					                /* the PC is inside the translated code. It means that we have
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user