removed warnings
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@360 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
		
							parent
							
								
									31e8f3c894
								
							
						
					
					
						commit
						e2222c3924
					
				
							
								
								
									
										6
									
								
								exec.h
								
								
								
								
							
							
						
						
									
										6
									
								
								exec.h
								
								
								
								
							| 
						 | 
				
			
			@ -32,6 +32,12 @@
 | 
			
		|||
#define __builtin_expect(x, n) (x)
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef __i386__
 | 
			
		||||
#define REGPARM(n) __attribute((regparm(n)))
 | 
			
		||||
#else
 | 
			
		||||
#define REGPARM(n)
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
/* is_jmp field values */
 | 
			
		||||
#define DISAS_NEXT    0 /* next instruction can be analyzed */
 | 
			
		||||
#define DISAS_JUMP    1 /* only pc was modified dynamically */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -49,8 +49,8 @@
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
#if MEMUSER == 0
 | 
			
		||||
DATA_TYPE __attribute((regparm(1))) glue(glue(__ld, SUFFIX), _mmu)(unsigned long addr);
 | 
			
		||||
void __attribute((regparm(2))) glue(glue(__st, SUFFIX), _mmu)(unsigned long addr, DATA_TYPE v);
 | 
			
		||||
DATA_TYPE REGPARM(1) glue(glue(__ld, SUFFIX), _mmu)(unsigned long addr);
 | 
			
		||||
void REGPARM(2) glue(glue(__st, SUFFIX), _mmu)(unsigned long addr, DATA_TYPE v);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
static inline int glue(glue(ldu, SUFFIX), MEMSUFFIX)(void *ptr)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -81,7 +81,7 @@ static inline void glue(io_write, SUFFIX)(unsigned long physaddr,
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
/* handle all cases except unaligned access which span two pages */
 | 
			
		||||
DATA_TYPE __attribute((regparm(1))) glue(glue(__ld, SUFFIX), _mmu)(unsigned long addr)
 | 
			
		||||
DATA_TYPE REGPARM(1) glue(glue(__ld, SUFFIX), _mmu)(unsigned long addr)
 | 
			
		||||
{
 | 
			
		||||
    DATA_TYPE res;
 | 
			
		||||
    int is_user, index;
 | 
			
		||||
| 
						 | 
				
			
			@ -163,7 +163,7 @@ static DATA_TYPE glue(slow_ld, SUFFIX)(unsigned long addr, void *retaddr)
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void __attribute((regparm(2))) glue(glue(__st, SUFFIX), _mmu)(unsigned long addr, DATA_TYPE val)
 | 
			
		||||
void REGPARM(2) glue(glue(__st, SUFFIX), _mmu)(unsigned long addr, DATA_TYPE val)
 | 
			
		||||
{
 | 
			
		||||
    unsigned long physaddr, tlb_addr;
 | 
			
		||||
    void *retaddr;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue